Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
10 changes: 7 additions & 3 deletions src/Http/Requests/UpdateUserRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'],
Expand Down
Loading