Validate $recaller in MultiAuthCollector.php (barryvdh#638)

n0f · barryvdh · commit 7a47a1012093 · 2017-05-24T10:25:34.000+02:00
Fixed barryvdh#633 . Validate $recaller in MultiAuthCollector.php without the Recaller class. I modified it to work the same as when using the Recaller class.
diff --git a/src/DataCollector/MultiAuthCollector.php b/src/DataCollector/MultiAuthCollector.php
@@ -1,9 +1,10 @@
 <?php
 
 namespace Barryvdh\Debugbar\DataCollector;
-use Illuminate\Auth\Recaller;
+
 use Illuminate\Auth\SessionGuard;
 use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Support\Str;
 
 /**
  * Collector for Laravel's Auth provider
@@ -60,14 +61,16 @@ private function resolveUser(Guard $guard)
         // to prevent csrf token regeneration
 
         $recaller = $guard instanceof SessionGuard
-            ? new Recaller($guard->getRequest()->cookies->get($guard->getRecallerName()))
+            ? $guard->getRequest()->cookies->get($guard->getRecallerName())
             : null;
 
-        if (!is_null($recaller) && $recaller->valid()) {
-            return $guard->getProvider()->retrieveByToken($recaller->id(), $recaller->token());
-        } else {
-            return $guard->user();
+        if (is_string($recaller) && Str::contains($recaller, '|')) {
+            $segments = explode('|', $recaller);
+            if (count($segments) == 2 && trim($segments[0]) !== '' && trim($segments[1]) !== '') {
+                return $guard->getProvider()->retrieveByToken($segments[0], $segments[1]);
+            }
         }
+        return $guard->user();
     }
 
     /**
