@fleetbase/fleetops-engine 0.6.71 → 0.6.72

package/server/src/Expansions/UserExpansion.php

@@ -5,6 +5,8 @@ namespace Fleetbase\FleetOps\Expansions;
 use Fleetbase\Build\Expansion;
 use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Models\Driver;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 class UserExpansion implements Expansion
 {
@@ -19,55 +21,55 @@ class UserExpansion implements Expansion
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     * @return HasOne
      */
     public static function driver()
     {
-        return function () {
+        return function (): HasOne {
             /** @var \Illuminate\Database\Eloquent\Model $this */
             return $this->hasOne(Driver::class)->without('user');
         };
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     * @return HasOne
      */
     public static function currentDriverSession()
     {
-        return function () {
+        return function (): HasOne {
             /** @var \Illuminate\Database\Eloquent\Model $this */
             return $this->driver()->where('company_uuid', session('company'));
         };
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return HasMany
      */
     public static function driverProfiles()
     {
-        return function () {
+        return function (): HasMany {
             /** @var \Illuminate\Database\Eloquent\Model $this */
             return $this->hasMany(Driver::class);
         };
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     * @return HasOne
      */
     public static function customer()
     {
-        return function () {
+        return function (): HasOne {
             /** @var \Illuminate\Database\Eloquent\Model $this */
             return $this->hasOne(Contact::class, 'user_uuid', 'uuid')->where('type', 'customer')->without('user');
         };
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     * @return HasOne
      */
     public static function contact()
     {
-        return function () {
+        return function (): HasOne {
             /** @var \Illuminate\Database\Eloquent\Model $this */
             return $this->hasOne(Contact::class, 'user_uuid', 'uuid')->without('user');
         };

package/server/src/Http/Controllers/Api/v1/CustomerController.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
 
+use Fleetbase\Exceptions\SmsBlockedException;
 use Fleetbase\FleetOps\Exceptions\UserAlreadyExistsException;
 use Fleetbase\FleetOps\Http\Requests\CreateCustomerOrderRequest;
 use Fleetbase\FleetOps\Http\Requests\CreateCustomerRequest;
@@ -28,6 +29,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Customer-facing Fleet-Ops API.
@@ -46,6 +48,11 @@ class CustomerController extends Controller
 
     public const DEACTIVATED_LOGIN_MESSAGE = 'This customer login has been deactivated.';
 
+    /**
+     * Wrong guesses a single code tolerates before it locks itself (core's check()).
+     */
+    public const CODE_CHECK_ATTEMPTS = 5;
+
     /* ============================================================
      | Public auth flows (API credential only, no Customer-Token)
      * ============================================================ */
@@ -80,23 +87,21 @@ class CustomerController extends Controller
         $providedName  = trim((string) $request->input('name', ''));
         $providedPhone = $request->filled('phone') ? static::phone($request->input('phone')) : null;
 
-        // The verification code needs a persisted subject so the mail renderer
-        // can resolve the polymorphic `subject` relation (the verification blade
-        // template references `$user->name`). Look up — or create — the User
-        // before sending. `create()` later backfills password + remaining fields
-        // on this same row when the customer confirms the code.
+        // The code's subject is the person signing up: an existing user (a prior
+        // incomplete signup, or an account in another organization) as it stands, else
+        // an unsaved User carrying the name and contact details the message needs.
+        // Nothing is persisted until create() verifies the code — a users row per
+        // unverified identity was a way to fill the table from a leaked credential.
         $subject = $this->findActiveUserByIdentity($identity, $isEmail ? 'email' : 'phone');
 
         if (!$subject) {
-            // `password` and `type` are guarded on User; assign type after create
-            // via setUserType (saves the row).
-            $subject = $this->createUser([
+            $subject = new User();
+            $subject->forceFill([
                 'company_uuid' => $sessionCompany,
                 'name'         => $providedName !== '' ? $providedName : $identity,
                 'email'        => $isEmail ? $identity : null,
                 'phone'        => $isEmail ? $providedPhone : $identity,
             ]);
-            $subject->setUserType('customer');
         } elseif ($providedName !== '' && (!$subject->name || $subject->name === $subject->email)) {
             // Existing stub user from a prior incomplete signup — refresh the
             // greeting name if the client supplied one.
@@ -118,10 +123,13 @@ class CustomerController extends Controller
                 ]);
             } else {
                 $this->generateSmsVerification($subject, 'fleetops_create_customer', [
+                    'hashed'          => true,
                     'messageCallback' => fn ($verification) => 'Your ' . config('app.name') . ' verification code is ' . $verification->code,
                     'meta'            => $meta,
                 ]);
             }
+        } catch (SmsBlockedException $e) {
+            return static::smsBlockedResponse($e);
         } catch (\Twilio\Exceptions\RestException $e) {
             return response()->apiError($e->getMessage());
         } catch (\Exception $e) {
@@ -391,13 +399,21 @@ class CustomerController extends Controller
             return response()->apiError(static::DEACTIVATED_LOGIN_MESSAGE, 403);
         }
 
+        // A guard refusal (paused, over budget, unusable number) falls back to email like
+        // a provider failure does; with no email to fall back to, the refusal itself is the
+        // answer, with its status, not the generic error.
+        $smsFailure = null;
+
         try {
             $this->generateSmsVerification($user, 'fleetops_customer_login', [
+                'hashed'          => true,
                 'messageCallback' => fn ($verification) => 'Your ' . config('app.name') . ' verification code is ' . $verification->code,
             ]);
 
             return response()->json(['status' => 'ok', 'method' => 'sms']);
         } catch (\Throwable $e) {
+            $smsFailure = $e;
+
             if ($user->email) {
                 try {
                     $this->generateEmailVerification($user, 'fleetops_customer_login', [
@@ -407,12 +423,12 @@ class CustomerController extends Controller
 
                     return response()->json(['status' => 'ok', 'method' => 'email']);
                 } catch (\Throwable $inner) {
-                    return response()->apiError('Unable to send verification code.');
+                    return static::sendFailureResponse($smsFailure, 'Unable to send verification code.');
                 }
             }
         }
 
-        return response()->apiError('Unable to send verification code.');
+        return static::sendFailureResponse($smsFailure, 'Unable to send verification code.');
     }
 
     /**
@@ -494,10 +510,13 @@ class CustomerController extends Controller
                 ]);
             } else {
                 $this->generateSmsVerification($user, 'fleetops_customer_password_reset', [
+                    'hashed'          => true,
                     'messageCallback' => fn ($v) => 'Your ' . config('app.name') . ' password reset code is ' . $v->code,
                     'meta'            => $meta,
                 ]);
             }
+        } catch (SmsBlockedException $e) {
+            return static::smsBlockedResponse($e);
         } catch (\Throwable $e) {
             return response()->apiError(app()->hasDebugModeEnabled() ? $e->getMessage() : 'Unable to send reset code.');
         }
@@ -542,12 +561,9 @@ class CustomerController extends Controller
         // setPasswordAttribute mutator hashes plaintext; don't pre-hash here.
         $user->password = $password;
         $user->save();
-        // Invalidate all existing sessions for this user after a password reset.
+        // Invalidate all existing sessions for this user after a password reset. The
+        // code itself was used up when it verified (findVerificationCode).
         $this->deleteUserTokens($user);
-        // Null on the testing-bypass path — there is no row to consume.
-        if ($verificationCode) {
-            $verificationCode->delete();
-        }
 
         return response()->json(['status' => 'ok']);
     }
@@ -948,6 +964,36 @@ class CustomerController extends Controller
         return VerificationCode::generateSmsVerificationFor($user, $for, $options);
     }
 
+    /**
+     * Answer a refusal from the SMS guard with the status it carries: 422 for a number that
+     * can never be texted, 429 with Retry-After for a cooldown or budget, 423 while texting
+     * is paused. The sends here sit inside catch-alls so a provider outage becomes an email
+     * fallback or a generic error; a refusal must not be flattened into that generic error,
+     * or an app can neither explain it to the person nor back off.
+     */
+    protected static function smsBlockedResponse(SmsBlockedException $e)
+    {
+        $response = response()->apiError($e->getMessage(), $e->status());
+        if ($response instanceof Response) {
+            $response->headers->add($e->headers());
+        }
+
+        return $response;
+    }
+
+    /**
+     * The response when a code could not be sent: the guard's refusal when that is why,
+     * otherwise the flow's own generic message.
+     */
+    protected static function sendFailureResponse(?\Throwable $failure, string $message)
+    {
+        if ($failure instanceof SmsBlockedException) {
+            return static::smsBlockedResponse($failure);
+        }
+
+        return response()->apiError($message);
+    }
+
     /**
      * Whether the supplied code matches the configured testing bypass code.
      *
@@ -978,14 +1024,58 @@ class CustomerController extends Controller
         );
     }
 
+    /**
+     * Whether the submitted code verifies against a live code for the purpose and
+     * subject or identity in `$attributes`, using the code up when it does.
+     */
     protected function verificationCodeExists(array $attributes): bool
     {
-        return VerificationCode::where($attributes)->exists();
+        return $this->findVerificationCode($attributes) !== null;
     }
 
+    /**
+     * The live code the submitted code verified against, used up so it cannot verify
+     * again, or null. `$attributes` carries `code`, `for` and either `subject_uuid` or
+     * `meta->identity`. Live codes are checked newest first; a wrong guess counts against
+     * each until it locks (core's check()). Plaintext rows written before codes were hashed
+     * verify the same way.
+     */
     protected function findVerificationCode(array $attributes): mixed
     {
-        return VerificationCode::where($attributes)->first();
+        $code = (string) ($attributes['code'] ?? '');
+
+        foreach ($this->liveVerificationCodes($attributes) as $verificationCode) {
+            if ($verificationCode->check($code, static::CODE_CHECK_ATTEMPTS) === VerificationCode::CHECK_VALID) {
+                $verificationCode->consume();
+
+                return $verificationCode;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Unexpired, unused, unlocked codes for the purpose and subject or identity in
+     * `$attributes`, newest first.
+     *
+     * @return \Illuminate\Support\Collection<int, VerificationCode>
+     */
+    protected function liveVerificationCodes(array $attributes)
+    {
+        $query = VerificationCode::query()
+            ->where('for', (string) ($attributes['for'] ?? ''))
+            ->where(function ($query) {
+                $query->whereNull('status')->orWhereNotIn('status', [VerificationCode::STATUS_USED, VerificationCode::STATUS_LOCKED]);
+            });
+
+        foreach (['subject_uuid', 'meta->identity'] as $column) {
+            if (array_key_exists($column, $attributes)) {
+                $query->where($column, $attributes[$column]);
+            }
+        }
+
+        return $query->orderByDesc('created_at')->get();
     }
 
     protected function findFileByPublicId(string $publicId): mixed

package/server/src/Http/Controllers/Api/v1/DriverController.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
 
+use Fleetbase\Exceptions\SmsBlockedException;
 use Fleetbase\FleetOps\Events\DriverLocationChanged;
 use Fleetbase\FleetOps\Events\GeofenceEntered;
 use Fleetbase\FleetOps\Events\GeofenceExited;
@@ -21,9 +22,11 @@ use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Models\Vendor;
+use Fleetbase\FleetOps\Support\ApiCacheThrottle;
 use Fleetbase\FleetOps\Support\GeofenceIntersectionService;
 use Fleetbase\FleetOps\Support\OSRM;
 use Fleetbase\FleetOps\Support\ProfileAccountManager;
+use Fleetbase\FleetOps\Support\TrackingPublisher;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Http\Requests\SwitchOrganizationRequest;
@@ -42,6 +45,7 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
+use Symfony\Component\HttpFoundation\Response;
 
 class DriverController extends Controller
 {
@@ -54,6 +58,11 @@ class DriverController extends Controller
      */
     public const DEACTIVATED_LOGIN_MESSAGE = 'This driver login has been deactivated.';
 
+    /**
+     * Wrong guesses a single code tolerates before it locks itself (core's check()).
+     */
+    public const CODE_CHECK_ATTEMPTS = 5;
+
     /**
      * Public expansion name => Eloquent relation name.
      *
@@ -373,7 +382,14 @@ class DriverController extends Controller
             }
         }
 
+        // Location writes are quiet and frequent: invalidate cached lists at most once a window
+        ApiCacheThrottle::invalidate($driver, $driver->company_uuid);
+        if ($vehicle) {
+            ApiCacheThrottle::invalidate($vehicle, $vehicle->company_uuid);
+        }
+
         broadcast(new DriverLocationChanged($driver));
+        app(TrackingPublisher::class)->driverMoved($driver);
 
         // ----------------------------------------------------------------
         // Geofence intersection detection
@@ -431,11 +447,13 @@ class DriverController extends Controller
 
         // Perform a single update call
         $driver->updateQuietly(['online' => $onlineValue]);
+        $driver->invalidateApiCache();
 
         // Update vehicle online too
         $driver->loadMissing('vehicle');
         if ($vehicle = $driver->vehicle) {
             $vehicle->updateQuietly(['online' => $onlineValue]);
+            $vehicle->invalidateApiCache();
         }
 
         // Return the updated resource
@@ -574,9 +592,15 @@ class DriverController extends Controller
         // Get the user's company for this driver profile
         $company = static::getDriverCompanyFromUser($user);
 
+        // A guard refusal (paused, over budget, unusable number) falls back to email like
+        // a provider failure does; with no email to fall back to, the refusal itself is the
+        // answer, with its status, not the generic error.
+        $smsFailure = null;
+
         // generate verification token
         try {
             VerificationCode::generateSmsVerificationFor($user, 'driver_login', [
+                'hashed'          => true,
                 'company_uuid'    => $company->uuid,
                 'messageCallback' => function ($verification) use ($company) {
                     return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
@@ -585,6 +609,8 @@ class DriverController extends Controller
 
             return response()->json(['status' => 'OK', 'method' => 'sms']);
         } catch (\Throwable $e) {
+            $smsFailure = $e;
+
             if (app()->bound('sentry')) {
                 app('sentry')->captureException($e);
             }
@@ -608,7 +634,7 @@ class DriverController extends Controller
             }
         }
 
-        return response()->apiError('Unable to send SMS Verification code.');
+        return static::sendFailureResponse($smsFailure, 'Unable to send SMS Verification code.');
     }
 
     /**
@@ -641,8 +667,8 @@ class DriverController extends Controller
             return response()->apiError(static::DEACTIVATED_LOGIN_MESSAGE, 403);
         }
 
-        // find and verify code
-        $verificationCode = VerificationCode::where(['subject_uuid' => $user->uuid, 'code' => $code, 'for' => $for])->exists();
+        // find and verify code: the user's newest live code for this purpose, used up
+        $verificationCode = static::spendCode($user, $for, (string) $code);
         if (!$verificationCode && !static::verificationBypassMatches($identity, $code)) {
             return response()->apiError('Invalid verification code!');
         }
@@ -1336,6 +1362,8 @@ class DriverController extends Controller
 
         try {
             static::sendResetCode($user, $identity);
+        } catch (SmsBlockedException $e) {
+            return static::smsBlockedResponse($e);
         } catch (\Throwable $e) {
             return response()->apiError(static::debugEnabled() ? $e->getMessage() : 'Unable to send reset code.');
         }
@@ -1376,7 +1404,7 @@ class DriverController extends Controller
         $user->password = $password;
         $user->save();
 
-        $verification->delete();
+        // The code was used up when it verified (findResetCode); every session ends.
         $user->tokens()->delete();
 
         return response()->json(['status' => 'ok']);
@@ -1411,14 +1439,40 @@ class DriverController extends Controller
         return Hash::check($plain, $user->password);
     }
 
-    /** The unexpired reset code for this user, if the one supplied matches. */
+    /**
+     * The live reset code the supplied one verified against, used up so it cannot
+     * verify again, or null.
+     */
     protected static function findResetCode(User $user, string $code)
     {
-        return VerificationCode::where([
-            'subject_uuid' => $user->uuid,
-            'code'         => $code,
-            'for'          => 'driver_password_reset',
-        ])->where('expires_at', '>', now())->first();
+        return static::spendCode($user, 'driver_password_reset', $code);
+    }
+
+    /**
+     * Verify a code against the user's live codes for a purpose and use it up. Codes are
+     * checked newest first; a wrong guess counts against each until it locks (core's
+     * check()). Plaintext rows written before codes were hashed verify the same way.
+     */
+    protected static function spendCode(User $user, string $for, string $code): ?VerificationCode
+    {
+        $live = VerificationCode::query()
+            ->where('for', $for)
+            ->where('subject_uuid', $user->uuid)
+            ->where(function ($query) {
+                $query->whereNull('status')->orWhereNotIn('status', [VerificationCode::STATUS_USED, VerificationCode::STATUS_LOCKED]);
+            })
+            ->orderByDesc('created_at')
+            ->get();
+
+        foreach ($live as $verificationCode) {
+            if ($verificationCode->check($code, static::CODE_CHECK_ATTEMPTS) === VerificationCode::CHECK_VALID) {
+                $verificationCode->consume();
+
+                return $verificationCode;
+            }
+        }
+
+        return null;
     }
 
     /** Sends the reset code by whichever channel the identity names. */
@@ -1433,11 +1487,42 @@ class DriverController extends Controller
             ]);
         } else {
             VerificationCode::generateSmsVerificationFor($user, 'driver_password_reset', [
+                'hashed'          => true,
                 'messageCallback' => fn ($v) => 'Your ' . config('app.name') . ' password reset code is ' . $v->code,
             ]);
         }
     }
 
+    /**
+     * Answer a refusal from the SMS guard with the status it carries: 422 for a number that
+     * can never be texted, 429 with Retry-After for a cooldown or budget, 423 while texting
+     * is paused. The sends here sit inside catch-alls so a provider outage becomes an email
+     * fallback or a generic error; a refusal must not be flattened into that generic error,
+     * or an app can neither explain it to the person nor back off.
+     */
+    protected static function smsBlockedResponse(SmsBlockedException $e)
+    {
+        $response = response()->apiError($e->getMessage(), $e->status());
+        if ($response instanceof Response) {
+            $response->headers->add($e->headers());
+        }
+
+        return $response;
+    }
+
+    /**
+     * The response when a code could not be sent: the guard's refusal when that is why,
+     * otherwise the flow's own generic message.
+     */
+    protected static function sendFailureResponse(?\Throwable $failure, string $message)
+    {
+        if ($failure instanceof SmsBlockedException) {
+            return static::smsBlockedResponse($failure);
+        }
+
+        return response()->apiError($message);
+    }
+
     /** Resolve a driver's user account from an email address or a phone number. */
     protected static function findDriverUserByIdentity(string $identity): ?User
     {

package/server/src/Http/Controllers/Api/v1/EntityController.php

@@ -2,13 +2,17 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
 
+use Fleetbase\FleetOps\Exceptions\OrderEditLockedException;
 use Fleetbase\FleetOps\Http\Requests\CreateEntityRequest;
 use Fleetbase\FleetOps\Http\Requests\UpdateEntityRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\FleetOps\Http\Resources\v1\Entity as EntityResource;
 use Fleetbase\FleetOps\Models\Entity;
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Payload;
 use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\FleetOps\Support\OrderEdit;
+use Fleetbase\FleetOps\Support\OrderEditPolicy;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Illuminate\Http\Request;
@@ -79,8 +83,15 @@ class EntityController extends Controller
         // make sure company is set
         $input['company_uuid'] = session('company');
 
+        // adding an item to an order is refused once the order's status locks its items
+        $edit = $this->orderEditForPayload($input['payload_uuid'] ?? null);
+        if ($locked = $this->guardItemsEdit($edit, true)) {
+            return $locked;
+        }
+
         // create the entity
         $entity = $this->createEntity($input);
+        $this->commitItemsEdit($edit);
 
         // response the driver resource
         return $this->entityResource($entity);
@@ -159,8 +170,15 @@ class EntityController extends Controller
             }
         }
 
+        // changing an order's item is refused once the order's status locks its items
+        $edit = $this->orderEditForPayload($entity->payload_uuid);
+        if ($locked = $this->guardItemsEdit($edit, true)) {
+            return $locked;
+        }
+
         // update the entity
         $entity->update($input);
+        $this->commitItemsEdit($edit);
 
         // response the entity resource
         return $this->entityResource($entity);
@@ -220,13 +238,61 @@ class EntityController extends Controller
             );
         }
 
+        // removing an order's item is refused once the order's status locks its items
+        $edit = $this->orderEditForPayload($entity->payload_uuid);
+        if ($locked = $this->guardItemsEdit($edit, false)) {
+            return $locked;
+        }
+
         // delete the entity
         $entity->delete();
+        $this->commitItemsEdit($edit);
 
         // response the entity resource
         return $this->deletedEntityResource($entity);
     }
 
+    /**
+     * Begin an edit of the order the payload belongs to, if it belongs to one.
+     */
+    protected function orderEditForPayload(?string $payloadUuid): ?OrderEdit
+    {
+        if (!$payloadUuid) {
+            return null;
+        }
+
+        try {
+            $order = Order::where('payload_uuid', $payloadUuid)->first();
+        } catch (\Throwable) {
+            return null;
+        }
+
+        return $order ? OrderEdit::begin($order) : null;
+    }
+
+    /**
+     * A 422 response when the order's status locks the item change, otherwise null.
+     */
+    protected function guardItemsEdit(?OrderEdit $edit, bool $adds)
+    {
+        if (!$edit) {
+            return null;
+        }
+
+        try {
+            $edit->guard([OrderEditPolicy::FIELD_ITEMS => ['adds' => $adds]]);
+        } catch (OrderEditLockedException $exception) {
+            return response()->apiError($exception->getMessage(), 422, $exception->toResponseData());
+        }
+
+        return null;
+    }
+
+    protected function commitItemsEdit(?OrderEdit $edit): void
+    {
+        $edit?->commit();
+    }
+
     protected function entityInputFromRequest(Request $request): array
     {
         return $request->only([

package/server/src/Http/Controllers/Api/v1/FleetController.php

@@ -434,10 +434,13 @@ class FleetController extends Controller
 
     protected function removeVehicleFromFleet(Fleet $fleet, Vehicle $vehicle): void
     {
-        FleetVehicle::where([
+        // Deleted without model events; fleet_vehicles rows carry no company
+        if (FleetVehicle::where([
             'fleet_uuid'   => $fleet->uuid,
             'vehicle_uuid' => $vehicle->uuid,
-        ])->delete();
+        ])->delete()) {
+            FleetVehicle::invalidateApiCacheManually();
+        }
     }
 
     protected function assignDriverToFleet(Fleet $fleet, Driver $driver): void
@@ -450,10 +453,13 @@ class FleetController extends Controller
 
     protected function removeDriverFromFleet(Fleet $fleet, Driver $driver): void
     {
-        FleetDriver::where([
+        // Deleted without model events; fleet_drivers rows carry no company
+        if (FleetDriver::where([
             'fleet_uuid'  => $fleet->uuid,
             'driver_uuid' => $driver->uuid,
-        ])->delete();
+        ])->delete()) {
+            FleetDriver::invalidateApiCacheManually();
+        }
     }
 
     protected function vehicleMembershipPayload(Fleet $fleet, Vehicle $vehicle, bool $assigned): array