Merge pull request #187 from fleetbase/dev-v1.6.35

v1.6.35 ~ VerificationCode SMS must throw exception always

Author: roncodes

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.6.34",
+    "version": "1.6.35",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",

src/Facades/FileResolver.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Fleetbase\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * FileResolver Facade.
+ *
+ * Provides convenient static-like access to the FileResolverService.
+ *
+ * @method static \Fleetbase\Models\File|null resolve($file, ?string $path = 'uploads', ?string $disk = null)
+ * @method static array                       resolveMany(array $files, ?string $path = 'uploads', ?string $disk = null)
+ * @method static bool                        resolveAndAttach($file, $model, string $attribute, ?string $path = 'uploads', ?string $disk = null)
+ *
+ * @see \Fleetbase\Services\FileResolverService
+ */
+class FileResolver extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return \Fleetbase\Services\FileResolverService::class;
+    }
+}

src/Http/Controllers/Internal/v1/OnboardController.php

@@ -58,7 +58,7 @@ public function createAccount(OnboardRequest $request)
         ]);
 
         // create company FIRST (required for billing resource tracking)
-        $company = Company::create(['name' => $request->input('organization_name')]);
+        $company = Company::create(['name' => $request->input('organization_name'), 'onboarding_completed_at' => now()]);
 
         // set company_uuid before creating user (required for billing resource tracking)
         $attributes['company_uuid'] = $company->uuid;
@@ -73,7 +73,7 @@ public function createAccount(OnboardRequest $request)
         $user->setUserType($isAdmin ? 'admin' : 'user');
 
         // set company owner
-        $company->setOwner($user)->save();
+        $company->setOwner($user, true)->save();
 
         // assign user to organization
         $user->assignCompany($company, 'Administrator');

src/Models/Company.php

@@ -254,9 +254,12 @@ public function assignOwner(User $user): User
      *
      * @return Company
      */
-    public function setOwner(User $user)
+    public function setOwner(User $user, bool $completedOnboarding = false)
     {
         $this->owner_uuid = $user->uuid;
+        if ($completedOnboarding) {
+            $this->onboarding_completed_by_uuid = $user->uuid;
+        }
 
         return $this;
     }

src/Models/VerificationCode.php

@@ -216,10 +216,7 @@ public static function generateSmsVerificationFor($subject, $for = 'phone_verifi
                     'error' => $e->getMessage(),
                 ]);
 
-                // Optionally rethrow based on configuration
-                if (config('sms.throw_on_error', false)) {
-                    throw $e;
-                }
+                throw $e;
             }
         }
 

src/Providers/CoreServiceProvider.php

@@ -135,6 +135,11 @@ public function register()
         $this->app->singleton(ReportSchemaRegistry::class, function () {
             return new ReportSchemaRegistry();
         });
+
+        // register file resolver service
+        $this->app->singleton(\Fleetbase\Services\FileResolverService::class, function ($app) {
+            return new \Fleetbase\Services\FileResolverService();
+        });
     }
 
     /**

src/Rules/FileInput.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Fleetbase\Rules;
+
+use Fleetbase\Support\Utils;
+use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Str;
+
+/**
+ * FileInput Validation Rule.
+ *
+ * Validates that input is a valid file source (upload, base64, ID, or URL).
+ */
+class FileInput implements Rule
+{
+    /**
+     * The validation error message.
+     */
+    protected string $message = 'The :attribute must be a valid file upload, base64 string, file ID, or URL.';
+
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param string $attribute
+     */
+    public function passes($attribute, $value): bool
+    {
+        // Check for UploadedFile
+        if ($value instanceof UploadedFile) {
+            return $value->isValid();
+        }
+
+        if (is_string($value)) {
+            // Check for public ID
+            if (Utils::isPublicId($value)) {
+                return true;
+            }
+
+            // Check for Base64 data URI
+            if (Str::startsWith($value, 'data:image') || Str::startsWith($value, 'data:application')) {
+                return true;
+            }
+
+            // Check for valid URL
+            if (filter_var($value, FILTER_VALIDATE_URL)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the validation error message.
+     */
+    public function message(): string
+    {
+        return $this->message;
+    }
+}