Moved IP & browser resolvers into the manager and added methods to interface.

Author: olsgreen

src/AuthManager.php

@@ -9,6 +9,7 @@
 use Illuminate\Cookie\CookieJar;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
+use UAParser\Parser;
 
 class AuthManager implements ManagerContract
 {
@@ -110,4 +111,26 @@ public function fingerprint(Request $request)
             $request
         );
     }
+
+    public function resolveBrowserNameFromRequest(Request $request)
+    {
+        $parser = Parser::create();
+        
+        $result = $parser->parse($request->server->get('HTTP_USER_AGENT'));
+
+        return $result->ua->family . ' (' . $result->os->family . ')';
+    }
+
+    public function resolveAddressFromRequest(Request $request)
+    {
+        if (!empty($request->server->get('HTTP_CLIENT_IP'))) {
+            return $request->server->get('HTTP_CLIENT_IP');
+        }
+
+        if (!empty($request->server->get('HTTP_X_FORWARDED_FOR'))) {
+            return $request->server->get('HTTP_X_FORWARDED_FOR');
+        }
+
+        return $request->server->get('REMOTE_ADDR');
+    }
 }

src/Contracts/AuthManager.php

@@ -9,11 +9,26 @@ interface AuthManager
 {
     const NO_AUTH_REQUEST = 'no_auth_request';
 
-    public function challenge(HasDeviceAuthorizations $user, $fingerprint, $browser, $ip);
-
-    public function verify(HasDeviceAuthorizations $user, $fingerprint, $token);
-
-    public function setEventDispatcher(EventDispatcher $events);
-
-    public function getEventDispatcher();
+    public function requestAuthorization();
+    
+    public function requiresAuthorization();
+    
+    public function revokeAuthorizationRequest();
+    
+    public function setDeviceTokenCookie(Response $response, $token);
+    
+    public function getDeviceTokenCookie(Request $request);
+    
+    public function setClientFingerprint(Request $request, $fingerprint);
+    
+    public function forgetClientFingerprint(Request $request);
+    
+    public function isAuthorized(Request $request);
+    
+    public function fingerprint(Request $request);
+    
+    public function resolveBrowserNameFromRequest(Request $request);
+    
+    public function resolveAddressFromRequest(Request $request);
+    
 }

src/Http/Traits/DeviceAuthorization.php

@@ -20,9 +20,9 @@ public function challenge(Request $request)
 
         $fingerprint = $this->manager()->fingerprint($request);
 
-        $browser = $this->resolveBrowserNameFromRequest($request);
+        $browser = $this->manager()->resolveBrowserFromRequest($request);
 
-        $ip = $this->resolveAddressFromRequest($request);
+        $ip = $this->manager()->resolveAddressFromRequest($request);
 
         $response = $this->broker()->challenge(
             $request->user(), $fingerprint, $browser, $ip
@@ -107,28 +107,6 @@ protected function routeResponse($response)
         throw new DeviceAuthorizationLogicException;
     }
 
-    protected function resolveBrowserNameFromRequest(Request $request)
-    {
-        $parser = Parser::create();
-        
-        $result = $parser->parse($request->server->get('HTTP_USER_AGENT'));
-
-        return $result->ua->family . ' (' . $result->os->family . ')';
-    }
-
-    protected function resolveAddressFromRequest(Request $request)
-    {
-        if (!empty($request->server->get('HTTP_CLIENT_IP'))) {
-            return $request->server->get('HTTP_CLIENT_IP');
-        }
-
-        if (!empty($request->server->get('HTTP_X_FORWARDED_FOR'))) {
-            return $request->server->get('HTTP_X_FORWARDED_FOR');
-        }
-
-        return $request->server->get('REMOTE_ADDR');
-    }
-
     public function manager()
     {
         return app('auth.device');