Refactoring authentication layer.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

src/Authentication.php

@@ -76,75 +76,77 @@ public function authenticate()
 			return null;
 		}
 
-		if ($route = $this->router->getCurrentRoute() and $this->routeIsProtected($route))
+		if (  ! $route = $this->router->getCurrentRoute() or ! $this->routeIsProtected($route))
 		{
-			$exceptionStack = [];
+			return null;
+		}
 
-			// If authenticating via OAuth2 a route can be protected by defining its scopes.
-			// We'll grab the scopes for this route and pass them through to the
-			// authentication providers.
-			if (isset($this->providers['oauth2']))
-			{
-				$scopes = $this->getRouteScopes($route);
+		$exceptionStack = [];
 
-				$this->providers['oauth2']->setScopes($scopes);
-			}
+		$this->registerOAuth2Scopes($route);
 
-			// Spin through each of the registered authentication providers and attempt to
-			// authenticate through one of them.
-			foreach ($this->providers as $provider)
+		// Spin through each of the registered authentication providers and attempt to
+		// authenticate through one of them.
+		foreach ($this->providers as $provider)
+		{
+			try
 			{
-				try
-				{
-					return $this->userId = $provider->authenticate($request);
-				}
-				catch (UnauthorizedHttpException $exception)
-				{
-					$exceptionStack[] = $exception;
-				}
-				catch (Exception $exception)
-				{
-					// We won't add this exception to the stack as it's thrown when the provider
-					// is unable to authenticate due to the correct authorization header not
-					// being set. We will throw an exception for this below.
-				}
+				return $this->userId = $provider->authenticate($request);
 			}
-
-			$exception = array_shift($exceptionStack);
-
-			if ($exception === null)
+			catch (UnauthorizedHttpException $exception)
 			{
-				$exception = new UnauthorizedHttpException(null, 'Failed to authenticate because of bad credentials or an invalid authorization header.');
+				$exceptionStack[] = $exception;
 			}
+			catch (Exception $exception)
+			{
+				// We won't add this exception to the stack as it's thrown when the provider
+				// is unable to authenticate due to the correct authorization header not
+				// being set. We will throw an exception for this below.
+			}
+		}
 
-			throw $exception;
+		$exception = array_shift($exceptionStack);
+
+		if ($exception === null)
+		{
+			$exception = new UnauthorizedHttpException(null, 'Failed to authenticate because of bad credentials or an invalid authorization header.');
 		}
+
+		throw $exception;
 	}
 
 	/**
-	 * Determine if a route is protected.
+	 * Register the OAuth 2.0 scopes on the "oauth2" provider.
 	 * 
 	 * @param  \Illuminate\Routing\Route  $route
-	 * @return bool
+	 * @return void
 	 */
-	protected function routeIsProtected(Route $route)
+	protected function registerOAuth2Scopes(Route $route)
 	{
-		$action = $route->getAction();
+		// If authenticating via OAuth2 a route can be protected by defining its scopes.
+		// We'll grab the scopes for this route and pass them through to the
+		// authentication providers.
+		if (isset($this->providers['oauth2']))
+		{
+			$action = $route->getAction();
 
-		return in_array('protected', $action, true) or (isset($action['protected']) and $action['protected'] === true);
+			$scopes = isset($action['scopes']) ? (array) $action['scopes'] : [];
+
+			$this->providers['oauth2']->setScopes($scopes);
+		}
 	}
 
 	/**
-	 * Get the routes scopes.
+	 * Determine if a route is protected.
 	 * 
 	 * @param  \Illuminate\Routing\Route  $route
-	 * @return array
+	 * @return bool
 	 */
-	protected function getRouteScopes(Route $route)
+	protected function routeIsProtected(Route $route)
 	{
 		$action = $route->getAction();
 
-		return isset($action['scopes']) ? (array) $action['scopes'] : [];
+		return in_array('protected', $action, true) or (isset($action['protected']) and $action['protected'] === true);
 	}
 
 	/**