Merge pull request #167 from fleetbase/v1.6.24

v1.6.24 ~ critical hotfix on validation implementation and ran linter

Author: roncodes

composer.json

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

src/Http/Requests/ChangePasswordRequest.php

@@ -37,12 +37,12 @@ public function rules()
     public function messages()
     {
         return [
-            '*.required'        => 'Your :attribute is required.',
-            'password.required' => 'You must enter a password.',
-            'password.mixed' => 'Password must contain both uppercase and lowercase letters.',
-            'password.letters' => 'Password must contain at least 1 letter.',
-            'password.numbers' => 'Password must contain at least 1 number.',
-            'password.symbols' => 'Password must contain at least 1 symbol.',
+            '*.required'             => 'Your :attribute is required.',
+            'password.required'      => 'You must enter a password.',
+            'password.mixed'         => 'Password must contain both uppercase and lowercase letters.',
+            'password.letters'       => 'Password must contain at least 1 letter.',
+            'password.numbers'       => 'Password must contain at least 1 number.',
+            'password.symbols'       => 'Password must contain at least 1 symbol.',
             'password.uncompromised' => 'The password you entered has appeared in a data breach. Please choose a different one.',
         ];
     }

src/Http/Requests/CreateUserRequest.php

@@ -24,7 +24,7 @@ class CreateUserRequest extends FleetbaseRequest
      */
     public function authorize()
     {
-        return true;
+        return session('company');
     }
 
     /**
@@ -38,7 +38,7 @@ public function rules()
             'name'                  => ['required', 'min:2', 'max:50', 'regex:/^(?!.*\b[a-z0-9]+(?:\.[a-z0-9]+){1,}\b)[a-zA-ZÀ-ÿ\'\-\s\.]+$/u', new ExcludeWords($this->excludedWords)],
             'email'                 => ['required', 'email', Rule::unique('users', 'email')->whereNull('deleted_at'), new EmailDomainExcluded()],
             'phone'                 => ['required', new ValidPhoneNumber(), Rule::unique('users', 'phone')->whereNull('deleted_at')],
-            'password'              => ['required', 'confirmed', 'string', Password::min(8)->mixedCase()->letters()->numbers()->symbols()->uncompromised()],
+            'password'              => ['sometimes', 'confirmed', 'string', Password::min(8)->mixedCase()->letters()->numbers()->symbols()->uncompromised()],
             'password_confirmation' => ['sometimes', 'min:4', 'max:64'],
         ];
     }
@@ -51,15 +51,15 @@ public function rules()
     public function messages()
     {
         return [
-            '*.required'        => 'Your :attribute is required',
-            'email'             => 'You must enter a valid :attribute',
-            'email.unique'      => 'An account with this email address already exists',
-            'phone.unique'      => 'An account with this phone number already exists',
-            'password.required' => 'You must enter a password.',
-            'password.mixed' => 'Password must contain both uppercase and lowercase letters.',
-            'password.letters' => 'Password must contain at least 1 letter.',
-            'password.numbers' => 'Password must contain at least 1 number.',
-            'password.symbols' => 'Password must contain at least 1 symbol.',
+            '*.required'             => 'Your :attribute is required',
+            'email'                  => 'You must enter a valid :attribute',
+            'email.unique'           => 'An account with this email address already exists',
+            'phone.unique'           => 'An account with this phone number already exists',
+            'password.required'      => 'You must enter a password.',
+            'password.mixed'         => 'Password must contain both uppercase and lowercase letters.',
+            'password.letters'       => 'Password must contain at least 1 letter.',
+            'password.numbers'       => 'Password must contain at least 1 number.',
+            'password.symbols'       => 'Password must contain at least 1 symbol.',
             'password.uncompromised' => 'The password you entered has appeared in a data breach. Please choose a different one.',
         ];
     }

src/Http/Requests/OnboardRequest.php

@@ -52,15 +52,15 @@ public function rules()
     public function messages()
     {
         return [
-            '*.required'        => 'Your :attribute is required to signup',
-            'email'             => 'You must enter a valid :attribute to signup',
-            'email.unique'      => 'An account with this email address already exists',
-            'phone.unique'      => 'An account with this phone number already exists',
-            'password.required' => 'You must enter a password.',
-            'password.mixed' => 'Password must contain both uppercase and lowercase letters.',
-            'password.letters' => 'Password must contain at least 1 letter.',
-            'password.numbers' => 'Password must contain at least 1 number.',
-            'password.symbols' => 'Password must contain at least 1 symbol.',
+            '*.required'             => 'Your :attribute is required to signup',
+            'email'                  => 'You must enter a valid :attribute to signup',
+            'email.unique'           => 'An account with this email address already exists',
+            'phone.unique'           => 'An account with this phone number already exists',
+            'password.required'      => 'You must enter a password.',
+            'password.mixed'         => 'Password must contain both uppercase and lowercase letters.',
+            'password.letters'       => 'Password must contain at least 1 letter.',
+            'password.numbers'       => 'Password must contain at least 1 number.',
+            'password.symbols'       => 'Password must contain at least 1 symbol.',
             'password.uncompromised' => 'The password you entered has appeared in a data breach. Please choose a different one.',
         ];
     }

src/Traits/HasApiControllerBehavior.php

@@ -299,7 +299,6 @@ public function validateRequest(Request $request): void
             /** @var FormRequest $formRequest */
             $formRequest = $requestClass::createFrom($request);
             $formRequest->setContainer(app())->setRedirector(app(Redirector::class));
-            $formRequest->replace($input);
 
             $rules      = $formRequest->rules();
             $messages   = method_exists($formRequest, 'messages') ? $formRequest->messages() : [];