Simplify Auth, only add user when already resolved

barryvdh · barryvdh · commit bf19d9362d0e · 2019-08-22T09:52:30.000+02:00
diff --git a/src/DataCollector/MultiAuthCollector.php b/src/DataCollector/MultiAuthCollector.php
@@ -50,21 +50,27 @@ public function setShowName($showName)
      */
     public function collect()
     {
-        $data = [];
+        $data = [
+            'guards' => [],
+        ];
         $names = '';
 
         foreach($this->guards as $guardName => $config) {
             try {
-                $user = $this->resolveUser($this->auth->guard($guardName), $config);
+                $guard = $this->auth->guard($guardName);
+                if ($this->hasUser($guard)) {
+                    $user = $guard->user();
+
+                    if(!is_null($user)) {
+                        $data['guards'][$guardName] = $this->getUserInformation($user);
+                        $names .= $guardName . ": " . $data['guards'][$guardName]['name'] . ', ';
+                    }
+                } else {
+                    $data['guards'][$guardName] = null;
+                }
             } catch (\Exception $e) {
                 continue;
             }
-
-            $data['guards'][$guardName] = $this->getUserInformation($user);
-
-            if(!is_null($user)) {
-                $names .= $guardName . ": " . $data['guards'][$guardName]['name'] . ', ';
-            }
         }
 
         foreach ($data['guards'] as $key => $var) {
@@ -78,23 +84,18 @@ public function collect()
         return $data;
     }
 
-    private function resolveUser(Guard $guard, array $config)
+    private function hasUser(Guard $guard)
     {
-        // if we're logging in using remember token
-        // then we must resolve user „manually”
-        // to prevent csrf token regeneration
-        if ($guard instanceof SessionGuard) {
-
-            $recaller = new Recaller($guard->getRequest()->cookies->get($guard->getRecallerName()));
-            $provider = $this->auth->createUserProvider($config['provider']);
+        if (method_exists($guard, 'hasUser')) {
+            return $guard->hasUser();
+        }
 
-            $user = $provider->retrieveByToken($recaller->id(), $recaller->token());
-            if ($user) {
-                return $user;
-            }
+        // For Laravel 5.5
+        if (method_exists($guard, 'alreadyAuthenticated')) {
+            return $guard->alreadyAuthenticated();
         }
 
-        return $guard->user();
+        return false;
     }
 
     /**
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -449,23 +449,23 @@ function ($query, $bindings = null, $time = null, $connectionName = null) use ($
             $this->addCollector(new FilesCollector($app));
         }
 
-//         if ($this->shouldCollect('auth', false)) {
-//             try {
-//                 $guards = $this->app['config']->get('auth.guards', []);
-//                 $authCollector = new MultiAuthCollector($app['auth'], $guards);
-
-//                 $authCollector->setShowName(
-//                     $this->app['config']->get('debugbar.options.auth.show_name')
-//                 );
-//                 $this->addCollector($authCollector);
-//             } catch (\Exception $e) {
-//                 $this->addThrowable(
-//                     new Exception(
-//                         'Cannot add AuthCollector to Laravel Debugbar: ' . $e->getMessage(), $e->getCode(), $e
-//                     )
-//                 );
-//             }
-//         }
+         if ($this->shouldCollect('auth', false)) {
+             try {
+                 $guards = $this->app['config']->get('auth.guards', []);
+                 $authCollector = new MultiAuthCollector($app['auth'], $guards);
+
+                 $authCollector->setShowName(
+                     $this->app['config']->get('debugbar.options.auth.show_name')
+                 );
+                 $this->addCollector($authCollector);
+             } catch (\Exception $e) {
+                 $this->addThrowable(
+                     new Exception(
+                         'Cannot add AuthCollector to Laravel Debugbar: ' . $e->getMessage(), $e->getCode(), $e
+                     )
+                 );
+             }
+         }
 
         if ($this->shouldCollect('gate', false)) {
             try {
