@fleetbase/fleetops-engine 0.6.67 → 0.6.69

package/server/src/Support/Telematics/TelematicService.php

@@ -188,18 +188,20 @@ class TelematicService
             }
             $job = (new \Fleetbase\FleetOps\Jobs\PollTelematicTelemetry($connection->uuid, $jobId, $options))
                 ->onQueue($settings['poll_queue'] ?? 'default');
-            if (!Telemetry\Queue::dispatch($job)) {
+            $queued = Telemetry\Queue::dispatch($job);
+            if (!$queued) {
                 $existing = data_get($connection->meta, 'last_sync_job_id');
-                if ($existing && in_array(data_get($connection->meta, 'last_sync_result'), ['queued', 'running', 'retrying'], true)) {
+                if ($existing && in_array(data_get($connection->meta, 'last_sync_result'), Telemetry\Inbox::PENDING_REQUEST_RESULTS, true)) {
                     return $existing;
                 }
-                throw ValidationException::withMessages(['telematic' => ['Telemetry synchronization is already queued or running.']]);
+                // A scheduled sweep holds this connection's poll lease. Record the request so
+                // the next sweep adopts and completes it, rather than rejecting the user.
             }
             $connection->status = 'synchronizing';
             $connection->meta   = array_merge($connection->meta ?? [], [
                 'last_sync_job_id'     => $jobId, 'last_sync_run_uuid' => null, 'last_sync_run_job_id' => null,
                 'last_sync_started_at' => now()->toDateTimeString(), 'last_sync_result' => 'queued',
-                'last_sync_phase'      => 'queued', 'last_sync_error' => null, 'last_sync_failed_reason' => null,
+                'last_sync_phase'      => $queued ? 'queued' : 'waiting_for_sweep', 'last_sync_error' => null, 'last_sync_failed_reason' => null,
             ]);
             $connection->save();
 

package/server/src/Support/Telematics/Telemetry/Inbox.php

@@ -10,6 +10,9 @@ use Illuminate\Support\Str;
 
 class Inbox
 {
+    /** Manual request states that a sweep may still finalize. */
+    public const PENDING_REQUEST_RESULTS = ['queued', 'running', 'retrying'];
+
     public function accept(Telematic $telematic, array $payload, string $source, ?string $run = null, ?string $receivedAt = null): string
     {
         $json = json_encode($payload, JSON_THROW_ON_ERROR);
@@ -64,17 +67,12 @@ class Inbox
             if ($status === 'incomplete') {
                 return;
             }
-            // A previous sweep may finish after another manual request was queued.
-            // Only the run explicitly associated with that request may finalize it.
             $connection = Telematic::withoutGlobalScopes()->where('uuid', $run->telematic_uuid)->lockForUpdate()->first();
-            if (!$connection || !self::enabled($connection)
-                || data_get($connection->meta, 'last_sync_run_uuid') !== $id
-                || !data_get($connection->meta, 'last_sync_run_job_id')
-                || data_get($connection->meta, 'last_sync_run_job_id') !== data_get($connection->meta, 'last_sync_job_id')) {
+            if (!$connection || !self::enabled($connection)) {
                 return;
             }
-            $connection->status = $status === 'completed' ? 'active' : 'error';
-            $connection->meta   = array_merge($connection->meta ?? [], [
+            $meta   = $connection->meta ?? [];
+            $result = [
                 'last_sync_result'                                                         => $status === 'completed' ? 'success' : $status,
                 'last_sync_phase'                                                          => $status, 'last_sync_progress_at' => now()->toDateTimeString(),
                 'last_sync_fetched_total'                                                  => (int) $run->units, 'last_sync_page_count' => (int) $run->pages,
@@ -82,8 +80,28 @@ class Inbox
                 'last_sync_failed_total'                                                   => (int) $failed,
                 'last_sync_error'                                                          => $status === 'completed' ? null : ($run->error ?? 'Some units could not be applied; inspect telemetry diagnostics.'),
                 $status === 'completed' ? 'last_sync_completed_at' : 'last_sync_failed_at' => now()->toDateTimeString(),
+            ];
+            // A previous sweep may finish after another manual request was queued.
+            // Only the run explicitly associated with that request may finalize it.
+            if (data_get($meta, 'last_sync_run_uuid') === $id && data_get($meta, 'last_sync_run_job_id')
+                && data_get($meta, 'last_sync_run_job_id') === data_get($meta, 'last_sync_job_id')) {
+                $connection->status = $status === 'completed' ? 'active' : 'error';
+                $connection->meta   = array_merge($meta, $result);
+                $connection->save();
+
+                return;
+            }
+            // A completed scheduled sweep proves the connection is healthy, so it replaces a
+            // stale failure. It never finalizes or overrides a manual request still in flight,
+            // and a partial sweep leaves the last reported state alone.
+            if ($status !== 'completed' || in_array(data_get($meta, 'last_sync_result'), self::PENDING_REQUEST_RESULTS, true)) {
+                return;
+            }
+            // Written without model events: sweeps run every minute and the model logs every save.
+            DB::table('telematics')->where('uuid', $connection->uuid)->update([
+                'status' => in_array($connection->status, ['error', 'synchronizing'], true) ? 'active' : $connection->status,
+                'meta'   => json_encode(array_merge($meta, $result), JSON_THROW_ON_ERROR),
             ]);
-            $connection->save();
         });
     }
 }

package/server/src/routes.php

@@ -444,6 +444,10 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                 $router->post('{id}/unassign-order', $controller('unassignOrder'));
                                 $router->post('{id}/assign-vehicle', $controller('assignVehicle'));
                                 $router->post('{id}/unassign-vehicle', $controller('unassignVehicle'));
+                                $router->post('{id}/send-credentials', $controller('sendCredentials'));
+                                $router->post('{id}/reset-credentials', $controller('resetCredentials'));
+                                $router->post('{id}/deactivate-login', $controller('deactivateLogin'));
+                                $router->post('{id}/reactivate-login', $controller('reactivateLogin'));
                                 $router->match(['get', 'post'], 'export', $controller('export'));
                                 $router->post('import', $controller('import'));
                                 // Driver scheduling endpoints
@@ -764,6 +768,7 @@ Route::prefix(config('fleetops.api.routing.prefix'))->namespace('Fleetbase\Fleet
                                     function ($router) {
                                         $router->get('customers', 'FleetOpsLookupController@polymorphs');
                                         $router->get('facilitators', 'FleetOpsLookupController@polymorphs');
+                                        $router->get('profile-identity', 'FleetOpsLookupController@profileIdentity');
                                     }
                                 );
                                 $router->group(

package/server/tests/AiOperationalQueryCapabilityTest.php

@@ -406,6 +406,7 @@ test('asset status capability exposes metadata and denied branches', function ()
         ->and($capability->label())->toBe('Fleet-Ops asset status')
         ->and($capability->description())->toContain('vehicle, device, sensor')
         ->and($capability->permissions())->toBe([
+            'fleet-ops see driver',
             'fleet-ops see vehicle',
             'fleet-ops see device',
             'fleet-ops see sensor',

package/server/tests/ApiCustomerControllerContractsTest.php

@@ -800,6 +800,27 @@ test('api customer controller authenticates and verifies customer codes', functi
         ]))))->toBe(['error' => 'Invalid verification code.']);
 });
 
+test('api customer controller refuses deactivated customer logins', function () {
+    $controller = fleetopsApiCustomerController();
+    foreach (['activeUser', 'loginUser', 'verificationUser'] as $property) {
+        $controller->{$property}->setAttribute('status', 'inactive');
+    }
+
+    $responses = [
+        $controller->login(Request::create('/v1/customers/login', 'POST', ['identity' => 'jane@example.test', 'password' => 'password-secret'])),
+        $controller->loginWithPhone(Request::create('/v1/customers/login/phone', 'POST', ['phone' => '15551234567'])),
+        $controller->verifyCode(Request::create('/v1/customers/verify', 'POST', ['identity' => 'jane@example.test', 'code' => '123456'])),
+    ];
+
+    foreach ($responses as $response) {
+        expect($response->getStatusCode())->toBe(403)
+            ->and(fleetopsApiCustomerJson($response))->toBe(['error' => 'This customer login has been deactivated.']);
+    }
+
+    // No verification code is sent
+    expect($controller->smsVerifications)->toBe([]);
+});
+
 test('api customer controller resets forgotten passwords', function () {
     $controller = fleetopsApiCustomerController();
     $forgot     = $controller->forgotPassword(Request::create('/v1/customers/forgot-password', 'POST', [

package/server/tests/ApiDriverControllerContractsTest.php

@@ -30,6 +30,8 @@ class FleetOpsApiDriverControllerProbe extends DriverController
     public array $deviceCreates             = [];
     public array $companyCalls              = [];
     public array $createdUsers              = [];
+    public array $resolvedAccounts          = [];
+    public ?Throwable $accountConflict      = null;
     public array $uuidLookups               = [];
     public array $relationLookups           = [];
     public array $relationCompanyScopes     = [];
@@ -65,11 +67,17 @@ class FleetOpsApiDriverControllerProbe extends DriverController
         return $userDetails;
     }
 
-    protected function createUser(array $userDetails): User
+    protected function resolveDriverAccount(string $companyUuid, array $userDetails): User
     {
-        $this->createdUsers[] = $userDetails;
+        $this->resolvedAccounts[] = $companyUuid;
+        $this->createdUsers[]     = $userDetails;
+
+        if ($this->accountConflict) {
+            throw $this->accountConflict;
+        }
+
         $this->user ??= new FleetOpsApiDriverUserFake();
-        $this->user->setRawAttributes(array_merge(['uuid' => 'user-uuid'], $userDetails), true);
+        $this->user->setRawAttributes(array_merge(['uuid' => 'user-uuid', 'type' => 'driver'], $userDetails), true);
 
         return $this->user;
     }
@@ -282,7 +290,17 @@ class FleetOpsApiDriverUserFake extends User
         return true;
     }
 
-    public function assignCompany(Company $company, string $role = 'Administrator'): User
+    public function save(array $options = []): bool
+    {
+        $this->updates[] = $this->getDirty();
+        $this->syncOriginal();
+
+        return true;
+    }
+
+    // Matches core-api 1.6.63+, where no role is granted unless one is given (a nullable
+    // role is also compatible with older core-api, whose parameter was a plain string).
+    public function assignCompany(Company $company, ?string $role = null): User
     {
         $this->assignedCompanies[] = $company->uuid;
 
@@ -317,6 +335,27 @@ class FleetOpsApiDriverUserFake extends User
     }
 }
 
+/**
+ * ProfileAccountManager checks a changed email/phone against the users table.
+ */
+function fleetopsApiDriverContractsUsersTable(array $rows = []): void
+{
+    $connection = new Illuminate\Database\SQLiteConnection(new PDO('sqlite::memory:'));
+    $connection->getSchemaBuilder()->create('users', function ($table) {
+        $table->string('uuid')->nullable();
+        $table->string('type')->nullable();
+        $table->string('email')->nullable();
+        $table->string('phone')->nullable();
+        $table->timestamp('deleted_at')->nullable();
+    });
+    if ($rows) {
+        $connection->table('users')->insert($rows);
+    }
+    $resolver = new Illuminate\Database\ConnectionResolver(['default' => $connection, 'mysql' => $connection]);
+    $resolver->setDefaultConnection('mysql');
+    Illuminate\Database\Eloquent\Model::setConnectionResolver($resolver);
+}
+
 class FleetOpsApiDriverVehicleFake extends Vehicle
 {
     public array $quietUpdates = [];
@@ -363,16 +402,15 @@ test('api driver controller creates drivers with user company assignment and rel
 
     expect($response)->toBe(['resource' => 'driver', 'driver' => $controller->driver])
         ->and($controller->companyCalls)->toBe([['request', 'company_public']])
+        // The login account is resolved by ProfileAccountManager in the driver's company
+        ->and($controller->resolvedAccounts)->toBe(['company-uuid'])
         ->and($controller->createdUsers[0])->toMatchArray([
-            'name'         => 'Driver One',
-            'email'        => 'driver@example.test',
-            'phone'        => '+15551234567',
-            'company_uuid' => 'company-uuid',
-            'applied'      => true,
+            'name'     => 'Driver One',
+            'email'    => 'driver@example.test',
+            'phone'    => '+15551234567',
+            'password' => 'secret-password',
+            'applied'  => true,
         ])
-        ->and($controller->user->assignedCompanies)->toBe(['company-uuid'])
-        ->and($controller->user->assignedTypes)->toBe(['driver'])
-        ->and($controller->user->assignedRoles)->toBe(['Driver'])
         ->and($controller->createdDrivers[0])->toMatchArray([
             'status'           => 'available',
             'vehicle_uuid'     => 'vehicle-uuid',
@@ -407,8 +445,10 @@ test('api driver controller reports missing company before creating drivers', fu
 });
 
 test('api driver controller updates drivers user details assignments location and photo', function () {
+    fleetopsApiDriverContractsUsersTable();
+
     $user = new FleetOpsApiDriverUserFake();
-    $user->setRawAttributes(['uuid' => 'user-uuid'], true);
+    $user->setRawAttributes(['uuid' => 'user-uuid', 'type' => 'driver'], true);
 
     $driver = new FleetOpsApiDriverFake();
     $driver->setRawAttributes([
@@ -645,7 +685,7 @@ test('api driver controller refuses to set a password through a general update',
      * and now has its own endpoint that demands the current password.
      */
     $user = new FleetOpsApiDriverUserFake();
-    $user->setRawAttributes(['uuid' => 'user-uuid'], true);
+    $user->setRawAttributes(['uuid' => 'user-uuid', 'type' => 'driver'], true);
     $driver = new FleetOpsApiDriverFake();
     $driver->setRawAttributes([
         'uuid'      => 'driver-uuid',
@@ -759,11 +799,9 @@ test('api driver controller creates an operational driver with no email or phone
             'company_uuid' => 'company-uuid',
             'status'       => 'available',
         ])
-        // The Driver-to-User relationship, organization membership, user type
-        // and role are all preserved for a credential-less driver.
-        ->and($controller->user->assignedCompanies)->toBe(['company-uuid'])
-        ->and($controller->user->assignedTypes)->toBe(['driver'])
-        ->and($controller->user->assignedRoles)->toBe(['Driver']);
+        // The Driver-to-User relationship and organization membership are
+        // preserved for a credential-less driver.
+        ->and($controller->resolvedAccounts)->toBe(['company-uuid']);
 });
 
 test('api driver controller creates a driver with only one contact method', function () {
@@ -873,7 +911,7 @@ test('api driver controller copies timezone through to the linked user account',
     ]));
 
     $user = new FleetOpsApiDriverUserFake();
-    $user->setRawAttributes(['uuid' => 'user-uuid'], true);
+    $user->setRawAttributes(['uuid' => 'user-uuid', 'type' => 'driver'], true);
 
     $driver = new FleetOpsApiDriverFake();
     $driver->setRawAttributes(['uuid' => 'driver-uuid', 'public_id' => 'driver_public', 'user_uuid' => 'user-uuid'], true);
@@ -905,3 +943,47 @@ test('api driver controller only expands relationships the public contract allow
     // name is dropped rather than reaching Eloquent, where it would be a 500.
     expect($request->input('with'))->toBe(['vehicle', 'currentJob']);
 });
+
+test('api driver controller answers 422 when the email or phone belongs to another account', function () {
+    $create                  = new FleetOpsApiDriverControllerProbe();
+    $create->accountConflict = new Fleetbase\FleetOps\Exceptions\ProfileIdentityConflictException('This email is already in use by another account.');
+
+    expect($create->create(new CreateDriverRequest(['name' => 'Driver One', 'email' => 'taken@example.test'])))->toBe([
+        'json'   => ['error' => 'This email is already in use by another account.'],
+        'status' => 422,
+    ])
+        ->and($create->createdDrivers)->toBe([]);
+
+    fleetopsApiDriverContractsUsersTable([['uuid' => 'other-user', 'type' => 'user', 'phone' => '+15550009999']]);
+
+    $user = new FleetOpsApiDriverUserFake();
+    $user->setRawAttributes(['uuid' => 'user-uuid', 'type' => 'driver', 'phone' => '+15550001111'], true);
+    $driver = new FleetOpsApiDriverFake();
+    $driver->setRawAttributes(['uuid' => 'driver-uuid', 'public_id' => 'driver_public', 'user_uuid' => 'user-uuid'], true);
+    $driver->userForTest = $user;
+
+    $update         = new FleetOpsApiDriverControllerProbe();
+    $update->driver = $driver;
+
+    expect($update->update('driver_public', new UpdateDriverRequest(['phone' => '+1 555 000 9999'])))->toBe([
+        'json'   => ['error' => 'This phone number is already in use by another account.'],
+        'status' => 422,
+    ])
+        ->and($user->updates)->toBe([])
+        ->and($driver->updates)->toBe([]);
+});
+
+test('api driver controller only renames a team member account linked to a driver', function () {
+    $staff = new FleetOpsApiDriverUserFake();
+    $staff->setRawAttributes(['uuid' => 'staff-uuid', 'type' => 'user', 'name' => 'Staff', 'email' => 'staff@example.test'], true);
+    $driver = new FleetOpsApiDriverFake();
+    $driver->setRawAttributes(['uuid' => 'driver-uuid', 'public_id' => 'driver_public', 'user_uuid' => 'staff-uuid'], true);
+    $driver->userForTest = $staff;
+
+    $update         = new FleetOpsApiDriverControllerProbe();
+    $update->driver = $driver;
+    $update->update('driver_public', new UpdateDriverRequest(['name' => 'Staff Driver', 'email' => 'changed@example.test']));
+
+    expect($staff->updates)->toBe([['name' => 'Staff Driver']])
+        ->and($staff->email)->toBe('staff@example.test');
+});

package/server/tests/CommandContractsTest.php

@@ -884,7 +884,7 @@ class FleetOpsUserCommandFake
         return true;
     }
 
-    public function assignCompany(Company $company, string $role = 'Administrator'): self
+    public function assignCompany(Company $company, ?string $role = null): self
     {
         $this->assigned[] = [$company->uuid, $role];
 
@@ -2208,8 +2208,8 @@ test('fix customer companies command creates or links users and assigns missing
             ['email', FleetOpsCustomerCommandFake::class],
             ['phone', FleetOpsCustomerCommandFake::class],
         ])
-        ->and($createdUser->assigned)->toBe([['company-created', 'Administrator']])
-        ->and($existingUser->assigned)->toBe([['company-existing', 'Administrator']]);
+        ->and($createdUser->assigned)->toBe([['company-created', 'Fleet-Ops Customer']])
+        ->and($existingUser->assigned)->toBe([['company-existing', 'Fleet-Ops Customer']]);
 });
 
 test('fix driver companies command syncs assigned users and missing company assignments', function () {
@@ -2236,7 +2236,7 @@ test('fix driver companies command syncs assigned users and missing company assi
             ['email', Driver::class],
             ['phone', Driver::class],
         ])
-        ->and($user->assigned)->toBe([['driver-company', 'Administrator']])
+        ->and($user->assigned)->toBe([['driver-company', 'Driver']])
         ->and($command->messages)->toContain(['line', 'Found driver Driver User (driver@example.test) which doesnt have correct company assignment.'])
         ->and($command->messages)->toContain(['line', 'Driver driver@example.test was assigned to company: Driver Company']);
 });

package/server/tests/ControllerHelperContractsTest.php

@@ -254,7 +254,6 @@ class FleetOpsZoneControllerProbe extends ZoneController
 class FleetOpsInternalContactControllerProbe extends InternalContactController
 {
     public array $installedPackages = [];
-    public array $resolvedUsers     = [];
     public array $sentCredentials   = [];
     public array $savedMetas        = [];
     public ?User $contactUser       = null;
@@ -269,13 +268,6 @@ class FleetOpsInternalContactControllerProbe extends InternalContactController
         return $reflection->invoke($this, ...$arguments);
     }
 
-    protected function resolveUserUuid(string $user): string
-    {
-        $this->resolvedUsers[] = $user;
-
-        return 'resolved-' . $user;
-    }
-
     protected function installedFleetbaseExtensions(): array
     {
         return $this->installedPackages;
@@ -1607,7 +1599,7 @@ test('internal contact controller create update and after save hooks protect cus
             ],
         ],
     ]);
-    $input      = ['type' => 'contact', 'user' => ['id' => 'user_public']];
+    $input      = ['type' => 'contact', 'user' => ['id' => 'user_public'], 'user_uuid' => 'user-uuid'];
 
     $controller->onBeforeCreate($request, $input);
 
@@ -1623,8 +1615,8 @@ test('internal contact controller create update and after save hooks protect cus
 
     $controller->afterSave($request, $contact);
 
-    expect($input)->toBe(['type' => 'contact', 'user_uuid' => 'resolved-user_public'])
-        ->and($controller->resolvedUsers)->toBe(['user_public'])
+    // The login account is managed by the profile, so a user can't be picked from the console
+    expect($input)->toBe(['type' => 'contact'])
         ->and($contact->normalized)->toBeTrue()
         ->and($contact->syncedCustomFields)->toBe([
             ['key' => 'tier', 'value' => 'gold'],

package/server/tests/Feature/Http/AfaqyRealtimeIngestionTest.php

@@ -596,6 +596,11 @@ test('inbox completion waits for pending deliveries and aggregates quarantined f
     DB::table('telematic_deliveries')->where('uuid', $id)->update(['status' => 'quarantined', 'applied' => 2, 'failed' => 1]);
     Inbox::finishRun('run-pending');
     expect((array) DB::table('telematic_sync_runs')->first())->toMatchArray(['status' => 'partial', 'applied' => 2, 'failed' => 1]);
+
+    // A finished run whose connection was removed completes without touching connection meta
+    DB::table('telematic_sync_runs')->insert(['uuid' => 'run-orphan', 'telematic_uuid' => 'missing-connection', 'status' => 'ingesting', 'created_at' => now(), 'updated_at' => now()]);
+    Inbox::finishRun('run-orphan');
+    expect(DB::table('telematic_sync_runs')->where('uuid', 'run-orphan')->value('status'))->not->toBe('ingesting');
 });
 
 test('telemetry diagnostics report setup receipt backlog and degraded delivery states', function () {

package/server/tests/Feature/Http/Api/DriverControllerAuthFlowsTest.php

@@ -230,6 +230,42 @@ test('password login rejects bad credentials and issues driver tokens', function
         ->and($connection->table('personal_access_tokens')->value('name'))->toBe('driver-1');
 });
 
+test('deactivated driver logins are refused on every sign-in path', function () {
+    $connection = fleetopsDriverAuthBoot();
+    $controller = new DriverController();
+    $connection->table('users')->where('uuid', 'user-1')->update(['status' => 'inactive']);
+    app('hash')->checks = true;
+
+    // An unknown identity fails authentication rather than erroring on a null user
+    $unknown = $controller->login(Request::create('/x', 'POST', ['identity' => 'ghost@example.test', 'password' => 'secret']));
+    expect($unknown->getStatusCode())->toBe(401);
+
+    $password = $controller->login(Request::create('/x', 'POST', ['identity' => 'driver@example.test', 'password' => 'secret']));
+
+    app()->instance('request', Request::create('/x', 'POST', ['phone' => '6591234567']));
+    $phone = $controller->loginWithPhone();
+
+    $connection->table('verification_codes')->insert(['uuid' => 'vc-1', 'subject_uuid' => 'user-1', 'code' => '424242', 'for' => 'driver_login']);
+    $code = $controller->verifyCode(Request::create('/x', 'POST', ['identity' => '6591234567', 'code' => '424242']));
+
+    foreach ([$password, $phone, $code] as $response) {
+        expect($response->getStatusCode())->toBe(403)
+            ->and($response->getData(true)['error'])->toBe(DriverController::DEACTIVATED_LOGIN_MESSAGE);
+    }
+
+    // Password recovery answers as if the identity were unknown
+    $forgot = $controller->forgotPassword(Request::create('/x', 'POST', ['identity' => 'driver@example.test']));
+    $reset  = $controller->resetPassword(Request::create('/x', 'POST', ['identity' => 'driver@example.test', 'code' => '424242', 'password' => 'new-secret-123']));
+
+    expect($forgot->getData(true))->toBe(['status' => 'ok'])
+        ->and($reset->getStatusCode())->toBe(422)
+        ->and($reset->getData(true)['error'])->toBe('Invalid or expired reset code.');
+
+    expect(DriverController::isLoginDeactivated(User::where('uuid', 'user-1')->first()))->toBeTrue()
+        ->and($connection->table('personal_access_tokens')->count())->toBe(0)
+        ->and($connection->table('verification_codes')->count())->toBe(1);
+});
+
 test('phone login falls back to email verification and errors without channels', function () {
     $connection = fleetopsDriverAuthBoot();
     $controller = new DriverController();

package/server/tests/Feature/Http/Api/DriverControllerSessionHelpersTest.php

@@ -106,7 +106,7 @@ function fleetopsDriverSessionHelpersBoot(): SQLiteConnection
     $schema = $connection->getSchemaBuilder();
     app()->instance('db.schema', $schema);
     $tables = [
-        'users'        => ['uuid', 'public_id', 'company_uuid', 'name', 'email', 'phone', 'status', 'type', 'username', 'password'],
+        'users'        => ['uuid', 'public_id', 'company_uuid', 'name', 'email', 'phone', 'status', 'type', 'username', 'password', 'timezone', 'slug', 'meta'],
         'drivers'      => ['uuid', 'public_id', 'internal_id', 'company_uuid', 'user_uuid', 'vehicle_uuid', 'vendor_uuid', 'status', 'online', 'location', 'meta'],
         'companies'    => ['uuid', 'public_id', 'name', 'status', 'owner_uuid'],
         'user_devices' => ['uuid', 'public_id', 'user_uuid', 'token', 'platform', 'status'],
@@ -189,22 +189,35 @@ test('user and driver persistence helpers write records', function () {
     $userDetails = $probe->callHelper('applyUserInfoFromRequest', Request::create('/x', 'POST', []), ['name' => 'Applicant']);
     expect($userDetails['name'])->toBe('Applicant');
 
-    $user = $probe->callHelper('createUser', ['name' => 'New User']);
+    // A company that isn't in the table skips the organization membership seam,
+    // which needs spatie roles; the managed account itself is still created.
+    $missingCompany = '33333333-3333-4333-8333-333333333333';
+
+    $user = $probe->callHelper('resolveDriverAccount', $missingCompany, ['name' => 'New User']);
     expect($user)->toBeInstanceOf(User::class)
-        ->and($connection->table('users')->where('name', 'New User')->count())->toBe(1);
+        ->and($connection->table('users')->where('name', 'New User')->count())->toBe(1)
+        ->and($connection->table('users')->where('name', 'New User')->value('type'))->toBe('driver')
+        ->and($connection->table('users')->where('name', 'New User')->value('status'))->toBe('active');
 
     /*
      * `password` is guarded on User, so mass assignment drops it without a
      * word. The create endpoint has always documented and validated one, so
-     * unless the helper sets it explicitly a driver created through the API
-     * can never sign in with the password chosen for them.
+     * unless it is set explicitly a driver created through the API can never
+     * sign in with the password chosen for them.
      */
-    $withPassword = $probe->callHelper('createUser', ['name' => 'Password User', 'password' => 'seeded-password']);
+    $withPassword = $probe->callHelper('resolveDriverAccount', $missingCompany, ['name' => 'Password User', 'password' => 'seeded-password']);
     $stored       = $connection->table('users')->where('name', 'Password User')->value('password');
     expect(Hash::check('seeded-password', $withPassword->password))->toBeTrue()
         ->and($stored)->not->toBeNull()
         ->and($stored)->not->toBe('seeded-password');
 
+    // A team member of the company with the email is linked instead of duplicated
+    $connection->table('users')->insert(['uuid' => 'staff-1', 'company_uuid' => '22222222-2222-4222-8222-222222222222', 'name' => 'Staff', 'email' => 'staff@example.test', 'type' => 'user']);
+    $linked = $probe->callHelper('resolveDriverAccount', '22222222-2222-4222-8222-222222222222', ['name' => 'Staff Driver', 'email' => 'STAFF@example.test']);
+    expect($linked->uuid)->toBe('staff-1')
+        ->and($connection->table('users')->where('email', 'staff@example.test')->count())->toBe(1)
+        ->and($connection->table('users')->where('uuid', 'staff-1')->value('type'))->toBe('user');
+
     $driver = $probe->callHelper('createDriver', ['company_uuid' => '22222222-2222-4222-8222-222222222222', 'user_uuid' => 'user-1']);
     expect($driver)->toBeInstanceOf(Driver::class);