Merge pull request #92 from fleetbase/dev-v1.4.22

v1.4.22
fleetbase · May 4, 2024 · 96c766b · 96c766b
2 parents e8e7658 + 6874e3a
commit 96c766b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.4.21",
+    "version": "1.4.22",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",

diff --git a/src/Http/Requests/OnboardRequest.php b/src/Http/Requests/OnboardRequest.php
@@ -14,7 +14,7 @@ class OnboardRequest extends FleetbaseRequest
      *
      * @return array
      */
-    protected $excludedWords = ['test', 'example', 'trial', 'asdf', '1234', 'asdas'];
+    protected $excludedWords = ['test', 'testing', 'example', 'trial', 'trialing', 'asdf', '1234', 'asdas', 'dsdsds'];
 
     /**
      * Determine if the user is authorized to make this request.

diff --git a/src/Http/Resources/User.php b/src/Http/Resources/User.php
@@ -18,7 +18,9 @@ public function toArray($request)
         return [
             'id'                                            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
             'uuid'                                          => $this->when(Http::isInternalRequest(), $this->uuid),
+            'company_uuid'                                  => $this->when(Http::isInternalRequest(), $this->company_uuid),
             'public_id'                                     => $this->when(Http::isInternalRequest(), $this->public_id),
+            'company'                                       => $this->when(Http::isPublicRequest(), $this->company->public_id),
             'name'                                          => $this->name,
             'username'                                      => $this->username,
             'email'                                         => $this->email,