added capability for additional column check on user authority table

livelyworks · Oct 17, 2017 · 9859a39 · 9859a39
1 parent dba80bc
commit 9859a39
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/YesAuthority.php b/src/YesAuthority.php
@@ -136,7 +136,12 @@ protected function configure($requestForUserId = null, $options = [])
             }
 
             $userModel = new $userModelString;
-            $userFound = $userModel->findOrFail($requestForUserId);
+            //$userFound = $userModel->findOrFail($requestForUserId);
+            if(is_array($requestForUserId)) {
+                $userFound = $userModel->where($requestForUserId)->first();
+            } else {
+                $userFound = $userModel->where($this->configColUserId, $requestForUserId)->first();
+            }
             $this->userIdentified   = $userFound->toArray();
         }
 
@@ -153,8 +158,14 @@ protected function configure($requestForUserId = null, $options = [])
                             throw new Exception('YesAuthority - User model does not exist.');
                         }
                         $userModel = new $userModelString;
-                        $userFound = $userModel->where($this->configColUserId, Auth::id())->first();
-                        $this->userIdentified   = $userFound->toArray();     
+                        // $userFound = $userModel->where($this->configColUserId, Auth::id())->first();
+                        if(is_array($requestForUserId)) {
+                            $userFound = $userModel->where($requestForUserId)->first();
+                        } else {
+                            $userFound = $userModel->where($this->configColUserId, Auth::id())->first();
+                        }
+
+                        $this->userIdentified   = $userFound->toArray();
                     } else {
                         $this->userIdentified  = Auth::user()->toArray();
                     }