redCOMPONENT-COM / redCORE

extensions/libraries/redcore/api/api.php

Braces +10 added lines, -20 removed lines

@@ -88,8 +88,7 @@ 
 		try
 		{
 			$instance = new $class($options);
-		}
-		catch (RuntimeException $e)
+		} catch (RuntimeException $e)
 		{
 			throw new RuntimeException(JText::sprintf('LIB_REDCORE_API_UNABLE_TO_CONNECT_TO_API', $e->getMessage()));
 		}
@@ -257,8 +256,7 @@ 
 		if (is_object($inputData))
 		{
 			$inputData = ArrayHelper::fromObject($inputData);
-		}
-		elseif (is_string($inputData))
+		} elseif (is_string($inputData))
 		{
 			$inputData = trim($inputData);
 			$parsedData = null;
@@ -286,8 +284,7 @@ 
 			}
 
 			$inputData = $parsedData;
-		}
-		else
+		} else
 		{
 			$inputData = $input->post->getArray();
 		}
@@ -300,8 +297,7 @@ 
 		if (version_compare(JVERSION, '3') >= 0)
 		{
 			return $postedData->getArray(array(), null, 'HTML');
-		}
-		elseif ($inputData)
+		} elseif ($inputData)
 		{
 			return $postedData->getArray(array(), $inputData, 'HTML');
 		}
@@ -360,8 +356,7 @@ 
 		{
 			$headers['PHP_AUTH_USER'] = $_SERVER['PHP_AUTH_USER'];
 			$headers['PHP_AUTH_PW'] = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
-		}
-		else
+		} else
 		{
 			/*
 			 * php-cgi under Apache does not pass HTTP Basic user/pass to PHP by default
@@ -380,12 +375,10 @@ 
 			if (isset($_SERVER['HTTP_AUTHORIZATION']))
 			{
 				$authorizationHeader = $_SERVER['HTTP_AUTHORIZATION'];
-			}
-			elseif (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']))
+			} elseif (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']))
 			{
 				$authorizationHeader = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
-			}
-			elseif (function_exists('apache_request_headers'))
+			} elseif (function_exists('apache_request_headers'))
 			{
 				$requestHeaders = (array) apache_request_headers();
 
@@ -434,8 +427,7 @@ 
 		if (version_compare(JVERSION, '3') >= 0)
 		{
 			JFactory::getApplication()->clearHeaders();
-		}
-		else
+		} else
 		{
 			JResponse::clearHeaders();
 		}
@@ -451,8 +443,7 @@ 
 		if (version_compare(JVERSION, '3') >= 0)
 		{
 			JFactory::getApplication()->sendHeaders();
-		}
-		else
+		} else
 		{
 			JResponse::sendHeaders();
 		}
@@ -474,8 +465,7 @@ 
 		if (version_compare(JVERSION, '3') >= 0)
 		{
 			JFactory::getApplication()->setHeader($name, $value, $replace);
-		}
-		else
+		} else
 		{
 			JResponse::setHeader($name, $value, $replace);
 		}

extensions/libraries/redcore/api/payment/plugin/helper/payment.php

Spacing +2 added lines, -2 removed lines

@@ -293,7 +293,7 @@ 
 	{
 		$data = !is_array($payment) ? ArrayHelper::fromObject($payment) : $payment;
 
-		$data['amount']     = $data['amount_total'];
+		$data['amount'] = $data['amount_total'];
 		$data['transactionId'] = $data['transaction_id'];
 		$data['returnUrl'] = $this->getResponseUrl($payment, 'callback');
 		$data['cancelUrl'] = $this->getResponseUrl($payment, 'cancel');
@@ -631,7 +631,7 @@ 
 
 			$response = '';
 
-			if (($fs = @fsockopen($paymentUrl, $this->fsockPort, $errno, $errstr, 10)) == false )
+			if (($fs = @fsockopen($paymentUrl, $this->fsockPort, $errno, $errstr, 10)) == false)
 			{
 				JFactory::getApplication()->enqueueMessage('LIB_REDCORE_PAYMENT_ERROR_FSOCK_COULD_NOT_OPEN', 'error');
 

Braces +10 added lines, -15 removed lines

@@ -338,8 +338,7 @@ 
 			$data['amount_payment_fee'] = $paymentFee;
 
 			$data['amount_total'] += $data['amount_payment_fee'];
-		}
-		elseif (empty($data['amount_total']) && isset($data['amount_original']))
+		} elseif (empty($data['amount_total']) && isset($data['amount_original']))
 		{
 			$data['amount_total'] = (float) $data['amount_original'];
 		}
@@ -464,8 +463,7 @@ 
 			$this->createPayment($extensionName, $ownerName, $createData);
 
 			$payment = RApiPaymentHelper::getPaymentByExtensionId($extensionName, $orderId);
-		}
-		else
+		} else
 		{
 			// We will update payment with provided data if it is different than originally provided
 			$ownerName = !empty($orderData['owner_name']) ? $orderData['owner_name'] : $payment->owner_name;
@@ -520,8 +518,7 @@ 
 		if ($sandbox && !empty($this->paymentUrlSandbox))
 		{
 			return $this->paymentUrlSandbox . $this->requestPathSandbox;
-		}
-		else
+		} else
 		{
 			return $this->paymentUrl . $this->requestPath;
 		}
@@ -539,8 +536,7 @@ 
 		if ($sandbox && $this->params->get('merchant_id_sandbox', ''))
 		{
 			return $this->params->get('merchant_id_sandbox', '');
-		}
-		else
+		} else
 		{
 			return $this->params->get('merchant_id', '');
 		}
@@ -614,8 +610,7 @@ 
 			{
 				$requestPath = $this->requestPathSandbox;
 				$paymentUrl = $this->paymentUrlSandbox;
-			}
-			else
+			} else
 			{
 				$requestPath = $this->requestPath;
 				$paymentUrl = $this->paymentUrl;
@@ -647,8 +642,7 @@ 
 			}
 
 			fclose($fs);
-		}
-		else
+		} else
 		{
 			$ch = curl_init();
 			curl_setopt($ch, CURLOPT_URL, $this->getPaymentURL());
@@ -676,10 +670,12 @@ 
 	{
 		$allowed = trim($this->params->get('allowed_currencies'));
 
-		if (!$allowed) // Allow everything
+		if (!$allowed) {
+			// Allow everything
 		{
 			return true;
 		}
+		}
 
 		// Otherwise returns only currencies specified in allowed_currencies plugin parameters
 		$allowed = explode(',', $allowed);
@@ -865,8 +861,7 @@ 
 		{
 			// Adds a percentage based fee to the total amount
 			$fee = $amount * ($paymentFee / 100);
-		}
-		else
+		} else
 		{
 			// The fee is calculated as a commission rate
 			$fee = ($amount / (1 - ($paymentFee / 100))) - $amount;

extensions/libraries/redcore/api/payment/plugin/base.php

Spacing +1 added lines, -1 removed lines

@@ -441,7 +441,7 @@
 		if (!$this->paymentHelper)
 		{
 			$reflector = new ReflectionClass(get_class($this));
-			$helperPath   = dirname($reflector->getFileName());
+			$helperPath = dirname($reflector->getFileName());
 
 			if (file_exists($helperPath . '/helpers/payment.php'))
 			{

Braces +2 added lines, -4 removed lines

@@ -398,12 +398,10 @@
 			if ($isAccepted === true)
 			{
 				$logData['message_text'] = JText::sprintf('LIB_REDCORE_PAYMENT_LOG_ACCEPT_MESSAGE', $extensionName, $this->paymentName);
-			}
-			elseif ($isAccepted === false)
+			} elseif ($isAccepted === false)
 			{
 				$logData['message_text'] = JText::sprintf('LIB_REDCORE_PAYMENT_LOG_CANCEL_MESSAGE', $extensionName, $this->paymentName);
-			}
-			else
+			} else
 			{
 				$logData['message_text'] = JText::sprintf('LIB_REDCORE_PAYMENT_LOG_DEFAULT_MESSAGE', $extensionName, $this->paymentName);
 			}

extensions/libraries/redcore/api/payment/payment.php

Braces +2 added lines, -4 removed lines

@@ -180,8 +180,7 @@ 
 
 			$executionErrors = ob_get_contents();
 			ob_end_clean();
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$executionErrors = ob_get_contents();
 			ob_end_clean();
@@ -305,8 +304,7 @@ 
 
 			// Redirect to extension Accept URL
 			$app->redirect($redirect);
-		}
-		else
+		} else
 		{
 			$redirect = !empty($payment->url_cancel) ? $payment->url_cancel : JUri::root() . 'index.php?option=' . $payment->extension_name;
 

extensions/libraries/redcore/api/payment/helper.php

Braces +13 added lines, -27 removed lines

@@ -236,8 +236,7 @@ 
 				{
 					// Needed for proper chart display
 					$chartData['datasets'] = array(array());
-				}
-				else
+				} else
 				{
 					foreach ($amounts as $extensionName => $amount)
 					{
@@ -261,8 +260,7 @@ 
 						{
 							$dataSet['highlightFill'] = 'rgba(' . $color . ',0.75)';
 							$dataSet['highlightStroke'] = 'rgba(' . $color . ',1)';
-						}
-						else
+						} else
 						{
 							$dataSet['pointColor'] = 'rgba(' . $color . ',1)';
 							$dataSet['pointStrokeColor'] = '#fff';
@@ -310,13 +308,11 @@ 
 			if (!empty($filters['end_date']))
 			{
 				$startDate = date('Y-m-d', strtotime($filters['end_date'] . ' -7 weeks'));
-			}
-			else
+			} else
 			{
 				$startDate = date('Y-m-d', strtotime('today -7 weeks'));
 			}
-		}
-		else
+		} else
 		{
 			$startDate = $filters['start_date'];
 		}
@@ -324,8 +320,7 @@ 
 		if (empty($filters['end_date']))
 		{
 			$endDate = date('Y-m-d', strtotime($startDate . ' +7 weeks'));
-		}
-		else
+		} else
 		{
 			$endDate = $filters['end_date'];
 		}
@@ -445,8 +440,7 @@ 
 				if ($currentYear == $year)
 				{
 					$daysInYear = round((strtotime(date('Y-m-d')) - strtotime($year . '-01-01')) / 86400);
-				}
-				else
+				} else
 				{
 					$daysInYear = date('z', strtotime($year . '-12-31')) + 1;
 				}
@@ -516,9 +510,7 @@ 
 		{
 			$ownerName = $db->quote($filters['owner_name']);
 			$query->where('p.owner_name = ' . $ownerName);
-		}
-
-		elseif (!empty($filters['start_date']))
+		} elseif (!empty($filters['start_date']))
 		{
 			$filters['start_date'] = date('Y-m-d H:i:s', strtotime($filters['start_date']));
 			$startDate = $db->quote($filters['start_date']);
@@ -588,8 +580,7 @@ 
 			{
 				$paymentData['id'] = $oldPayment->id;
 			}
-		}
-		else
+		} else
 		{
 			$oldPayment = self::getPaymentById($paymentData['id']);
 		}
@@ -678,8 +669,7 @@ 
 						// We will only set latest payment data
 						$amountPaid = $paymentLog->amount;
 						$currency = $paymentLog->currency;
-					}
-					else
+					} else
 					{
 						if ($payment['transaction_id'] != $paymentLog->transaction_id || $amountPaid == 0)
 						{
@@ -1001,8 +991,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			// New log file in a month
 			$dummy = "<?php die(); ?>\n";
@@ -1036,12 +1025,10 @@ 
 			{
 				$logData .= str_pad($key, 30, ' ') . $value . "\n";
 			}
-		}
-		elseif (is_object($data))
+		} elseif (is_object($data))
 		{
 			$logData .= (json_encode($data)) . "\n";
-		}
-		else
+		} else
 		{
 			$logData .= $data . "\n";
 		}
@@ -1190,8 +1177,7 @@ 
 		if (class_exists($helperClassName))
 		{
 			self::$extensionHelperClasses[$extensionName] = new $helperClassName;
-		}
-		else
+		} else
 		{
 			self::$extensionHelperClasses[$extensionName] = null;
 		}

extensions/libraries/redcore/api/oauth2/Server.php

Indentation +786 added lines, -786 removed lines

@@ -42,791 +42,791 @@
 * @see OAuth2\Controller\TokenController
 */
 class Server implements ResourceControllerInterface,
-    AuthorizeControllerInterface,
-    TokenControllerInterface,
-    UserInfoControllerInterface
+	AuthorizeControllerInterface,
+	TokenControllerInterface,
+	UserInfoControllerInterface
 {
-    // misc properties
-    protected $response;
-    protected $config;
-    protected $storages;
-
-    // servers
-    protected $authorizeController;
-    protected $tokenController;
-    protected $resourceController;
-    protected $userInfoController;
-
-    // config classes
-    protected $grantTypes;
-    protected $responseTypes;
-    protected $tokenType;
-    protected $scopeUtil;
-    protected $clientAssertionType;
-
-    protected $storageMap = array(
-        'access_token' => 'OAuth2\Storage\AccessTokenInterface',
-        'authorization_code' => 'OAuth2\Storage\AuthorizationCodeInterface',
-        'client_credentials' => 'OAuth2\Storage\ClientCredentialsInterface',
-        'client' => 'OAuth2\Storage\ClientInterface',
-        'refresh_token' => 'OAuth2\Storage\RefreshTokenInterface',
-        'user_credentials' => 'OAuth2\Storage\UserCredentialsInterface',
-        'user_claims' => 'OAuth2\OpenID\Storage\UserClaimsInterface',
-        'public_key' => 'OAuth2\Storage\PublicKeyInterface',
-        'jwt_bearer' => 'OAuth2\Storage\JWTBearerInterface',
-        'scope' => 'OAuth2\Storage\ScopeInterface',
-    );
-
-    protected $responseTypeMap = array(
-        'token' => 'OAuth2\ResponseType\AccessTokenInterface',
-        'code' => 'OAuth2\ResponseType\AuthorizationCodeInterface',
-        'id_token' => 'OAuth2\OpenID\ResponseType\IdTokenInterface',
-        'id_token token' => 'OAuth2\OpenID\ResponseType\IdTokenTokenInterface',
-        'code id_token' => 'OAuth2\OpenID\ResponseType\CodeIdTokenInterface',
-    );
-
-    /**
-     * @param mixed                                                   $storage             (array or OAuth2\Storage) - single object or array of objects implementing the
-     *                                                                                     required storage types (ClientCredentialsInterface and AccessTokenInterface as a minimum)
-     * @param array                                                   $config              specify a different token lifetime, token header name, etc
-     * @param array                                                   $grantTypes          An array of OAuth2\GrantType\GrantTypeInterface to use for granting access tokens
-     * @param array                                                   $responseTypes       Response types to use.  array keys should be "code" and and "token" for
-     *                                                                                     Access Token and Authorization Code response types
-     * @param OAuth2\TokenType\TokenTypeInterface                     $tokenType           The token type object to use. Valid token types are "bearer" and "mac"
-     * @param OAuth2\ScopeInterface                                   $scopeUtil           The scope utility class to use to validate scope
-     * @param OAuth2\ClientAssertionType\ClientAssertionTypeInterface $clientAssertionType The method in which to verify the client identity.  Default is HttpBasic
-     *
-     * @ingroup oauth2_section_7
-     */
-    public function __construct($storage = array(), array $config = array(), array $grantTypes = array(), array $responseTypes = array(), TokenTypeInterface $tokenType = null, ScopeInterface $scopeUtil = null, ClientAssertionTypeInterface $clientAssertionType = null)
-    {
-        $storage = is_array($storage) ? $storage : array($storage);
-        $this->storages = array();
-        foreach ($storage as $key => $service) {
-            $this->addStorage($service, $key);
-        }
-
-        // merge all config values.  These get passed to our controller objects
-        $this->config = array_merge(array(
-            'use_jwt_access_tokens'        => false,
-            'store_encrypted_token_string' => true,
-            'use_openid_connect'       => false,
-            'id_lifetime'              => 3600,
-            'access_lifetime'          => 3600,
-            'www_realm'                => 'Service',
-            'token_param_name'         => 'access_token',
-            'token_bearer_header_name' => 'Bearer',
-            'enforce_state'            => true,
-            'require_exact_redirect_uri' => true,
-            'allow_implicit'           => false,
-            'allow_credentials_in_request_body' => true,
-            'allow_public_clients'     => true,
-            'always_issue_new_refresh_token' => false,
-            'unset_refresh_token_after_use' => true,
-        ), $config);
-
-        foreach ($grantTypes as $key => $grantType) {
-            $this->addGrantType($grantType, $key);
-        }
-
-        foreach ($responseTypes as $key => $responseType) {
-            $this->addResponseType($responseType, $key);
-        }
-
-        $this->tokenType = $tokenType;
-        $this->scopeUtil = $scopeUtil;
-        $this->clientAssertionType = $clientAssertionType;
-
-        if ($this->config['use_openid_connect']) {
-            $this->validateOpenIdConnect();
-        }
-    }
-
-    public function getAuthorizeController()
-    {
-        if (is_null($this->authorizeController)) {
-            $this->authorizeController = $this->createDefaultAuthorizeController();
-        }
-
-        return $this->authorizeController;
-    }
-
-    public function getTokenController()
-    {
-        if (is_null($this->tokenController)) {
-            $this->tokenController = $this->createDefaultTokenController();
-        }
-
-        return $this->tokenController;
-    }
-
-    public function getResourceController()
-    {
-        if (is_null($this->resourceController)) {
-            $this->resourceController = $this->createDefaultResourceController();
-        }
-
-        return $this->resourceController;
-    }
-
-    public function getUserInfoController()
-    {
-        if (is_null($this->userInfoController)) {
-            $this->userInfoController = $this->createDefaultUserInfoController();
-        }
-
-        return $this->userInfoController;
-    }
-
-    /**
-     * every getter deserves a setter
-     */
-    public function setAuthorizeController(AuthorizeControllerInterface $authorizeController)
-    {
-        $this->authorizeController = $authorizeController;
-    }
-
-    /**
-     * every getter deserves a setter
-     */
-    public function setTokenController(TokenControllerInterface $tokenController)
-    {
-        $this->tokenController = $tokenController;
-    }
-
-    /**
-     * every getter deserves a setter
-     */
-    public function setResourceController(ResourceControllerInterface $resourceController)
-    {
-        $this->resourceController = $resourceController;
-    }
-
-    /**
-     * every getter deserves a setter
-     */
-    public function setUserInfoController(UserInfoControllerInterface $userInfoController)
-    {
-        $this->userInfoController = $userInfoController;
-    }
-
-    /**
-     * Return claims about the authenticated end-user.
-     * This would be called from the "/UserInfo" endpoint as defined in the spec.
-     *
-     * @param $request - OAuth2\RequestInterface
-     * Request object to grant access token
-     *
-     * @param $response - OAuth2\ResponseInterface
-     * Response object containing error messages (failure) or user claims (success)
-     *
-     * @throws InvalidArgumentException
-     * @throws LogicException
-     *
-     * @see http://openid.net/specs/openid-connect-core-1_0.html#UserInfo
-     */
-    public function handleUserInfoRequest(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $this->getUserInfoController()->handleUserInfoRequest($request, $this->response);
-
-        return $this->response;
-    }
-
-    /**
-     * Grant or deny a requested access token.
-     * This would be called from the "/token" endpoint as defined in the spec.
-     * Obviously, you can call your endpoint whatever you want.
-     *
-     * @param $request - OAuth2\RequestInterface
-     * Request object to grant access token
-     *
-     * @param $response - OAuth2\ResponseInterface
-     * Response object containing error messages (failure) or access token (success)
-     *
-     * @throws InvalidArgumentException
-     * @throws LogicException
-     *
-     * @see http://tools.ietf.org/html/rfc6749#section-4
-     * @see http://tools.ietf.org/html/rfc6749#section-10.6
-     * @see http://tools.ietf.org/html/rfc6749#section-4.1.3
-     *
-     * @ingroup oauth2_section_4
-     */
-    public function handleTokenRequest(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $this->getTokenController()->handleTokenRequest($request, $this->response);
-
-        return $this->response;
-    }
-
-    public function grantAccessToken(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $value = $this->getTokenController()->grantAccessToken($request, $this->response);
-
-        return $value;
-    }
-
-    /**
-     * Handle a revoke token request
-     * This would be called from the "/revoke" endpoint as defined in the draft Token Revocation spec
-     *
-     * @see https://tools.ietf.org/html/rfc7009#section-2
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return Response|ResponseInterface
-     */
-    public function handleRevokeRequest(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $this->getTokenController()->handleRevokeRequest($request, $this->response);
-
-        return $this->response;
-    }
-
-    /**
-     * Redirect the user appropriately after approval.
-     *
-     * After the user has approved or denied the resource request the
-     * authorization server should call this function to redirect the user
-     * appropriately.
-     *
-     * @param $request
-     * The request should have the follow parameters set in the querystring:
-     * - response_type: The requested response: an access token, an
-     * authorization code, or both.
-     * - client_id: The client identifier as described in Section 2.
-     * - redirect_uri: An absolute URI to which the authorization server
-     * will redirect the user-agent to when the end-user authorization
-     * step is completed.
-     * - scope: (optional) The scope of the resource request expressed as a
-     * list of space-delimited strings.
-     * - state: (optional) An opaque value used by the client to maintain
-     * state between the request and callback.
-     * @param $is_authorized
-     * TRUE or FALSE depending on whether the user authorized the access.
-     * @param $user_id
-     * Identifier of user who authorized the client
-     *
-     * @see http://tools.ietf.org/html/rfc6749#section-4
-     *
-     * @ingroup oauth2_section_4
-     */
-    public function handleAuthorizeRequest(RequestInterface $request, ResponseInterface $response, $is_authorized, $user_id = null)
-    {
-        $this->response = $response;
-        $this->getAuthorizeController()->handleAuthorizeRequest($request, $this->response, $is_authorized, $user_id);
-
-        return $this->response;
-    }
-
-    /**
-     * Pull the authorization request data out of the HTTP request.
-     * - The redirect_uri is OPTIONAL as per draft 20. But your implementation can enforce it
-     * by setting $config['enforce_redirect'] to true.
-     * - The state is OPTIONAL but recommended to enforce CSRF. Draft 21 states, however, that
-     * CSRF protection is MANDATORY. You can enforce this by setting the $config['enforce_state'] to true.
-     *
-     * The draft specifies that the parameters should be retrieved from GET, override the Response
-     * object to change this
-     *
-     * @return
-     * The authorization parameters so the authorization server can prompt
-     * the user for approval if valid.
-     *
-     * @see http://tools.ietf.org/html/rfc6749#section-4.1.1
-     * @see http://tools.ietf.org/html/rfc6749#section-10.12
-     *
-     * @ingroup oauth2_section_3
-     */
-    public function validateAuthorizeRequest(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $value = $this->getAuthorizeController()->validateAuthorizeRequest($request, $this->response);
-
-        return $value;
-    }
-
-    public function verifyResourceRequest(RequestInterface $request, ResponseInterface $response = null, $scope = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $value = $this->getResourceController()->verifyResourceRequest($request, $this->response, $scope);
-
-        return $value;
-    }
-
-    public function getAccessTokenData(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $value = $this->getResourceController()->getAccessTokenData($request, $this->response);
-
-        return $value;
-    }
-
-    public function addGrantType(GrantTypeInterface $grantType, $identifier = null)
-    {
-        if (!is_string($identifier)) {
-            $identifier = $grantType->getQuerystringIdentifier();
-        }
-
-        $this->grantTypes[$identifier] = $grantType;
-
-        // persist added grant type down to TokenController
-        if (!is_null($this->tokenController)) {
-            $this->getTokenController()->addGrantType($grantType, $identifier);
-        }
-    }
-
-    /**
-     * Set a storage object for the server
-     *
-     * @param $storage
-     * An object implementing one of the Storage interfaces
-     * @param $key
-     * If null, the storage is set to the key of each storage interface it implements
-     *
-     * @see storageMap
-     */
-    public function addStorage($storage, $key = null)
-    {
-        // if explicitly set to a valid key, do not "magically" set below
-        if (isset($this->storageMap[$key])) {
-            if (!is_null($storage) && !$storage instanceof $this->storageMap[$key]) {
-                throw new \InvalidArgumentException(sprintf('storage of type "%s" must implement interface "%s"', $key, $this->storageMap[$key]));
-            }
-            $this->storages[$key] = $storage;
-
-            // special logic to handle "client" and "client_credentials" strangeness
-            if ($key === 'client' && !isset($this->storages['client_credentials'])) {
-                if ($storage instanceof \OAuth2\Storage\ClientCredentialsInterface) {
-                    $this->storages['client_credentials'] = $storage;
-                }
-            } elseif ($key === 'client_credentials' && !isset($this->storages['client'])) {
-                if ($storage instanceof \OAuth2\Storage\ClientInterface) {
-                    $this->storages['client'] = $storage;
-                }
-            }
-        } elseif (!is_null($key) && !is_numeric($key)) {
-            throw new \InvalidArgumentException(sprintf('unknown storage key "%s", must be one of [%s]', $key, implode(', ', array_keys($this->storageMap))));
-        } else {
-            $set = false;
-            foreach ($this->storageMap as $type => $interface) {
-                if ($storage instanceof $interface) {
-                    $this->storages[$type] = $storage;
-                    $set = true;
-                }
-            }
-
-            if (!$set) {
-                throw new \InvalidArgumentException(sprintf('storage of class "%s" must implement one of [%s]', get_class($storage), implode(', ', $this->storageMap)));
-            }
-        }
-    }
-
-    public function addResponseType(ResponseTypeInterface $responseType, $key = null)
-    {
-        $key = $this->normalizeResponseType($key);
-
-        if (isset($this->responseTypeMap[$key])) {
-            if (!$responseType instanceof $this->responseTypeMap[$key]) {
-                throw new \InvalidArgumentException(sprintf('responseType of type "%s" must implement interface "%s"', $key, $this->responseTypeMap[$key]));
-            }
-            $this->responseTypes[$key] = $responseType;
-        } elseif (!is_null($key) && !is_numeric($key)) {
-            throw new \InvalidArgumentException(sprintf('unknown responseType key "%s", must be one of [%s]', $key, implode(', ', array_keys($this->responseTypeMap))));
-        } else {
-            $set = false;
-            foreach ($this->responseTypeMap as $type => $interface) {
-                if ($responseType instanceof $interface) {
-                    $this->responseTypes[$type] = $responseType;
-                    $set = true;
-                }
-            }
-
-            if (!$set) {
-                throw new \InvalidArgumentException(sprintf('Unknown response type %s.  Please implement one of [%s]', get_class($responseType), implode(', ', $this->responseTypeMap)));
-            }
-        }
-    }
-
-    public function getScopeUtil()
-    {
-        if (!$this->scopeUtil) {
-            $storage = isset($this->storages['scope']) ? $this->storages['scope'] : null;
-            $this->scopeUtil = new Scope($storage);
-        }
-
-        return $this->scopeUtil;
-    }
-
-    /**
-     * every getter deserves a setter
-     */
-    public function setScopeUtil($scopeUtil)
-    {
-        $this->scopeUtil = $scopeUtil;
-    }
-
-    protected function createDefaultAuthorizeController()
-    {
-        if (!isset($this->storages['client'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientInterface to use the authorize server");
-        }
-        if (0 == count($this->responseTypes)) {
-            $this->responseTypes = $this->getDefaultResponseTypes();
-        }
-        if ($this->config['use_openid_connect'] && !isset($this->responseTypes['id_token'])) {
-            $this->responseTypes['id_token'] = $this->createDefaultIdTokenResponseType();
-            if ($this->config['allow_implicit']) {
-                $this->responseTypes['id_token token'] = $this->createDefaultIdTokenTokenResponseType();
-            }
-        }
-
-        $config = array_intersect_key($this->config, array_flip(explode(' ', 'allow_implicit enforce_state require_exact_redirect_uri')));
-
-        if ($this->config['use_openid_connect']) {
-            return new OpenIDAuthorizeController($this->storages['client'], $this->responseTypes, $config, $this->getScopeUtil());
-        }
-
-        return new AuthorizeController($this->storages['client'], $this->responseTypes, $config, $this->getScopeUtil());
-    }
-
-    protected function createDefaultTokenController()
-    {
-        if (0 == count($this->grantTypes)) {
-            $this->grantTypes = $this->getDefaultGrantTypes();
-        }
-
-        if (is_null($this->clientAssertionType)) {
-            // see if HttpBasic assertion type is requred.  If so, then create it from storage classes.
-            foreach ($this->grantTypes as $grantType) {
-                if (!$grantType instanceof ClientAssertionTypeInterface) {
-                    if (!isset($this->storages['client_credentials'])) {
-                        throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientCredentialsInterface to use the token server");
-                    }
-                    $config = array_intersect_key($this->config, array_flip(explode(' ', 'allow_credentials_in_request_body allow_public_clients')));
-                    $this->clientAssertionType = new HttpBasic($this->storages['client_credentials'], $config);
-                    break;
-                }
-            }
-        }
-
-        if (!isset($this->storages['client'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientInterface to use the token server");
-        }
-
-        $accessTokenResponseType = $this->getAccessTokenResponseType();
-
-        return new TokenController($accessTokenResponseType, $this->storages['client'], $this->grantTypes, $this->clientAssertionType, $this->getScopeUtil());
-    }
-
-    protected function createDefaultResourceController()
-    {
-        if ($this->config['use_jwt_access_tokens']) {
-            // overwrites access token storage with crypto token storage if "use_jwt_access_tokens" is set
-            if (!isset($this->storages['access_token']) || !$this->storages['access_token'] instanceof JwtAccessTokenInterface) {
-                $this->storages['access_token'] = $this->createDefaultJwtAccessTokenStorage();
-            }
-        } elseif (!isset($this->storages['access_token'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the resource server");
-        }
-
-        if (!$this->tokenType) {
-            $this->tokenType = $this->getDefaultTokenType();
-        }
-
-        $config = array_intersect_key($this->config, array('www_realm' => ''));
-
-        return new ResourceController($this->tokenType, $this->storages['access_token'], $config, $this->getScopeUtil());
-    }
-
-    protected function createDefaultUserInfoController()
-    {
-        if ($this->config['use_jwt_access_tokens']) {
-            // overwrites access token storage with crypto token storage if "use_jwt_access_tokens" is set
-            if (!isset($this->storages['access_token']) || !$this->storages['access_token'] instanceof JwtAccessTokenInterface) {
-                $this->storages['access_token'] = $this->createDefaultJwtAccessTokenStorage();
-            }
-        } elseif (!isset($this->storages['access_token'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the UserInfo server");
-        }
-
-        if (!isset($this->storages['user_claims'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use the UserInfo server");
-        }
-
-        if (!$this->tokenType) {
-            $this->tokenType = $this->getDefaultTokenType();
-        }
-
-        $config = array_intersect_key($this->config, array('www_realm' => ''));
-
-        return new UserInfoController($this->tokenType, $this->storages['access_token'], $this->storages['user_claims'], $config, $this->getScopeUtil());
-    }
-
-    protected function getDefaultTokenType()
-    {
-        $config = array_intersect_key($this->config, array_flip(explode(' ', 'token_param_name token_bearer_header_name')));
-
-        return new Bearer($config);
-    }
-
-    protected function getDefaultResponseTypes()
-    {
-        $responseTypes = array();
-
-        if ($this->config['allow_implicit']) {
-            $responseTypes['token'] = $this->getAccessTokenResponseType();
-        }
-
-        if ($this->config['use_openid_connect']) {
-            $responseTypes['id_token'] = $this->getIdTokenResponseType();
-            if ($this->config['allow_implicit']) {
-                $responseTypes['id_token token'] = $this->getIdTokenTokenResponseType();
-            }
-        }
-
-        if (isset($this->storages['authorization_code'])) {
-            $config = array_intersect_key($this->config, array_flip(explode(' ', 'enforce_redirect auth_code_lifetime')));
-            if ($this->config['use_openid_connect']) {
-                if (!$this->storages['authorization_code'] instanceof OpenIDAuthorizationCodeInterface) {
-                    throw new \LogicException("Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when 'use_openid_connect' is true");
-                }
-                $responseTypes['code'] = new OpenIDAuthorizationCodeResponseType($this->storages['authorization_code'], $config);
-                $responseTypes['code id_token'] = new CodeIdToken($responseTypes['code'], $responseTypes['id_token']);
-            } else {
-                $responseTypes['code'] = new AuthorizationCodeResponseType($this->storages['authorization_code'], $config);
-            }
-        }
-
-        if (count($responseTypes) == 0) {
-            throw new \LogicException("You must supply an array of response_types in the constructor or implement a OAuth2\Storage\AuthorizationCodeInterface storage object or set 'allow_implicit' to true and implement a OAuth2\Storage\AccessTokenInterface storage object");
-        }
-
-        return $responseTypes;
-    }
-
-    protected function getDefaultGrantTypes()
-    {
-        $grantTypes = array();
-
-        if (isset($this->storages['user_credentials'])) {
-            $grantTypes['password'] = new UserCredentials($this->storages['user_credentials']);
-        }
-
-        if (isset($this->storages['client_credentials'])) {
-            $config = array_intersect_key($this->config, array('allow_credentials_in_request_body' => ''));
-            $grantTypes['client_credentials'] = new ClientCredentials($this->storages['client_credentials'], $config);
-        }
-
-        if (isset($this->storages['refresh_token'])) {
-            $config = array_intersect_key($this->config, array_flip(explode(' ', 'always_issue_new_refresh_token unset_refresh_token_after_use')));
-            $grantTypes['refresh_token'] = new RefreshToken($this->storages['refresh_token'], $config);
-        }
-
-        if (isset($this->storages['authorization_code'])) {
-            if ($this->config['use_openid_connect']) {
-                if (!$this->storages['authorization_code'] instanceof OpenIDAuthorizationCodeInterface) {
-                    throw new \LogicException("Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when 'use_openid_connect' is true");
-                }
-                $grantTypes['authorization_code'] = new OpenIDAuthorizationCodeGrantType($this->storages['authorization_code']);
-            } else {
-                $grantTypes['authorization_code'] = new AuthorizationCode($this->storages['authorization_code']);
-            }
-        }
-
-        if (count($grantTypes) == 0) {
-            throw new \LogicException("Unable to build default grant types - You must supply an array of grant_types in the constructor");
-        }
-
-        return $grantTypes;
-    }
-
-    protected function getAccessTokenResponseType()
-    {
-        if (isset($this->responseTypes['token'])) {
-            return $this->responseTypes['token'];
-        }
-
-        if ($this->config['use_jwt_access_tokens']) {
-            return $this->createDefaultJwtAccessTokenResponseType();
-        }
-
-        return $this->createDefaultAccessTokenResponseType();
-    }
-
-    protected function getIdTokenResponseType()
-    {
-        if (isset($this->responseTypes['id_token'])) {
-            return $this->responseTypes['id_token'];
-        }
-
-        return $this->createDefaultIdTokenResponseType();
-    }
-
-    protected function getIdTokenTokenResponseType()
-    {
-        if (isset($this->responseTypes['id_token token'])) {
-            return $this->responseTypes['id_token token'];
-        }
-
-        return $this->createDefaultIdTokenTokenResponseType();
-    }
-
-    /**
-     * For Resource Controller
-     */
-    protected function createDefaultJwtAccessTokenStorage()
-    {
-        if (!isset($this->storages['public_key'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens");
-        }
-        $tokenStorage = null;
-        if (!empty($this->config['store_encrypted_token_string']) && isset($this->storages['access_token'])) {
-            $tokenStorage = $this->storages['access_token'];
-        }
-        // wrap the access token storage as required.
-        return new JwtAccessTokenStorage($this->storages['public_key'], $tokenStorage);
-    }
-
-    /**
-     * For Authorize and Token Controllers
-     */
-    protected function createDefaultJwtAccessTokenResponseType()
-    {
-        if (!isset($this->storages['public_key'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens");
-        }
-
-        $tokenStorage = null;
-        if (isset($this->storages['access_token'])) {
-            $tokenStorage = $this->storages['access_token'];
-        }
-
-        $refreshStorage = null;
-        if (isset($this->storages['refresh_token'])) {
-            $refreshStorage = $this->storages['refresh_token'];
-        }
-
-        $config = array_intersect_key($this->config, array_flip(explode(' ', 'store_encrypted_token_string issuer access_lifetime refresh_token_lifetime')));
-
-        return new JwtAccessToken($this->storages['public_key'], $tokenStorage, $refreshStorage, $config);
-    }
-
-    protected function createDefaultAccessTokenResponseType()
-    {
-        if (!isset($this->storages['access_token'])) {
-            throw new \LogicException("You must supply a response type implementing OAuth2\ResponseType\AccessTokenInterface, or a storage object implementing OAuth2\Storage\AccessTokenInterface to use the token server");
-        }
-
-        $refreshStorage = null;
-        if (isset($this->storages['refresh_token'])) {
-            $refreshStorage = $this->storages['refresh_token'];
-        }
-
-        $config = array_intersect_key($this->config, array_flip(explode(' ', 'access_lifetime refresh_token_lifetime')));
-        $config['token_type'] = $this->tokenType ? $this->tokenType->getTokenType() :  $this->getDefaultTokenType()->getTokenType();
-
-        return new AccessToken($this->storages['access_token'], $refreshStorage, $config);
-    }
-
-    protected function createDefaultIdTokenResponseType()
-    {
-        if (!isset($this->storages['user_claims'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use openid connect");
-        }
-        if (!isset($this->storages['public_key'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use openid connect");
-        }
-
-        $config = array_intersect_key($this->config, array_flip(explode(' ', 'issuer id_lifetime')));
-
-        return new IdToken($this->storages['user_claims'], $this->storages['public_key'], $config);
-    }
-
-    protected function createDefaultIdTokenTokenResponseType()
-    {
-        return new IdTokenToken($this->getAccessTokenResponseType(), $this->getIdTokenResponseType());
-    }
-
-    protected function validateOpenIdConnect()
-    {
-        $authCodeGrant = $this->getGrantType('authorization_code');
-        if (!empty($authCodeGrant) && !$authCodeGrant instanceof OpenIDAuthorizationCodeGrantType) {
-            throw new \InvalidArgumentException('You have enabled OpenID Connect, but supplied a grant type that does not support it.');
-        }
-    }
-
-    protected function normalizeResponseType($name)
-    {
-        // for multiple-valued response types - make them alphabetical
-        if (!empty($name) && false !== strpos($name, ' ')) {
-            $types = explode(' ', $name);
-            sort($types);
-            $name = implode(' ', $types);
-        }
-
-        return $name;
-    }
-
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
-    public function getStorages()
-    {
-        return $this->storages;
-    }
-
-    public function getStorage($name)
-    {
-        return isset($this->storages[$name]) ? $this->storages[$name] : null;
-    }
-
-    public function getGrantTypes()
-    {
-        return $this->grantTypes;
-    }
-
-    public function getGrantType($name)
-    {
-        return isset($this->grantTypes[$name]) ? $this->grantTypes[$name] : null;
-    }
-
-    public function getResponseTypes()
-    {
-        return $this->responseTypes;
-    }
-
-    public function getResponseType($name)
-    {
-        // for multiple-valued response types - make them alphabetical
-        $name = $this->normalizeResponseType($name);
-
-        return isset($this->responseTypes[$name]) ? $this->responseTypes[$name] : null;
-    }
-
-    public function getTokenType()
-    {
-        return $this->tokenType;
-    }
-
-    public function getClientAssertionType()
-    {
-        return $this->clientAssertionType;
-    }
-
-    public function setConfig($name, $value)
-    {
-        $this->config[$name] = $value;
-    }
-
-    public function getConfig($name, $default = null)
-    {
-        return isset($this->config[$name]) ? $this->config[$name] : $default;
-    }
+	// misc properties
+	protected $response;
+	protected $config;
+	protected $storages;
+
+	// servers
+	protected $authorizeController;
+	protected $tokenController;
+	protected $resourceController;
+	protected $userInfoController;
+
+	// config classes
+	protected $grantTypes;
+	protected $responseTypes;
+	protected $tokenType;
+	protected $scopeUtil;
+	protected $clientAssertionType;
+
+	protected $storageMap = array(
+		'access_token' => 'OAuth2\Storage\AccessTokenInterface',
+		'authorization_code' => 'OAuth2\Storage\AuthorizationCodeInterface',
+		'client_credentials' => 'OAuth2\Storage\ClientCredentialsInterface',
+		'client' => 'OAuth2\Storage\ClientInterface',
+		'refresh_token' => 'OAuth2\Storage\RefreshTokenInterface',
+		'user_credentials' => 'OAuth2\Storage\UserCredentialsInterface',
+		'user_claims' => 'OAuth2\OpenID\Storage\UserClaimsInterface',
+		'public_key' => 'OAuth2\Storage\PublicKeyInterface',
+		'jwt_bearer' => 'OAuth2\Storage\JWTBearerInterface',
+		'scope' => 'OAuth2\Storage\ScopeInterface',
+	);
+
+	protected $responseTypeMap = array(
+		'token' => 'OAuth2\ResponseType\AccessTokenInterface',
+		'code' => 'OAuth2\ResponseType\AuthorizationCodeInterface',
+		'id_token' => 'OAuth2\OpenID\ResponseType\IdTokenInterface',
+		'id_token token' => 'OAuth2\OpenID\ResponseType\IdTokenTokenInterface',
+		'code id_token' => 'OAuth2\OpenID\ResponseType\CodeIdTokenInterface',
+	);
+
+	/**
+	 * @param mixed                                                   $storage             (array or OAuth2\Storage) - single object or array of objects implementing the
+	 *                                                                                     required storage types (ClientCredentialsInterface and AccessTokenInterface as a minimum)
+	 * @param array                                                   $config              specify a different token lifetime, token header name, etc
+	 * @param array                                                   $grantTypes          An array of OAuth2\GrantType\GrantTypeInterface to use for granting access tokens
+	 * @param array                                                   $responseTypes       Response types to use.  array keys should be "code" and and "token" for
+	 *                                                                                     Access Token and Authorization Code response types
+	 * @param OAuth2\TokenType\TokenTypeInterface                     $tokenType           The token type object to use. Valid token types are "bearer" and "mac"
+	 * @param OAuth2\ScopeInterface                                   $scopeUtil           The scope utility class to use to validate scope
+	 * @param OAuth2\ClientAssertionType\ClientAssertionTypeInterface $clientAssertionType The method in which to verify the client identity.  Default is HttpBasic
+	 *
+	 * @ingroup oauth2_section_7
+	 */
+	public function __construct($storage = array(), array $config = array(), array $grantTypes = array(), array $responseTypes = array(), TokenTypeInterface $tokenType = null, ScopeInterface $scopeUtil = null, ClientAssertionTypeInterface $clientAssertionType = null)
+	{
+		$storage = is_array($storage) ? $storage : array($storage);
+		$this->storages = array();
+		foreach ($storage as $key => $service) {
+			$this->addStorage($service, $key);
+		}
+
+		// merge all config values.  These get passed to our controller objects
+		$this->config = array_merge(array(
+			'use_jwt_access_tokens'        => false,
+			'store_encrypted_token_string' => true,
+			'use_openid_connect'       => false,
+			'id_lifetime'              => 3600,
+			'access_lifetime'          => 3600,
+			'www_realm'                => 'Service',
+			'token_param_name'         => 'access_token',
+			'token_bearer_header_name' => 'Bearer',
+			'enforce_state'            => true,
+			'require_exact_redirect_uri' => true,
+			'allow_implicit'           => false,
+			'allow_credentials_in_request_body' => true,
+			'allow_public_clients'     => true,
+			'always_issue_new_refresh_token' => false,
+			'unset_refresh_token_after_use' => true,
+		), $config);
+
+		foreach ($grantTypes as $key => $grantType) {
+			$this->addGrantType($grantType, $key);
+		}
+
+		foreach ($responseTypes as $key => $responseType) {
+			$this->addResponseType($responseType, $key);
+		}
+
+		$this->tokenType = $tokenType;
+		$this->scopeUtil = $scopeUtil;
+		$this->clientAssertionType = $clientAssertionType;
+
+		if ($this->config['use_openid_connect']) {
+			$this->validateOpenIdConnect();
+		}
+	}
+
+	public function getAuthorizeController()
+	{
+		if (is_null($this->authorizeController)) {
+			$this->authorizeController = $this->createDefaultAuthorizeController();
+		}
+
+		return $this->authorizeController;
+	}
+
+	public function getTokenController()
+	{
+		if (is_null($this->tokenController)) {
+			$this->tokenController = $this->createDefaultTokenController();
+		}
+
+		return $this->tokenController;
+	}
+
+	public function getResourceController()
+	{
+		if (is_null($this->resourceController)) {
+			$this->resourceController = $this->createDefaultResourceController();
+		}
+
+		return $this->resourceController;
+	}
+
+	public function getUserInfoController()
+	{
+		if (is_null($this->userInfoController)) {
+			$this->userInfoController = $this->createDefaultUserInfoController();
+		}
+
+		return $this->userInfoController;
+	}
+
+	/**
+	 * every getter deserves a setter
+	 */
+	public function setAuthorizeController(AuthorizeControllerInterface $authorizeController)
+	{
+		$this->authorizeController = $authorizeController;
+	}
+
+	/**
+	 * every getter deserves a setter
+	 */
+	public function setTokenController(TokenControllerInterface $tokenController)
+	{
+		$this->tokenController = $tokenController;
+	}
+
+	/**
+	 * every getter deserves a setter
+	 */
+	public function setResourceController(ResourceControllerInterface $resourceController)
+	{
+		$this->resourceController = $resourceController;
+	}
+
+	/**
+	 * every getter deserves a setter
+	 */
+	public function setUserInfoController(UserInfoControllerInterface $userInfoController)
+	{
+		$this->userInfoController = $userInfoController;
+	}
+
+	/**
+	 * Return claims about the authenticated end-user.
+	 * This would be called from the "/UserInfo" endpoint as defined in the spec.
+	 *
+	 * @param $request - OAuth2\RequestInterface
+	 * Request object to grant access token
+	 *
+	 * @param $response - OAuth2\ResponseInterface
+	 * Response object containing error messages (failure) or user claims (success)
+	 *
+	 * @throws InvalidArgumentException
+	 * @throws LogicException
+	 *
+	 * @see http://openid.net/specs/openid-connect-core-1_0.html#UserInfo
+	 */
+	public function handleUserInfoRequest(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$this->getUserInfoController()->handleUserInfoRequest($request, $this->response);
+
+		return $this->response;
+	}
+
+	/**
+	 * Grant or deny a requested access token.
+	 * This would be called from the "/token" endpoint as defined in the spec.
+	 * Obviously, you can call your endpoint whatever you want.
+	 *
+	 * @param $request - OAuth2\RequestInterface
+	 * Request object to grant access token
+	 *
+	 * @param $response - OAuth2\ResponseInterface
+	 * Response object containing error messages (failure) or access token (success)
+	 *
+	 * @throws InvalidArgumentException
+	 * @throws LogicException
+	 *
+	 * @see http://tools.ietf.org/html/rfc6749#section-4
+	 * @see http://tools.ietf.org/html/rfc6749#section-10.6
+	 * @see http://tools.ietf.org/html/rfc6749#section-4.1.3
+	 *
+	 * @ingroup oauth2_section_4
+	 */
+	public function handleTokenRequest(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$this->getTokenController()->handleTokenRequest($request, $this->response);
+
+		return $this->response;
+	}
+
+	public function grantAccessToken(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$value = $this->getTokenController()->grantAccessToken($request, $this->response);
+
+		return $value;
+	}
+
+	/**
+	 * Handle a revoke token request
+	 * This would be called from the "/revoke" endpoint as defined in the draft Token Revocation spec
+	 *
+	 * @see https://tools.ietf.org/html/rfc7009#section-2
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return Response|ResponseInterface
+	 */
+	public function handleRevokeRequest(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$this->getTokenController()->handleRevokeRequest($request, $this->response);
+
+		return $this->response;
+	}
+
+	/**
+	 * Redirect the user appropriately after approval.
+	 *
+	 * After the user has approved or denied the resource request the
+	 * authorization server should call this function to redirect the user
+	 * appropriately.
+	 *
+	 * @param $request
+	 * The request should have the follow parameters set in the querystring:
+	 * - response_type: The requested response: an access token, an
+	 * authorization code, or both.
+	 * - client_id: The client identifier as described in Section 2.
+	 * - redirect_uri: An absolute URI to which the authorization server
+	 * will redirect the user-agent to when the end-user authorization
+	 * step is completed.
+	 * - scope: (optional) The scope of the resource request expressed as a
+	 * list of space-delimited strings.
+	 * - state: (optional) An opaque value used by the client to maintain
+	 * state between the request and callback.
+	 * @param $is_authorized
+	 * TRUE or FALSE depending on whether the user authorized the access.
+	 * @param $user_id
+	 * Identifier of user who authorized the client
+	 *
+	 * @see http://tools.ietf.org/html/rfc6749#section-4
+	 *
+	 * @ingroup oauth2_section_4
+	 */
+	public function handleAuthorizeRequest(RequestInterface $request, ResponseInterface $response, $is_authorized, $user_id = null)
+	{
+		$this->response = $response;
+		$this->getAuthorizeController()->handleAuthorizeRequest($request, $this->response, $is_authorized, $user_id);
+
+		return $this->response;
+	}
+
+	/**
+	 * Pull the authorization request data out of the HTTP request.
+	 * - The redirect_uri is OPTIONAL as per draft 20. But your implementation can enforce it
+	 * by setting $config['enforce_redirect'] to true.
+	 * - The state is OPTIONAL but recommended to enforce CSRF. Draft 21 states, however, that
+	 * CSRF protection is MANDATORY. You can enforce this by setting the $config['enforce_state'] to true.
+	 *
+	 * The draft specifies that the parameters should be retrieved from GET, override the Response
+	 * object to change this
+	 *
+	 * @return
+	 * The authorization parameters so the authorization server can prompt
+	 * the user for approval if valid.
+	 *
+	 * @see http://tools.ietf.org/html/rfc6749#section-4.1.1
+	 * @see http://tools.ietf.org/html/rfc6749#section-10.12
+	 *
+	 * @ingroup oauth2_section_3
+	 */
+	public function validateAuthorizeRequest(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$value = $this->getAuthorizeController()->validateAuthorizeRequest($request, $this->response);
+
+		return $value;
+	}
+
+	public function verifyResourceRequest(RequestInterface $request, ResponseInterface $response = null, $scope = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$value = $this->getResourceController()->verifyResourceRequest($request, $this->response, $scope);
+
+		return $value;
+	}
+
+	public function getAccessTokenData(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$value = $this->getResourceController()->getAccessTokenData($request, $this->response);
+
+		return $value;
+	}
+
+	public function addGrantType(GrantTypeInterface $grantType, $identifier = null)
+	{
+		if (!is_string($identifier)) {
+			$identifier = $grantType->getQuerystringIdentifier();
+		}
+
+		$this->grantTypes[$identifier] = $grantType;
+
+		// persist added grant type down to TokenController
+		if (!is_null($this->tokenController)) {
+			$this->getTokenController()->addGrantType($grantType, $identifier);
+		}
+	}
+
+	/**
+	 * Set a storage object for the server
+	 *
+	 * @param $storage
+	 * An object implementing one of the Storage interfaces
+	 * @param $key
+	 * If null, the storage is set to the key of each storage interface it implements
+	 *
+	 * @see storageMap
+	 */
+	public function addStorage($storage, $key = null)
+	{
+		// if explicitly set to a valid key, do not "magically" set below
+		if (isset($this->storageMap[$key])) {
+			if (!is_null($storage) && !$storage instanceof $this->storageMap[$key]) {
+				throw new \InvalidArgumentException(sprintf('storage of type "%s" must implement interface "%s"', $key, $this->storageMap[$key]));
+			}
+			$this->storages[$key] = $storage;
+
+			// special logic to handle "client" and "client_credentials" strangeness
+			if ($key === 'client' && !isset($this->storages['client_credentials'])) {
+				if ($storage instanceof \OAuth2\Storage\ClientCredentialsInterface) {
+					$this->storages['client_credentials'] = $storage;
+				}
+			} elseif ($key === 'client_credentials' && !isset($this->storages['client'])) {
+				if ($storage instanceof \OAuth2\Storage\ClientInterface) {
+					$this->storages['client'] = $storage;
+				}
+			}
+		} elseif (!is_null($key) && !is_numeric($key)) {
+			throw new \InvalidArgumentException(sprintf('unknown storage key "%s", must be one of [%s]', $key, implode(', ', array_keys($this->storageMap))));
+		} else {
+			$set = false;
+			foreach ($this->storageMap as $type => $interface) {
+				if ($storage instanceof $interface) {
+					$this->storages[$type] = $storage;
+					$set = true;
+				}
+			}
+
+			if (!$set) {
+				throw new \InvalidArgumentException(sprintf('storage of class "%s" must implement one of [%s]', get_class($storage), implode(', ', $this->storageMap)));
+			}
+		}
+	}
+
+	public function addResponseType(ResponseTypeInterface $responseType, $key = null)
+	{
+		$key = $this->normalizeResponseType($key);
+
+		if (isset($this->responseTypeMap[$key])) {
+			if (!$responseType instanceof $this->responseTypeMap[$key]) {
+				throw new \InvalidArgumentException(sprintf('responseType of type "%s" must implement interface "%s"', $key, $this->responseTypeMap[$key]));
+			}
+			$this->responseTypes[$key] = $responseType;
+		} elseif (!is_null($key) && !is_numeric($key)) {
+			throw new \InvalidArgumentException(sprintf('unknown responseType key "%s", must be one of [%s]', $key, implode(', ', array_keys($this->responseTypeMap))));
+		} else {
+			$set = false;
+			foreach ($this->responseTypeMap as $type => $interface) {
+				if ($responseType instanceof $interface) {
+					$this->responseTypes[$type] = $responseType;
+					$set = true;
+				}
+			}
+
+			if (!$set) {
+				throw new \InvalidArgumentException(sprintf('Unknown response type %s.  Please implement one of [%s]', get_class($responseType), implode(', ', $this->responseTypeMap)));
+			}
+		}
+	}
+
+	public function getScopeUtil()
+	{
+		if (!$this->scopeUtil) {
+			$storage = isset($this->storages['scope']) ? $this->storages['scope'] : null;
+			$this->scopeUtil = new Scope($storage);
+		}
+
+		return $this->scopeUtil;
+	}
+
+	/**
+	 * every getter deserves a setter
+	 */
+	public function setScopeUtil($scopeUtil)
+	{
+		$this->scopeUtil = $scopeUtil;
+	}
+
+	protected function createDefaultAuthorizeController()
+	{
+		if (!isset($this->storages['client'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientInterface to use the authorize server");
+		}
+		if (0 == count($this->responseTypes)) {
+			$this->responseTypes = $this->getDefaultResponseTypes();
+		}
+		if ($this->config['use_openid_connect'] && !isset($this->responseTypes['id_token'])) {
+			$this->responseTypes['id_token'] = $this->createDefaultIdTokenResponseType();
+			if ($this->config['allow_implicit']) {
+				$this->responseTypes['id_token token'] = $this->createDefaultIdTokenTokenResponseType();
+			}
+		}
+
+		$config = array_intersect_key($this->config, array_flip(explode(' ', 'allow_implicit enforce_state require_exact_redirect_uri')));
+
+		if ($this->config['use_openid_connect']) {
+			return new OpenIDAuthorizeController($this->storages['client'], $this->responseTypes, $config, $this->getScopeUtil());
+		}
+
+		return new AuthorizeController($this->storages['client'], $this->responseTypes, $config, $this->getScopeUtil());
+	}
+
+	protected function createDefaultTokenController()
+	{
+		if (0 == count($this->grantTypes)) {
+			$this->grantTypes = $this->getDefaultGrantTypes();
+		}
+
+		if (is_null($this->clientAssertionType)) {
+			// see if HttpBasic assertion type is requred.  If so, then create it from storage classes.
+			foreach ($this->grantTypes as $grantType) {
+				if (!$grantType instanceof ClientAssertionTypeInterface) {
+					if (!isset($this->storages['client_credentials'])) {
+						throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientCredentialsInterface to use the token server");
+					}
+					$config = array_intersect_key($this->config, array_flip(explode(' ', 'allow_credentials_in_request_body allow_public_clients')));
+					$this->clientAssertionType = new HttpBasic($this->storages['client_credentials'], $config);
+					break;
+				}
+			}
+		}
+
+		if (!isset($this->storages['client'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientInterface to use the token server");
+		}
+
+		$accessTokenResponseType = $this->getAccessTokenResponseType();
+
+		return new TokenController($accessTokenResponseType, $this->storages['client'], $this->grantTypes, $this->clientAssertionType, $this->getScopeUtil());
+	}
+
+	protected function createDefaultResourceController()
+	{
+		if ($this->config['use_jwt_access_tokens']) {
+			// overwrites access token storage with crypto token storage if "use_jwt_access_tokens" is set
+			if (!isset($this->storages['access_token']) || !$this->storages['access_token'] instanceof JwtAccessTokenInterface) {
+				$this->storages['access_token'] = $this->createDefaultJwtAccessTokenStorage();
+			}
+		} elseif (!isset($this->storages['access_token'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the resource server");
+		}
+
+		if (!$this->tokenType) {
+			$this->tokenType = $this->getDefaultTokenType();
+		}
+
+		$config = array_intersect_key($this->config, array('www_realm' => ''));
+
+		return new ResourceController($this->tokenType, $this->storages['access_token'], $config, $this->getScopeUtil());
+	}
+
+	protected function createDefaultUserInfoController()
+	{
+		if ($this->config['use_jwt_access_tokens']) {
+			// overwrites access token storage with crypto token storage if "use_jwt_access_tokens" is set
+			if (!isset($this->storages['access_token']) || !$this->storages['access_token'] instanceof JwtAccessTokenInterface) {
+				$this->storages['access_token'] = $this->createDefaultJwtAccessTokenStorage();
+			}
+		} elseif (!isset($this->storages['access_token'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the UserInfo server");
+		}
+
+		if (!isset($this->storages['user_claims'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use the UserInfo server");
+		}
+
+		if (!$this->tokenType) {
+			$this->tokenType = $this->getDefaultTokenType();
+		}
+
+		$config = array_intersect_key($this->config, array('www_realm' => ''));
+
+		return new UserInfoController($this->tokenType, $this->storages['access_token'], $this->storages['user_claims'], $config, $this->getScopeUtil());
+	}
+
+	protected function getDefaultTokenType()
+	{
+		$config = array_intersect_key($this->config, array_flip(explode(' ', 'token_param_name token_bearer_header_name')));
+
+		return new Bearer($config);
+	}
+
+	protected function getDefaultResponseTypes()
+	{
+		$responseTypes = array();
+
+		if ($this->config['allow_implicit']) {
+			$responseTypes['token'] = $this->getAccessTokenResponseType();
+		}
+
+		if ($this->config['use_openid_connect']) {
+			$responseTypes['id_token'] = $this->getIdTokenResponseType();
+			if ($this->config['allow_implicit']) {
+				$responseTypes['id_token token'] = $this->getIdTokenTokenResponseType();
+			}
+		}
+
+		if (isset($this->storages['authorization_code'])) {
+			$config = array_intersect_key($this->config, array_flip(explode(' ', 'enforce_redirect auth_code_lifetime')));
+			if ($this->config['use_openid_connect']) {
+				if (!$this->storages['authorization_code'] instanceof OpenIDAuthorizationCodeInterface) {
+					throw new \LogicException("Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when 'use_openid_connect' is true");
+				}
+				$responseTypes['code'] = new OpenIDAuthorizationCodeResponseType($this->storages['authorization_code'], $config);
+				$responseTypes['code id_token'] = new CodeIdToken($responseTypes['code'], $responseTypes['id_token']);
+			} else {
+				$responseTypes['code'] = new AuthorizationCodeResponseType($this->storages['authorization_code'], $config);
+			}
+		}
+
+		if (count($responseTypes) == 0) {
+			throw new \LogicException("You must supply an array of response_types in the constructor or implement a OAuth2\Storage\AuthorizationCodeInterface storage object or set 'allow_implicit' to true and implement a OAuth2\Storage\AccessTokenInterface storage object");
+		}
+
+		return $responseTypes;
+	}
+
+	protected function getDefaultGrantTypes()
+	{
+		$grantTypes = array();
+
+		if (isset($this->storages['user_credentials'])) {
+			$grantTypes['password'] = new UserCredentials($this->storages['user_credentials']);
+		}
+
+		if (isset($this->storages['client_credentials'])) {
+			$config = array_intersect_key($this->config, array('allow_credentials_in_request_body' => ''));
+			$grantTypes['client_credentials'] = new ClientCredentials($this->storages['client_credentials'], $config);
+		}
+
+		if (isset($this->storages['refresh_token'])) {
+			$config = array_intersect_key($this->config, array_flip(explode(' ', 'always_issue_new_refresh_token unset_refresh_token_after_use')));
+			$grantTypes['refresh_token'] = new RefreshToken($this->storages['refresh_token'], $config);
+		}
+
+		if (isset($this->storages['authorization_code'])) {
+			if ($this->config['use_openid_connect']) {
+				if (!$this->storages['authorization_code'] instanceof OpenIDAuthorizationCodeInterface) {
+					throw new \LogicException("Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when 'use_openid_connect' is true");
+				}
+				$grantTypes['authorization_code'] = new OpenIDAuthorizationCodeGrantType($this->storages['authorization_code']);
+			} else {
+				$grantTypes['authorization_code'] = new AuthorizationCode($this->storages['authorization_code']);
+			}
+		}
+
+		if (count($grantTypes) == 0) {
+			throw new \LogicException("Unable to build default grant types - You must supply an array of grant_types in the constructor");
+		}
+
+		return $grantTypes;
+	}
+
+	protected function getAccessTokenResponseType()
+	{
+		if (isset($this->responseTypes['token'])) {
+			return $this->responseTypes['token'];
+		}
+
+		if ($this->config['use_jwt_access_tokens']) {
+			return $this->createDefaultJwtAccessTokenResponseType();
+		}
+
+		return $this->createDefaultAccessTokenResponseType();
+	}
+
+	protected function getIdTokenResponseType()
+	{
+		if (isset($this->responseTypes['id_token'])) {
+			return $this->responseTypes['id_token'];
+		}
+
+		return $this->createDefaultIdTokenResponseType();
+	}
+
+	protected function getIdTokenTokenResponseType()
+	{
+		if (isset($this->responseTypes['id_token token'])) {
+			return $this->responseTypes['id_token token'];
+		}
+
+		return $this->createDefaultIdTokenTokenResponseType();
+	}
+
+	/**
+	 * For Resource Controller
+	 */
+	protected function createDefaultJwtAccessTokenStorage()
+	{
+		if (!isset($this->storages['public_key'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens");
+		}
+		$tokenStorage = null;
+		if (!empty($this->config['store_encrypted_token_string']) && isset($this->storages['access_token'])) {
+			$tokenStorage = $this->storages['access_token'];
+		}
+		// wrap the access token storage as required.
+		return new JwtAccessTokenStorage($this->storages['public_key'], $tokenStorage);
+	}
+
+	/**
+	 * For Authorize and Token Controllers
+	 */
+	protected function createDefaultJwtAccessTokenResponseType()
+	{
+		if (!isset($this->storages['public_key'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens");
+		}
+
+		$tokenStorage = null;
+		if (isset($this->storages['access_token'])) {
+			$tokenStorage = $this->storages['access_token'];
+		}
+
+		$refreshStorage = null;
+		if (isset($this->storages['refresh_token'])) {
+			$refreshStorage = $this->storages['refresh_token'];
+		}
+
+		$config = array_intersect_key($this->config, array_flip(explode(' ', 'store_encrypted_token_string issuer access_lifetime refresh_token_lifetime')));
+
+		return new JwtAccessToken($this->storages['public_key'], $tokenStorage, $refreshStorage, $config);
+	}
+
+	protected function createDefaultAccessTokenResponseType()
+	{
+		if (!isset($this->storages['access_token'])) {
+			throw new \LogicException("You must supply a response type implementing OAuth2\ResponseType\AccessTokenInterface, or a storage object implementing OAuth2\Storage\AccessTokenInterface to use the token server");
+		}
+
+		$refreshStorage = null;
+		if (isset($this->storages['refresh_token'])) {
+			$refreshStorage = $this->storages['refresh_token'];
+		}
+
+		$config = array_intersect_key($this->config, array_flip(explode(' ', 'access_lifetime refresh_token_lifetime')));
+		$config['token_type'] = $this->tokenType ? $this->tokenType->getTokenType() :  $this->getDefaultTokenType()->getTokenType();
+
+		return new AccessToken($this->storages['access_token'], $refreshStorage, $config);
+	}
+
+	protected function createDefaultIdTokenResponseType()
+	{
+		if (!isset($this->storages['user_claims'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use openid connect");
+		}
+		if (!isset($this->storages['public_key'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use openid connect");
+		}
+
+		$config = array_intersect_key($this->config, array_flip(explode(' ', 'issuer id_lifetime')));
+
+		return new IdToken($this->storages['user_claims'], $this->storages['public_key'], $config);
+	}
+
+	protected function createDefaultIdTokenTokenResponseType()
+	{
+		return new IdTokenToken($this->getAccessTokenResponseType(), $this->getIdTokenResponseType());
+	}
+
+	protected function validateOpenIdConnect()
+	{
+		$authCodeGrant = $this->getGrantType('authorization_code');
+		if (!empty($authCodeGrant) && !$authCodeGrant instanceof OpenIDAuthorizationCodeGrantType) {
+			throw new \InvalidArgumentException('You have enabled OpenID Connect, but supplied a grant type that does not support it.');
+		}
+	}
+
+	protected function normalizeResponseType($name)
+	{
+		// for multiple-valued response types - make them alphabetical
+		if (!empty($name) && false !== strpos($name, ' ')) {
+			$types = explode(' ', $name);
+			sort($types);
+			$name = implode(' ', $types);
+		}
+
+		return $name;
+	}
+
+	public function getResponse()
+	{
+		return $this->response;
+	}
+
+	public function getStorages()
+	{
+		return $this->storages;
+	}
+
+	public function getStorage($name)
+	{
+		return isset($this->storages[$name]) ? $this->storages[$name] : null;
+	}
+
+	public function getGrantTypes()
+	{
+		return $this->grantTypes;
+	}
+
+	public function getGrantType($name)
+	{
+		return isset($this->grantTypes[$name]) ? $this->grantTypes[$name] : null;
+	}
+
+	public function getResponseTypes()
+	{
+		return $this->responseTypes;
+	}
+
+	public function getResponseType($name)
+	{
+		// for multiple-valued response types - make them alphabetical
+		$name = $this->normalizeResponseType($name);
+
+		return isset($this->responseTypes[$name]) ? $this->responseTypes[$name] : null;
+	}
+
+	public function getTokenType()
+	{
+		return $this->tokenType;
+	}
+
+	public function getClientAssertionType()
+	{
+		return $this->clientAssertionType;
+	}
+
+	public function setConfig($name, $value)
+	{
+		$this->config[$name] = $value;
+	}
+
+	public function getConfig($name, $default = null)
+	{
+		return isset($this->config[$name]) ? $this->config[$name] : $default;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -728,7 +728,7 @@
         }
 
         $config = array_intersect_key($this->config, array_flip(explode(' ', 'access_lifetime refresh_token_lifetime')));
-        $config['token_type'] = $this->tokenType ? $this->tokenType->getTokenType() :  $this->getDefaultTokenType()->getTokenType();
+        $config['token_type'] = $this->tokenType ? $this->tokenType->getTokenType() : $this->getDefaultTokenType()->getTokenType();
 
         return new AccessToken($this->storages['access_token'], $refreshStorage, $config);
     }

extensions/libraries/redcore/api/oauth2/Autoloader.php

Indentation +38 added lines, -38 removed lines

@@ -10,47 +10,47 @@
  */
 class Autoloader
 {
-    private $dir;
+	private $dir;
 
-    public function __construct($dir = null)
-    {
-        if (is_null($dir)) {
-            $dir = dirname(__FILE__).'/..';
-        }
-        $this->dir = $dir;
-    }
-    /**
-     * Registers OAuth2\Autoloader as an SPL autoloader.
-     */
-    public static function register($dir = null)
-    {
-        ini_set('unserialize_callback_func', 'spl_autoload_call');
-        spl_autoload_register(array(new self($dir), 'autoload'));
-    }
+	public function __construct($dir = null)
+	{
+		if (is_null($dir)) {
+			$dir = dirname(__FILE__).'/..';
+		}
+		$this->dir = $dir;
+	}
+	/**
+	 * Registers OAuth2\Autoloader as an SPL autoloader.
+	 */
+	public static function register($dir = null)
+	{
+		ini_set('unserialize_callback_func', 'spl_autoload_call');
+		spl_autoload_register(array(new self($dir), 'autoload'));
+	}
 
-    /**
-     * Handles autoloading of classes.
-     *
-     * @param string $class A class name.
-     *
-     * @return boolean Returns true if the class has been loaded
-     */
-    public function autoload($class)
-    {
-        if (0 !== strpos($class, 'OAuth2')) {
-            return;
-        }
+	/**
+	 * Handles autoloading of classes.
+	 *
+	 * @param string $class A class name.
+	 *
+	 * @return boolean Returns true if the class has been loaded
+	 */
+	public function autoload($class)
+	{
+		if (0 !== strpos($class, 'OAuth2')) {
+			return;
+		}
 
-	    $class = str_replace('\\', '/', $class);
+		$class = str_replace('\\', '/', $class);
 
-	    if (strpos($class, 'OAuth2') === 0)
-	    {
-		    $count = 1;
-		    $class = str_replace('OAuth2', 'oauth2', $class, $count);
-	    }
+		if (strpos($class, 'OAuth2') === 0)
+		{
+			$count = 1;
+			$class = str_replace('OAuth2', 'oauth2', $class, $count);
+		}
 
-        if (file_exists($file = $this->dir . '/' . $class . '.php')) {
-            require $file;
-        }
-    }
+		if (file_exists($file = $this->dir . '/' . $class . '.php')) {
+			require $file;
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     public function __construct($dir = null)
     {
         if (is_null($dir)) {
-            $dir = dirname(__FILE__).'/..';
+            $dir = dirname(__FILE__) . '/..';
         }
         $this->dir = $dir;
     }

extensions/libraries/redcore/api/oauth2/GrantType/UserCredentials.php

Indentation +50 added lines, -50 removed lines

@@ -13,71 +13,71 @@
  */
 class UserCredentials implements GrantTypeInterface
 {
-    private $userInfo;
+	private $userInfo;
 
-    protected $storage;
+	protected $storage;
 
-    /**
-     * @param OAuth2\Storage\UserCredentialsInterface $storage REQUIRED Storage class for retrieving user credentials information
-     */
-    public function __construct(UserCredentialsInterface $storage)
-    {
-        $this->storage = $storage;
-    }
+	/**
+	 * @param OAuth2\Storage\UserCredentialsInterface $storage REQUIRED Storage class for retrieving user credentials information
+	 */
+	public function __construct(UserCredentialsInterface $storage)
+	{
+		$this->storage = $storage;
+	}
 
-    public function getQuerystringIdentifier()
-    {
-        return 'password';
-    }
+	public function getQuerystringIdentifier()
+	{
+		return 'password';
+	}
 
-    public function validateRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        if (!$request->request("password") || !$request->request("username")) {
-            $response->setError(400, 'invalid_request', 'Missing parameters: "username" and "password" required');
+	public function validateRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		if (!$request->request("password") || !$request->request("username")) {
+			$response->setError(400, 'invalid_request', 'Missing parameters: "username" and "password" required');
 
-            return null;
-        }
+			return null;
+		}
 
-        if (!$this->storage->checkUserCredentials($request->request("username"), $request->request("password"))) {
-            $response->setError(401, 'invalid_grant', 'Invalid username and password combination');
+		if (!$this->storage->checkUserCredentials($request->request("username"), $request->request("password"))) {
+			$response->setError(401, 'invalid_grant', 'Invalid username and password combination');
 
-            return null;
-        }
+			return null;
+		}
 
-        $userInfo = $this->storage->getUserDetails($request->request("username"));
+		$userInfo = $this->storage->getUserDetails($request->request("username"));
 
-        if (empty($userInfo)) {
-            $response->setError(400, 'invalid_grant', 'Unable to retrieve user information');
+		if (empty($userInfo)) {
+			$response->setError(400, 'invalid_grant', 'Unable to retrieve user information');
 
-            return null;
-        }
+			return null;
+		}
 
-        if (!isset($userInfo['user_id'])) {
-            throw new \LogicException("you must set the user_id on the array returned by getUserDetails");
-        }
+		if (!isset($userInfo['user_id'])) {
+			throw new \LogicException("you must set the user_id on the array returned by getUserDetails");
+		}
 
-        $this->userInfo = $userInfo;
+		$this->userInfo = $userInfo;
 
-        return true;
-    }
+		return true;
+	}
 
-    public function getClientId()
-    {
-        return null;
-    }
+	public function getClientId()
+	{
+		return null;
+	}
 
-    public function getUserId()
-    {
-        return $this->userInfo['user_id'];
-    }
+	public function getUserId()
+	{
+		return $this->userInfo['user_id'];
+	}
 
-    public function getScope()
-    {
-        return isset($this->userInfo['scope']) ? $this->userInfo['scope'] : null;
-    }
+	public function getScope()
+	{
+		return isset($this->userInfo['scope']) ? $this->userInfo['scope'] : null;
+	}
 
-    public function createAccessToken(AccessTokenInterface $accessToken, $client_id, $user_id, $scope)
-    {
-        return $accessToken->createAccessToken($client_id, $user_id, $scope);
-    }
+	public function createAccessToken(AccessTokenInterface $accessToken, $client_id, $user_id, $scope)
+	{
+		return $accessToken->createAccessToken($client_id, $user_id, $scope);
+	}
 }

extensions/libraries/redcore/api/oauth2/GrantType/AuthorizationCode.php

Indentation +69 added lines, -69 removed lines

@@ -13,88 +13,88 @@
  */
 class AuthorizationCode implements GrantTypeInterface
 {
-    protected $storage;
-    protected $authCode;
-
-    /**
-     * @param OAuth2\Storage\AuthorizationCodeInterface $storage REQUIRED Storage class for retrieving authorization code information
-     */
-    public function __construct(AuthorizationCodeInterface $storage)
-    {
-        $this->storage = $storage;
-    }
-
-    public function getQuerystringIdentifier()
-    {
-        return 'authorization_code';
-    }
-
-    public function validateRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        if (!$request->request('code')) {
-            $response->setError(400, 'invalid_request', 'Missing parameter: "code" is required');
-
-            return false;
-        }
-
-        $code = $request->request('code');
-        if (!$authCode = $this->storage->getAuthorizationCode($code)) {
-            $response->setError(400, 'invalid_grant', 'Authorization code doesn\'t exist or is invalid for the client');
-
-            return false;
-        }
-
-        /*
+	protected $storage;
+	protected $authCode;
+
+	/**
+	 * @param OAuth2\Storage\AuthorizationCodeInterface $storage REQUIRED Storage class for retrieving authorization code information
+	 */
+	public function __construct(AuthorizationCodeInterface $storage)
+	{
+		$this->storage = $storage;
+	}
+
+	public function getQuerystringIdentifier()
+	{
+		return 'authorization_code';
+	}
+
+	public function validateRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		if (!$request->request('code')) {
+			$response->setError(400, 'invalid_request', 'Missing parameter: "code" is required');
+
+			return false;
+		}
+
+		$code = $request->request('code');
+		if (!$authCode = $this->storage->getAuthorizationCode($code)) {
+			$response->setError(400, 'invalid_grant', 'Authorization code doesn\'t exist or is invalid for the client');
+
+			return false;
+		}
+
+		/*
          * 4.1.3 - ensure that the "redirect_uri" parameter is present if the "redirect_uri" parameter was included in the initial authorization request
          * @uri - http://tools.ietf.org/html/rfc6749#section-4.1.3
          */
-        if (isset($authCode['redirect_uri']) && $authCode['redirect_uri']) {
-            if (!$request->request('redirect_uri') || urldecode($request->request('redirect_uri')) != $authCode['redirect_uri']) {
-                $response->setError(400, 'redirect_uri_mismatch', "The redirect URI is missing or do not match", "#section-4.1.3");
+		if (isset($authCode['redirect_uri']) && $authCode['redirect_uri']) {
+			if (!$request->request('redirect_uri') || urldecode($request->request('redirect_uri')) != $authCode['redirect_uri']) {
+				$response->setError(400, 'redirect_uri_mismatch', "The redirect URI is missing or do not match", "#section-4.1.3");
 
-                return false;
-            }
-        }
+				return false;
+			}
+		}
 
-        if (!isset($authCode['expires'])) {
-            throw new \Exception('Storage must return authcode with a value for "expires"');
-        }
+		if (!isset($authCode['expires'])) {
+			throw new \Exception('Storage must return authcode with a value for "expires"');
+		}
 
-        if ($authCode["expires"] < time()) {
-            $response->setError(400, 'invalid_grant', "The authorization code has expired");
+		if ($authCode["expires"] < time()) {
+			$response->setError(400, 'invalid_grant', "The authorization code has expired");
 
-            return false;
-        }
+			return false;
+		}
 
-        if (!isset($authCode['code'])) {
-            $authCode['code'] = $code; // used to expire the code after the access token is granted
-        }
+		if (!isset($authCode['code'])) {
+			$authCode['code'] = $code; // used to expire the code after the access token is granted
+		}
 
-        $this->authCode = $authCode;
+		$this->authCode = $authCode;
 
-        return true;
-    }
+		return true;
+	}
 
-    public function getClientId()
-    {
-        return $this->authCode['client_id'];
-    }
+	public function getClientId()
+	{
+		return $this->authCode['client_id'];
+	}
 
-    public function getScope()
-    {
-        return isset($this->authCode['scope']) ? $this->authCode['scope'] : null;
-    }
+	public function getScope()
+	{
+		return isset($this->authCode['scope']) ? $this->authCode['scope'] : null;
+	}
 
-    public function getUserId()
-    {
-        return isset($this->authCode['user_id']) ? $this->authCode['user_id'] : null;
-    }
+	public function getUserId()
+	{
+		return isset($this->authCode['user_id']) ? $this->authCode['user_id'] : null;
+	}
 
-    public function createAccessToken(AccessTokenInterface $accessToken, $client_id, $user_id, $scope)
-    {
-        $token = $accessToken->createAccessToken($client_id, $user_id, $scope);
-        $this->storage->expireAuthorizationCode($this->authCode['code']);
+	public function createAccessToken(AccessTokenInterface $accessToken, $client_id, $user_id, $scope)
+	{
+		$token = $accessToken->createAccessToken($client_id, $user_id, $scope);
+		$this->storage->expireAuthorizationCode($this->authCode['code']);
 
-        return $token;
-    }
+		return $token;
+	}
 }