Merge pull request #469 from sobolevna/master

Update Authentication.php
antonioribeiro · Oct 1, 2019 · 76e8e7f · 76e8e7f
2 parents f5cfac8 + 2128d96
commit 76e8e7f
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/Services/Authentication.php b/src/Services/Authentication.php
@@ -36,14 +36,13 @@ private function executeAuthMethod($method)
         foreach ($this->getAuthentication() as $auth) {
             foreach ($guards as $guard) {
                 // Call guard() if not null
-                if ($guards != 'null') {
+                if ($guard && $guard != 'null') {
                     $auth = $auth->guard($guard);
-                }
-
-                if (is_callable([$auth, $method], true, $callable_name)) {
-                    if ($data = $auth->$method()) {
-                        return $data;
-                    }
+                }                
+            }
+            if (is_callable([$auth, $method], true, $callable_name)) {
+                if ($data = $auth->$method()) {
+                    return $data;
                 }
             }
         }