From a88e535f0a888eac7880bb3d0e46e0f26abb1eb4 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Fri, 24 Apr 2026 11:13:27 +0800 Subject: [PATCH 1/2] Fix user update email uniqueness validation --- src/Http/Requests/UpdateUserRequest.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Http/Requests/UpdateUserRequest.php b/src/Http/Requests/UpdateUserRequest.php index e676e2e..ad1fb77 100644 --- a/src/Http/Requests/UpdateUserRequest.php +++ b/src/Http/Requests/UpdateUserRequest.php @@ -4,6 +4,7 @@ use Fleetbase\Rules\EmailDomainExcluded; use Fleetbase\Rules\ValidPhoneNumber; +use Illuminate\Database\Eloquent\Model; use Illuminate\Validation\Rule; class UpdateUserRequest extends FleetbaseRequest @@ -30,9 +31,12 @@ public function authorize() */ public function rules() { - // Resolve the target user UUID from the route parameter so that the - // uniqueness rules can correctly ignore the user's own current value. - $userId = $this->route('id'); + // REST routes generated by the custom registrar use the singular + // resource wildcard (e.g. `/users/{user}`), while some bespoke routes + // still use `{id}`. Support both so uniqueness rules correctly ignore + // the current user's own row during updates. + $userRouteParam = $this->route('user') ?? $this->route('id'); + $userId = $userRouteParam instanceof Model ? $userRouteParam->getKey() : $userRouteParam; return [ 'name' => ['sometimes', 'required', 'string', 'min:2', 'max:100'], From 312b0d1f534d15f52c6a6aafa5b4b2d5240e89a7 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Fri, 24 Apr 2026 11:56:56 +0800 Subject: [PATCH 2/2] bump version to v1.6.44 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 42fe5bf..78550c5 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "fleetbase/core-api", - "version": "1.6.43", + "version": "1.6.44", "description": "Core Framework and Resources for Fleetbase API", "keywords": [ "fleetbase",