validations fix

Author: SSOfy

src/Controllers/AuthController.php

@@ -17,7 +17,6 @@
 class AuthController extends Controller
 {
     use Validation;
-    use Mask;
 
     /*
      ------------------------------------------------------------

src/Controllers/ResourceDataController.php

@@ -30,7 +30,7 @@ class ResourceDataController extends Controller
      */
     public function scopes(Request $request, ScopeRepositoryInterface $scopeRepository)
     {
-        $this->validateScopeEntitiesRequest($request);
+        $this->validateScopeResourceRequest($request);
 
         $lang = $request->input('lang');
 
@@ -44,7 +44,7 @@ public function scopes(Request $request, ScopeRepositoryInterface $scopeReposito
      */
     public function client(Request $request, ClientRepositoryInterface $clientRepository)
     {
-        $this->validateClientEntityRequest($request);
+        $this->validateClientResourceRequest($request);
 
         $clientId = $request->input('id');
 
@@ -63,7 +63,7 @@ public function client(Request $request, ClientRepositoryInterface $clientReposi
      */
     public function user(Request $request, UserRepositoryInterface $userRepository)
     {
-        $this->validateUserEntityRequest($request);
+        $this->validateUserResourceRequest($request);
 
         $scopes = $request->input('scopes');
 

src/Requests/ClientEntityRequest.php

@@ -16,6 +16,6 @@ public function authorize()
 
     public function rules()
     {
-        return $this->clientEntityRules();
+        return $this->clientResourceRules();
     }
 }

src/Requests/ScopeEntitiesRequest.php

@@ -16,6 +16,6 @@ public function authorize()
 
     public function rules()
     {
-        return $this->scopeEntitiesRules();
+        return $this->scopeResourceRules();
     }
 }

src/Requests/UserEntityRequest.php

@@ -16,6 +16,6 @@ public function authorize()
 
     public function rules()
     {
-        return $this->userEntityRules();
+        return $this->userResourceRules();
     }
 }

src/Traits/Rules.php

@@ -53,7 +53,7 @@ protected function socialAuthRules()
     protected function otpOptionsRules()
     {
         return [
-            'action'     => ['required', 'string', 'in:login,password_reset'],
+            'action'     => ['required', 'string', 'in:authentication,password_reset,password_renew'],
             'method'     => ['required', 'string', 'in:username,email,phone'],
             'identifier' => ['required', 'string'],
             'ip'         => ['nullable', 'ip'],
@@ -74,17 +74,17 @@ public function eventRules()
     /**
      * @return array
      */
-    public function scopeEntitiesRules()
+    public function scopeResourceRules()
     {
         return [
-            'lang' => ['nullable', 'string', 'max:2'],
+            'lang' => ['nullable', 'string', 'max:5'],
         ];
     }
 
     /**
      * @return array
      */
-    public function clientEntityRules()
+    public function clientResourceRules()
     {
         return [
             'id' => ['required', 'string', 'min:1'],
@@ -94,7 +94,7 @@ public function clientEntityRules()
     /**
      * @return array
      */
-    public function userEntityRules()
+    public function userResourceRules()
     {
         return [
             'id'       => ['nullable', 'string'],

src/Traits/Validation.php

@@ -67,26 +67,26 @@ public function validateEventRequest(Request $request)
      * @param Request $request
      * @return array
      */
-    public function validateScopeEntitiesRequest(Request $request)
+    public function validateScopeResourceRequest(Request $request)
     {
-        return $request->validate($this->scopeEntitiesRules(), $request->input());
+        return $request->validate($this->scopeResourceRules(), $request->input());
     }
 
     /**
      * @param Request $request
      * @return array
      */
-    public function validateClientEntityRequest(Request $request)
+    public function validateClientResourceRequest(Request $request)
     {
-        return $request->validate($this->clientEntityRules(), $request->input());
+        return $request->validate($this->clientResourceRules(), $request->input());
     }
 
     /**
      * @param Request $request
      * @return array
      */
-    public function validateUserEntityRequest(Request $request)
+    public function validateUserResourceRequest(Request $request)
     {
-        return $request->validate($this->userEntityRules(), $request->input());
+        return $request->validate($this->userResourceRules(), $request->input());
     }
 }