Version bump

Bearer token now correctly base64 decoding
Merge branch 'release/0.4.1'
2025-05-31 14:12:07 +05:30 · 2013-01-24 15:44:07 +00:00 · 2013-01-08 15:52:17 +00:00 · 2013-01-02 22:36:48 +00:00 · 2013-01-02 22:36:41 +00:00 · 2013-01-02 22:32:49 +00:00
34 changed files with 2899 additions and 877 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 /composer.lock
 /docs/build/
 /build/logs/
-/build/coverage/
+/build/coverage/
+test
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+
+before_script: composer install
+script: phpunit -c build/phpunit.xml
--- a/README.md
+++ b/README.md
@@ -8,8 +8,8 @@ The framework is provided as a Composer package which can be installed by adding

 ```javascript
 {
-	"require": {  
-		"lncd\Oauth2": "*"  
+	"require": {
+		"lncd\Oauth2": "*"
 	}
 }
 ```
@@ -22,7 +22,12 @@ Check out the [wiki](https://github.com/lncd/OAuth2/wiki)

 ### Authentication Server

-The authentication server is a flexible class that supports the standard authorization code grant.
+The authentication server is a flexible class that supports the following grants:
+
+* authentication code
+* refresh token
+* client credentials
+* password (user credentials)

 ### Resource Server

--- a/build/phpunit.xml
+++ b/build/phpunit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false">
+<phpunit colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" bootstrap="../tests/Bootstrap.php">
 	<testsuites>
 		<testsuite name="Authentication Server">
 			<directory suffix="test.php">../tests/authentication</directory>
@@ -13,10 +13,12 @@
 			<directory suffix=".php">PEAR_INSTALL_DIR</directory>
 			<directory suffix=".php">PHP_LIBDIR</directory>
 			<directory suffix=".php">../vendor/composer</directory>
+			<directory suffix=".php">../tests</directory>
 		</blacklist>
 	</filter>
 	<logging>
-		<log type="coverage-html" target="coverage" title="lncd/OAuth" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70"/>
+		<log type="coverage-html" target="coverage" title="lncd/OAuth" charset="UTF-8" yui="true" highlight="true" lowUpperBound="50" highLowerBound="90"/>
+		<log type="coverage-text" target="php://stdout" title="lncd/OAuth" charset="UTF-8" yui="true" highlight="true" lowUpperBound="50" highLowerBound="90"/>
 		<log type="coverage-clover" target="logs/clover.xml"/>
 		<log type="junit" target="logs/junit.xml" logIncompleteSkipped="false"/>
 	</logging>
--- a/composer.json
+++ b/composer.json
@@ -1,14 +1,15 @@
 {
-	"name": "lncd/Oauth2",
+	"name": "lncd/oauth2",
 	"description": "OAuth 2.0 Framework",
-	"version": "0.2.3",
+	"version": "0.4.2",
 	"homepage": "https://github.com/lncd/OAuth2",
 	"license": "MIT",
 	"require": {
-		"php": ">=5.3.0"
+		"php": ">=5.3.0",
+		"guzzle/guzzle": "*"
 	},
 	"require-dev": {
-		"EHER/PHPUnit": "*"
+		"phpunit/phpunit": "*"
 	},
 	"repositories": [
 		{
@@ -27,8 +28,8 @@
 	"authors": [
 		{
 			"name": "Alex Bilbie",
-			"email": "oauth2@alexbilbie.com",
-			"homepage": "http://www.httpster.org",
+			"email": "hello@alexbilbie.com",
+			"homepage": "http://www.alexbilbie.com",
 			"role": "Developer"
 		}
 	],
@@ -36,5 +37,8 @@
 		"psr-0": {
 			"Oauth2": "src/"
 		}
+	},
+	"suggest": {
+		"lncd/oauth2-facebook": "Adds support for Facebook as an IDP"
 	}
 }
--- a/src/sql/database.sql
+++ b/src/sql/database.sql
@@ -20,12 +20,13 @@ CREATE TABLE `client_endpoints` (
 -- Create syntax for TABLE 'oauth_sessions'
 CREATE TABLE `oauth_sessions` (
  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `client_id` varchar(32) NOT NULL DEFAULT '',
-  `redirect_uri` varchar(250) NOT NULL DEFAULT '',
+  `client_id` varchar(40) NOT NULL DEFAULT '',
+  `redirect_uri` varchar(250) DEFAULT '',
  `owner_type` enum('user','client') NOT NULL DEFAULT 'user',
  `owner_id` varchar(255) DEFAULT NULL,
  `auth_code` varchar(40) DEFAULT '',
  `access_token` varchar(40) DEFAULT '',
+  `refresh_token` varchar(40) NOT NULL,
  `access_token_expires` int(10) DEFAULT NULL,
  `stage` enum('requested','granted') NOT NULL DEFAULT 'requested',
  `first_requested` int(10) unsigned NOT NULL,
@@ -56,4 +57,4 @@ CREATE TABLE `oauth_session_scopes` (
  KEY `scope` (`scope`),
  CONSTRAINT `oauth_session_scopes_ibfk_3` FOREIGN KEY (`scope`) REFERENCES `scopes` (`scope`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `oauth_session_scopes_ibfk_4` FOREIGN KEY (`session_id`) REFERENCES `oauth_sessions` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--- a/src/sql/index.html
+++ b/src/sql/index.html
--- a/src/Oauth2/Authentication/Database.php
+++ b/src/Oauth2/Authentication/Database.php
@@ -6,30 +6,42 @@ interface Database
 {
    /**
     * Validate a client
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
     * # Client ID + redirect URI
     * SELECT clients.id FROM clients LEFT JOIN client_endpoints ON
     *  client_endpoints.client_id = clients.id WHERE clients.id = $clientId AND
     *  client_endpoints.redirect_uri = $redirectUri
-     * 
+     *
     * # Client ID + client secret
     * SELECT clients.id FROM clients  WHERE clients.id = $clientId AND
     *  clients.secret = $clientSecret
-     * 
+     *
     * # Client ID + client secret + redirect URI
     * SELECT clients.id FROM clients LEFT JOIN client_endpoints ON
     *  client_endpoints.client_id = clients.id WHERE clients.id = $clientId AND
     *  clients.secret = $clientSecret AND client_endpoints.redirect_uri =
     *  $redirectUri
     * </code>
-     * 
-     * @param  string $clientId     The client's ID
+     *
+     * Response:
+     *
+     * <code>
+     * Array
+     * (
+     *     [client_id] => (string) The client ID
+     *     [client secret] => (string) The client secret
+     *     [redirect_uri] => (string) The redirect URI used in this request
+     *     [name] => (string) The name of the client
+     * )
+     * </code>
+     *
+     * @param  string $clientId       The client's ID
     * @param  string $clientSecret The client's secret (default = "null")
-     * @param  string $redirectUri  The client's redirect URI (default = "null")
-     * @return [type]               [description]
+     * @param  string $redirectUri   The client's redirect URI (default = "null")
+     * @return  bool|array               Returns false if the validation fails, array on success
     */
    public function validateClient(
        $clientId,
@@ -39,24 +51,25 @@ interface Database

    /**
     * Create a new OAuth session
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
     * INSERT INTO oauth_sessions (client_id, redirect_uri, owner_type,
-     *  owner_id, auth_code, access_token, stage, first_requested, last_updated)
-     *  VALUES ($clientId, $redirectUri, $type, $typeId, $authCode,
-     *  $accessToken, $stage, UNIX_TIMESTAMP(NOW()), UNIX_TIMESTAMP(NOW()))
+     * owner_id, auth_code, access_token, refresh_token, stage, first_requested,
+     * last_updated) VALUES ($clientId, $redirectUri, $type, $typeId, $authCode,
+     * $accessToken, $stage, UNIX_TIMESTAMP(NOW()), UNIX_TIMESTAMP(NOW()))
     * </code>
-     * 
-     * @param  string $clientId    The client ID
-     * @param  string $redirectUri The redirect URI
-     * @param  string $type        The session owner's type (default = "user")
-     * @param  string $typeId      The session owner's ID (default = "null")
-     * @param  string $authCode    The authorisation code (default = "null")
-     * @param  string $accessToken The access token (default = "null")
-     * @param  string $stage       The stage of the session (default ="request")
-     * @return [type]              [description]
+     *
+     * @param  string $clientId     The client ID
+     * @param  string $redirectUri  The redirect URI
+     * @param  string $type         The session owner's type (default = "user")
+     * @param  string $typeId       The session owner's ID (default = "null")
+     * @param  string $authCode     The authorisation code (default = "null")
+     * @param  string $accessToken  The access token (default = "null")
+     * @param  string $refreshToken The refresh token (default = "null")
+     * @param  string $stage        The stage of the session (default ="request")
+     * @return  int The session ID
     */
    public function newSession(
        $clientId,
@@ -65,47 +78,50 @@ interface Database
        $typeId = null,
        $authCode = null,
        $accessToken = null,
+        $refreshToken = null,
        $accessTokenExpire = null,
        $stage = 'requested'
    );

    /**
     * Update an OAuth session
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
     * UPDATE oauth_sessions SET auth_code = $authCode, access_token =
     *  $accessToken, stage = $stage, last_updated = UNIX_TIMESTAMP(NOW()) WHERE
     *  id = $sessionId
     * </code>
-     * 
-     * @param  string $sessionId   The session ID
-     * @param  string $authCode    The authorisation code (default = "null")
-     * @param  string $accessToken The access token (default = "null")
-     * @param  string $stage       The stage of the session (default ="request")
-     * @return void
+     *
+     * @param  string $sessionId    The session ID
+     * @param  string $authCode     The authorisation code (default = "null")
+     * @param  string $accessToken  The access token (default = "null")
+     * @param  string $refreshToken The refresh token (default = "null")
+     * @param  string $stage        The stage of the session (default ="request")
+     * @return  void
     */
    public function updateSession(
        $sessionId,
        $authCode = null,
        $accessToken = null,
+        $refreshToken = null,
        $accessTokenExpire = null,
        $stage = 'requested'
    );

    /**
     * Delete an OAuth session
-     * 
+     *
     * <code>
     * DELETE FROM oauth_sessions WHERE client_id = $clientId AND owner_type =
     *  $type AND owner_id = $typeId
     * </code>
-     * 
+     *
     * @param  string $clientId The client ID
-     * @param  string $type     The session owner's type 
+     * @param  string $type     The session owner's type
     * @param  string $typeId   The session owner's ID
-     * @return [type]           [description]
+     * @return  void
     */
    public function deleteSession(
        $clientId,
@@ -113,18 +129,39 @@ interface Database
        $typeId
    );

+    public function validateRefreshToken($refreshToken, $clientId);
+
+    /**
+     * Update the refresh token
+     *
+     * Database query:
+     *
+     * <code>
+     * UPDATE oauth_sessions SET access_token = $newAccessToken, refresh_token =
+     *  $newRefreshToken, access_toke_expires = $accessTokenExpires, last_updated = UNIX_TIMESTAMP(NOW()) WHERE
+     *  id = $sessionId
+     * </code>
+     *
+     * @param  string $sessionId             The session ID
+     * @param  string $newAccessToken        The new access token for this session
+     * @param  string $newRefreshToken       The new refresh token for the session
+     * @param  int    $accessTokenExpires    The UNIX timestamp of when the new token expires
+     * @return void
+     */
+    public function updateRefreshToken($sessionId, $newAccessToken, $newRefreshToken, $accessTokenExpires);
+
    /**
     * Validate that an authorisation code is valid
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
     * SELECT id FROM oauth_sessions WHERE client_id = $clientID AND
     *  redirect_uri = $redirectUri AND auth_code = $authCode
     * </code>
-     * 
+     *
     * Response:
-     * 
+     *
     * <code>
     * Array
     * (
@@ -141,12 +178,12 @@ interface Database
     *      last updated
     * )
     * </code>
-     * 
+     *
     * @param  string     $clientId    The client ID
     * @param  string     $redirectUri The redirect URI
     * @param  string     $authCode    The authorisation code
-     * @return int|bool                Returns the session ID if the auth code
-     *  is valid otherwise returns false 
+     * @return  int|bool   Returns the session ID if the auth code
+     *  is valid otherwise returns false
     */
    public function validateAuthCode(
        $clientId,
@@ -156,18 +193,18 @@ interface Database

    /**
     * Return the session ID for a given session owner and client combination
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
     * SELECT id FROM oauth_sessions WHERE client_id = $clientId
     *  AND owner_type = $type AND owner_id = $typeId
     * </code>
-     * 
-     * @param  string      $type     The session owner's type 
+     *
+     * @param  string      $type     The session owner's type
     * @param  string      $typeId   The session owner's ID
     * @param  string      $clientId The client ID
-     * @return string|null           Return the session ID as an integer if 
+     * @return string|null           Return the session ID as an integer if
     *  found otherwise returns false
     */
    public function hasSession(
@@ -178,13 +215,13 @@ interface Database

    /**
     * Return the access token for a given session
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
     * SELECT access_token FROM oauth_sessions WHERE id = $sessionId
     * </code>
-     * 
+     *
     * @param  int         $sessionId The OAuth session ID
     * @return string|null            Returns the access token as a string if
     *  found otherwise returns null
@@ -193,13 +230,13 @@ interface Database

    /**
     * Removes an authorisation code associated with a session
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
     * UPDATE oauth_sessions SET auth_code = NULL WHERE id = $sessionId
     * </code>
-     * 
+     *
     * @param  int    $sessionId The OAuth session ID
     * @return void
     */
@@ -207,14 +244,14 @@ interface Database

    /**
     * Sets a sessions access token
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
-     * UPDATE oauth_sessions SET access_token = $accessToken WHERE id = 
+     * UPDATE oauth_sessions SET access_token = $accessToken WHERE id =
     *  $sessionId
     * </code>
-     * 
+     *
     * @param int    $sessionId   The OAuth session ID
     * @param string $accessToken The access token
     * @return void
@@ -226,14 +263,14 @@ interface Database

    /**
     * Associates a session with a scope
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
-     * INSERT INTO oauth_session_scopes (session_id, scope) VALUE ($sessionId, 
+     * INSERT INTO oauth_session_scopes (session_id, scope) VALUE ($sessionId,
     *  $scope)
     * </code>
-     * 
+     *
     * @param int    $sessionId The session ID
     * @param string $scope     The scope
     * @return void
@@ -245,15 +282,15 @@ interface Database

    /**
     * Return information about a scope
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
     * SELECT * FROM scopes WHERE scope = $scope
     * </code>
-     * 
+     *
     * Response:
-     * 
+     *
     * <code>
     * Array
     * (
@@ -263,22 +300,22 @@ interface Database
     *     [description] => (string) The scope's description
     * )
     * </code>
-     * 
+     *
     * @param  string $scope The scope
-     * @return array         
+     * @return array
     */
    public function getScope($scope);

    /**
     * Associate a session's scopes with an access token
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
-     * UPDATE oauth_session_scopes SET access_token = $accessToken WHERE 
+     * UPDATE oauth_session_scopes SET access_token = $accessToken WHERE
     *  session_id = $sessionId
     * </code>
-     * 
+     *
     * @param  int    $sessionId   The session ID
     * @param  string $accessToken The access token
     * @return void
@@ -290,17 +327,17 @@ interface Database

    /**
     * Return the scopes associated with an access token
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
-     * SELECT scopes.scope, scopes.name, scopes.description FROM 
-     * oauth_session_scopes JOIN scopes ON oauth_session_scopes.scope = 
+     * SELECT scopes.scope, scopes.name, scopes.description FROM
+     * oauth_session_scopes JOIN scopes ON oauth_session_scopes.scope =
     *  scopes.scope WHERE access_token = $accessToken
     * </code>
-     * 
+     *
     * Response:
-     * 
+     *
     * <code>
     * Array
     * (
@@ -312,7 +349,7 @@ interface Database
     *         )
     * )
     * </code>
-     * 
+     *
     * @param  string $accessToken The access token
     * @return array
     */
--- a/src/Oauth2/Authentication/Server.php
+++ b/src/Oauth2/Authentication/Server.php
@@ -30,24 +30,31 @@ class Server
     * @var array
     */
    private $_config = array(
-        'scope_delimeter'       =>  ',',
-        'access_token_ttl'   =>  null
+        'scope_delimeter'    =>  ',',
+        'access_token_ttl'   =>  3600
    );

    /**
     * Supported response types
     * @var array
     */
-    private $_responseTypes =   array(
+    private $_responseTypes = array(
        'code'
    );
-    
+
    /**
     * Supported grant types
     * @var array
     */
-    private $_grantTypes    =   array(
-        'authorization_code'
+    private $_grantTypes = array(
+        'authorization_code'    =>  false,
+        'client_credentials'    =>  false,
+        'password'  =>  false,
+        'refresh_token' =>  false,
+    );
+
+    private $_grantTypeCallbacks = array(
+        'password'  =>  null
    );

    /**
@@ -69,27 +76,29 @@ class Server

    /**
     * Error codes.
-     * 
+     *
     * To provide i8ln errors just overwrite the keys
-     * 
+     *
     * @var array
     */
    public $errors = array(
-        'invalid_request'   =>  'The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the "%s" parameter.',
-        'unauthorized_client'   =>  'The client is not authorized to request an access token using this method.',
-        'access_denied' =>  'The resource owner or authorization server denied the request.',
+        'invalid_request'           =>  'The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the "%s" parameter.',
+        'unauthorized_client'       =>  'The client is not authorized to request an access token using this method.',
+        'access_denied'             =>  'The resource owner or authorization server denied the request.',
        'unsupported_response_type' =>  'The authorization server does not support obtaining an access token using this method.',
-        'invalid_scope' =>  'The requested scope is invalid, unknown, or malformed. Check the "%s" scope.',
-        'server_error'  =>  'The authorization server encountered an unexpected condition which prevented it from fulfilling the request.',
+        'invalid_scope'             =>  'The requested scope is invalid, unknown, or malformed. Check the "%s" scope.',
+        'server_error'              =>  'The authorization server encountered an unexpected condition which prevented it from fulfilling the request.',
        'temporarily_unavailable'   =>  'The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server.',
-        'unsupported_grant_type'    =>  'The authorization grant type is not supported by the authorization server',
-        'invalid_client'    =>  'Client authentication failed',
-        'invalid_grant'     =>  'The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client. Check the "%s" parameter.'
+        'unsupported_grant_type'    =>  'The authorization grant type "%s" is not supported by the authorization server',
+        'invalid_client'            =>  'Client authentication failed',
+        'invalid_grant'             =>  'The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client. Check the "%s" parameter.',
+        'invalid_credentials'       =>  'The user credentials were incorrect.',
+        'invalid_refresh'           =>  'The refresh token is invalid.',
    );

    /**
     * Constructor
-     * 
+     *
     * @access public
     * @param  array $options Optional list of options to overwrite the defaults
     * @return void
@@ -97,13 +106,13 @@ class Server
    public function __construct($options = null)
    {
        if ($options !== null) {
-            $this->options = array_merge($this->_config, $options);
+            $this->_config = array_merge($this->_config, $options);
        }
    }

    /**
     * Register a database abstrator class
-     * 
+     *
     * @access public
     * @param  object $db A class that implements OAuth2ServerDatabase
     * @return void
@@ -113,9 +122,30 @@ class Server
        $this->_db = $db;
    }

+    /**
+     * Enable a grant type
+     *
+     * @access public
+     * @return void
+     */
+    public function enableGrantType($type, $callback = null)
+    {
+        if (isset($this->_grantTypes[$type])) {
+            $this->_grantTypes[$type] = true;
+        }
+
+        if (in_array($type, array_keys($this->_grantTypeCallbacks))) {
+            if (is_null($callback) || ! is_callable($callback)) {
+                throw new ServerException('No registered callback function for grant type `'.$type.'`');
+            }
+
+            $this->_grantTypeCallbacks[$type] = $callback;
+        }
+    }
+
    /**
     * Check client authorise parameters
-     * 
+     *
     * @access public
     * @param  array $authParams Optional array of parsed $_GET keys
     * @return array             Authorise request parameters
@@ -126,60 +156,62 @@ class Server

        // Client ID
        if ( ! isset($authParams['client_id']) && ! isset($_GET['client_id'])) {
-
            throw new ClientException(sprintf($this->errors['invalid_request'], 'client_id'), 0);
-
-        } else {
-
-            $params['client_id'] = (isset($authParams['client_id'])) ? $authParams['client_id'] : $_GET['client_id'];
-
        }

+        $params['client_id'] = (isset($authParams['client_id'])) ?
+                                    $authParams['client_id'] :
+                                    $_GET['client_id'];
+
        // Redirect URI
        if ( ! isset($authParams['redirect_uri']) && ! isset($_GET['redirect_uri'])) {
-
            throw new ClientException(sprintf($this->errors['invalid_request'], 'redirect_uri'), 0);
-
-        } else {
-
-            $params['redirect_uri'] = (isset($authParams['redirect_uri'])) ? $authParams['redirect_uri'] : $_GET['redirect_uri'];
-
        }

+        $params['redirect_uri'] = (isset($authParams['redirect_uri'])) ?
+                                        $authParams['redirect_uri'] :
+                                        $_GET['redirect_uri'];
+
        // Validate client ID and redirect URI
-        $clientDetails = $this->_dbCall('validateClient', $params['client_id'], null, $params['redirect_uri']);
+        $clientDetails = $this->_dbCall(
+            'validateClient',
+            $params['client_id'],
+            null,
+            $params['redirect_uri']
+        );

        if ($clientDetails === false) {
-
            throw new ClientException($this->errors['invalid_client'], 8);
        }

+        $params['client_details'] = $clientDetails;
+
        // Response type
        if ( ! isset($authParams['response_type']) && ! isset($_GET['response_type'])) {
-
            throw new ClientException(sprintf($this->errors['invalid_request'], 'response_type'), 0);
+        }

-        } else {
+        $params['response_type'] = (isset($authParams['response_type'])) ?
+                                        $authParams['response_type'] :
+                                        $_GET['response_type'];

-            $params['response_type'] = (isset($authParams['response_type'])) ? $authParams['response_type'] : $_GET['response_type'];
-
-            // Ensure response type is one that is recognised
-            if ( ! in_array($params['response_type'], $this->_responseTypes)) {
-
-                throw new ClientException($this->errors['unsupported_response_type'], 3);
-
-            }
+        // Ensure response type is one that is recognised
+        if ( ! in_array($params['response_type'], $this->_responseTypes)) {
+            throw new ClientException($this->errors['unsupported_response_type'], 3);
        }

        // Get and validate scopes
        if (isset($authParams['scope']) || isset($_GET['scope'])) {

-            $scopes = (isset($_GET['scope'])) ? $_GET['scope'] : $authParams['scope'];
+            $scopes = (isset($_GET['scope'])) ?
+                            $_GET['scope'] :
+                            $authParams['scope'];

            $scopes = explode($this->_config['scope_delimeter'], $scopes);

            // Remove any junk scopes
            for ($i = 0; $i < count($scopes); $i++) {
+
                $scopes[$i] = trim($scopes[$i]);

                if ($scopes[$i] === '') {
@@ -188,7 +220,6 @@ class Server
            }

            if (count($scopes) === 0) {
-
                throw new ClientException(sprintf($this->errors['invalid_request'], 'scope'), 0);
            }

@@ -196,12 +227,13 @@ class Server

            foreach ($scopes as $scope) {

-                $scopeDetails = $this->_dbCall('getScope', $scope);
-                
+                $scopeDetails = $this->_dbCall(
+                    'getScope',
+                    $scope
+                );
+
                if ($scopeDetails === false) {
-
                    throw new ClientException(sprintf($this->errors['invalid_scope'], $scope), 4);
-
                }

                $params['scopes'][] = $scopeDetails;
@@ -214,7 +246,7 @@ class Server

    /**
     * Parse a new authorise request
-     * 
+     *
     * @param  string $type            The session owner's type
     * @param  string $typeId          The session owner's ID
     * @param  array  $authoriseParams The authorise request $_GET parameters
@@ -223,18 +255,19 @@ class Server
    public function newAuthoriseRequest($type, $typeId, $authoriseParams)
    {
        // Remove any old sessions the user might have
-        $this->_dbCall('deleteSession',
+        $this->_dbCall(
+            'deleteSession',
            $authoriseParams['client_id'],
            $type,
            $typeId
        );

        // Create the new auth code
-        $authCode = $this->newAuthCode(
-            $authoriseParams['client_id'], 
+        $authCode = $this->_newAuthCode(
+            $authoriseParams['client_id'],
            'user',
            $typeId,
-            $authoriseParams['redirect_uri'], 
+            $authoriseParams['redirect_uri'],
            $authoriseParams['scopes']
        );

@@ -243,19 +276,19 @@ class Server

    /**
     * Generate a unique code
-     * 
+     *
     * Generate a unique code for an authorisation code, or token
-     * 
+     *
     * @return string A unique code
     */
-    private function generateCode()
+    private function _generateCode()
    {
        return sha1(uniqid(microtime()));
    }

    /**
     * Create a new authorisation code
-     * 
+     *
     * @param  string $clientId    The client ID
     * @param  string $type        The type of the owner of the session
     * @param  string $typeId      The session owner's ID
@@ -264,237 +297,478 @@ class Server
     * @param  string $accessToken The access token (default = null)
     * @return string              An authorisation code
     */
-    private function newAuthCode($clientId, $type, $typeId, $redirectUri, $scopes = array(), $accessToken = null)
+    private function _newAuthCode($clientId, $type, $typeId, $redirectUri, $scopes = array())
    {
-        $authCode = $this->generateCode();
+        $authCode = $this->_generateCode();

-        // If an access token exists then update the existing session with the 
-        // new authorisation code otherwise create a new session
-        if ($accessToken !== null) {
+        // Delete any existing sessions just to be sure
+        $this->_dbCall('deleteSession', $clientId, $type, $typeId);

-            $this->_dbCall('updateSession',
-                $clientId,
-                $type,
-                $typeId,
-                $authCode,
-                $accessToken,
-                'request'
+        // Create a new session
+        $sessionId = $this->_dbCall(
+            'newSession',
+            $clientId,
+            $redirectUri,
+            $type,
+            $typeId,
+            $authCode,
+            null,
+            null,
+            'requested'
+        );
+
+        // Add the scopes
+        foreach ($scopes as $key => $scope) {
+
+            $this->_dbCall(
+                'addSessionScope',
+                $sessionId,
+                $scope['scope']
            );
-        
-        } else {
-
-            // Delete any existing sessions just to be sure
-            $this->_dbCall('deleteSession', $clientId, $type, $typeId);
-               
-            // Create a new session     
-            $sessionId = $this->_dbCall('newSession',
-                $clientId,
-                $redirectUri,
-                $type,
-                $typeId,
-                $authCode,
-                null,
-                null,
-                'request'
-            );
-                        
-            // Add the scopes
-            foreach ($scopes as $key => $scope) {
-
-                $this->_dbCall('addSessionScope', $sessionId, $scope['scope']);
-
-            }

        }
-        
+
        return $authCode;
    }

    /**
     * Issue an access token
-     * 
+     *
     * @access public
-     * 
+     *
     * @param  array $authParams Optional array of parsed $_POST keys
-     * 
+     *
     * @return array             Authorise request parameters
     */
    public function issueAccessToken($authParams = null)
    {
-        $params = array();
-
        if ( ! isset($authParams['grant_type']) && ! isset($_POST['grant_type'])) {
-
            throw new ClientException(sprintf($this->errors['invalid_request'], 'grant_type'), 0);
+        }

-        } else {
+        $params['grant_type'] = (isset($authParams['grant_type'])) ?
+                                    $authParams['grant_type'] :
+                                    $_POST['grant_type'];

-            $params['grant_type'] = (isset($authParams['grant_type'])) ? $authParams['grant_type'] : $_POST['grant_type'];
-
-            // Ensure grant type is one that is recognised
-            if ( ! in_array($params['grant_type'], $this->_grantTypes)) {
-
-                throw new ClientException($this->errors['unsupported_grant_type'], 7);
-
-            }
+        // Ensure grant type is one that is recognised and is enabled
+        if ( ! in_array($params['grant_type'], array_keys($this->_grantTypes)) || $this->_grantTypes[$params['grant_type']] !== true) {
+            throw new ClientException(sprintf($this->errors['unsupported_grant_type'], $params['grant_type']), 7);
        }

        switch ($params['grant_type'])
        {
-            
            case 'authorization_code': // Authorization code grant
-                return $this->completeAuthCodeGrant($authParams, $params);
-                break;  
+                return $this->_completeAuthCodeGrant($authParams, $params);
+                break;

-            case 'refresh_token': // Refresh token
-            case 'password': // Resource owner password credentials grant
            case 'client_credentials': // Client credentials grant
+                return $this->_completeClientCredentialsGrant($authParams, $params);
+                break;
+
+            case 'password': // Resource owner password credentials grant
+                return $this->_completeUserCredentialsGrant($authParams, $params);
+                break;
+
+            case 'refresh_token': // Refresh token grant
+                return $this->_completeRefreshTokenGrant($authParams, $params);
+                break;
+
+            // @codeCoverageIgnoreStart
            default: // Unsupported
                throw new ServerException($this->errors['server_error'] . 'Tried to process an unsuppported grant type.', 5);
                break;
        }
+        // @codeCoverageIgnoreEnd
    }

    /**
     * Complete the authorisation code grant
-     * 
+     *
     * @access private
-     * 
+     *
     * @param  array $authParams Array of parsed $_POST keys
     * @param  array $params     Generated parameters from issueAccessToken()
-     * 
+     *
     * @return array             Authorise request parameters
     */
-    private function completeAuthCodeGrant($authParams = array(), $params = array())
+    private function _completeAuthCodeGrant($authParams = array(), $params = array())
    {
        // Client ID
        if ( ! isset($authParams['client_id']) && ! isset($_POST['client_id'])) {
-
            throw new ClientException(sprintf($this->errors['invalid_request'], 'client_id'), 0);
-
-        } else {
-
-            $params['client_id'] = (isset($authParams['client_id'])) ? $authParams['client_id'] : $_POST['client_id'];
-
        }

+        $params['client_id'] = (isset($authParams['client_id'])) ?
+                                    $authParams['client_id'] :
+                                    $_POST['client_id'];
+
        // Client secret
        if ( ! isset($authParams['client_secret']) && ! isset($_POST['client_secret'])) {
-
            throw new ClientException(sprintf($this->errors['invalid_request'], 'client_secret'), 0);
-
-        } else {
-
-            $params['client_secret'] = (isset($authParams['client_secret'])) ? $authParams['client_secret'] : $_POST['client_secret'];
-
        }

+        $params['client_secret'] = (isset($authParams['client_secret'])) ?
+                                        $authParams['client_secret'] :
+                                        $_POST['client_secret'];
+
        // Redirect URI
        if ( ! isset($authParams['redirect_uri']) && ! isset($_POST['redirect_uri'])) {
-
            throw new ClientException(sprintf($this->errors['invalid_request'], 'redirect_uri'), 0);
-
-        } else {
-
-            $params['redirect_uri'] = (isset($authParams['redirect_uri'])) ? $authParams['redirect_uri'] : $_POST['redirect_uri'];
-
        }

+        $params['redirect_uri'] = (isset($authParams['redirect_uri'])) ?
+                                        $authParams['redirect_uri'] :
+                                        $_POST['redirect_uri'];
+
        // Validate client ID and redirect URI
-        $clientDetails = $this->_dbCall('validateClient',
+        $clientDetails = $this->_dbCall(
+            'validateClient',
            $params['client_id'],
-            $params['client_secret'], 
+            $params['client_secret'],
            $params['redirect_uri']
        );

        if ($clientDetails === false) {
-
            throw new ClientException($this->errors['invalid_client'], 8);
        }

        // The authorization code
        if ( ! isset($authParams['code']) && ! isset($_POST['code'])) {
-
            throw new ClientException(sprintf($this->errors['invalid_request'], 'code'), 0);
-
-        } else {
-
-            $params['code'] = (isset($authParams['code'])) ? $authParams['code'] : $_POST['code'];
-
        }

-        // Verify the authorization code matches the client_id and the
-        //  request_uri
-        $session = $this->_dbCall('validateAuthCode',
+        $params['code'] = (isset($authParams['code'])) ?
+                                    $authParams['code'] :
+                                    $_POST['code'];
+
+        // Verify the authorization code matches the client_id and the request_uri
+        $session = $this->_dbCall(
+            'validateAuthCode',
            $params['client_id'],
            $params['redirect_uri'],
            $params['code']
        );

        if ( ! $session) {
-
            throw new ClientException(sprintf($this->errors['invalid_grant'], 'code'), 9);
-        
-        } else {
-
-            // A session ID was returned so update it with an access token,
-            //  remove the authorisation code, change the stage to 'granted'
-
-            $accessToken = $this->generateCode();
-
-            $accessTokenExpires = ($this->_config['access_token_ttl'] === null) ? null : time() + $this->_config['access_token_ttl'];
-
-            $this->_dbCall('updateSession',
-                $session['id'],
-                null,
-                $accessToken,
-                $accessTokenExpires,
-                'granted'
-            );
-
-            // Update the session's scopes to reference the access token
-            $this->_dbCall('updateSessionScopeAccessToken',
-                $session['id'],
-                $accessToken
-            );
-
-            return array(
-                'access_token'  =>  $accessToken,
-                'token_type'    =>  'bearer',
-                'expires_in'    =>  $this->_config['access_token_ttl']
-            );
        }
+
+        // A session ID was returned so update it with an access token,
+        //  remove the authorisation code, change the stage to 'granted'
+
+        $accessToken = $this->_generateCode();
+        $refreshToken = ($this->_grantTypes['refresh_token']) ?
+                            $this->_generateCode() :
+                            null;
+
+        $accessTokenExpires = time() + $this->_config['access_token_ttl'];
+        $accessTokenExpiresIn = $this->_config['access_token_ttl'];
+
+        $this->_dbCall(
+            'updateSession',
+            $session['id'],
+            null,
+            $accessToken,
+            $refreshToken,
+            $accessTokenExpires,
+            'granted'
+        );
+
+        // Update the session's scopes to reference the access token
+        $this->_dbCall(
+            'updateSessionScopeAccessToken',
+            $session['id'],
+            $accessToken,
+            $refreshToken
+        );
+
+        $response = array(
+            'access_token'  =>  $accessToken,
+            'token_type'    =>  'bearer',
+            'expires'       =>  $accessTokenExpires,
+            'expires_in'    =>  $accessTokenExpiresIn
+        );
+
+        if ($this->_grantTypes['refresh_token']) {
+            $response['refresh_token'] = $refreshToken;
+        }
+
+        return $response;
+    }
+
+    /**
+     * Complete the resource owner password credentials grant
+     *
+     * @access private
+     * @param  array $authParams Array of parsed $_POST keys
+     * @param  array $params     Generated parameters from issueAccessToken()
+     * @return array             Authorise request parameters
+     */
+    private function _completeClientCredentialsGrant($authParams = array(), $params = array())
+    {
+        // Client ID
+        if ( ! isset($authParams['client_id']) && ! isset($_POST['client_id'])) {
+            // @codeCoverageIgnoreStart
+            throw new ClientException(sprintf($this->errors['invalid_request'], 'client_id'), 0);
+            // @codeCoverageIgnoreEnd
+        }
+
+        $params['client_id'] = (isset($authParams['client_id'])) ?
+                                        $authParams['client_id'] :
+                                        $_POST['client_id'];
+
+        // Client secret
+        if ( ! isset($authParams['client_secret']) && ! isset($_POST['client_secret'])) {
+            // @codeCoverageIgnoreStart
+            throw new ClientException(sprintf($this->errors['invalid_request'], 'client_secret'), 0);
+            // @codeCoverageIgnoreEnd
+        }
+
+        $params['client_secret'] = (isset($authParams['client_secret'])) ?
+                                            $authParams['client_secret'] :
+                                            $_POST['client_secret'];
+
+        // Validate client ID and client secret
+        $clientDetails = $this->_dbCall(
+            'validateClient',
+            $params['client_id'],
+            $params['client_secret'],
+            null
+        );
+
+        if ($clientDetails === false) {
+            // @codeCoverageIgnoreStart
+            throw new ClientException($this->errors['invalid_client'], 8);
+            // @codeCoverageIgnoreEnd
+        }
+
+        // Generate an access token
+        $accessToken = $this->_generateCode();
+        $refreshToken = ($this->_grantTypes['refresh_token']) ?
+                            $this->_generateCode() :
+                            null;
+
+        $accessTokenExpires = time() + $this->_config['access_token_ttl'];
+        $accessTokenExpiresIn = $this->_config['access_token_ttl'];
+
+        // Delete any existing sessions just to be sure
+        $this->_dbCall('deleteSession', $params['client_id'], 'client', $params['client_id']);
+
+        // Create a new session
+        $this->_dbCall('newSession', $params['client_id'], null, 'client', $params['client_id'], null, $accessToken, $refreshToken, $accessTokenExpires, 'granted');
+
+        $response = array(
+            'access_token'  =>  $accessToken,
+            'token_type'    =>  'bearer',
+            'expires'       =>  $accessTokenExpires,
+            'expires_in'    =>  $accessTokenExpiresIn
+        );
+
+        if ($this->_grantTypes['refresh_token']) {
+            $response['refresh_token'] = $refreshToken;
+        }
+
+        return $response;
+    }
+
+    /**
+     * Complete the resource owner password credentials grant
+     *
+     * @access private
+     * @param  array $authParams Array of parsed $_POST keys
+     * @param  array $params     Generated parameters from issueAccessToken()
+     * @return array             Authorise request parameters
+     */
+    private function _completeUserCredentialsGrant($authParams = array(), $params = array())
+    {
+        // Client ID
+        if ( ! isset($authParams['client_id']) && ! isset($_POST['client_id'])) {
+            // @codeCoverageIgnoreStart
+            throw new ClientException(sprintf($this->errors['invalid_request'], 'client_id'), 0);
+            // @codeCoverageIgnoreEnd
+        }
+
+        $params['client_id'] = (isset($authParams['client_id'])) ?
+                                        $authParams['client_id'] :
+                                        $_POST['client_id'];
+
+        // Client secret
+        if ( ! isset($authParams['client_secret']) && ! isset($_POST['client_secret'])) {
+            // @codeCoverageIgnoreStart
+            throw new ClientException(sprintf($this->errors['invalid_request'], 'client_secret'), 0);
+            // @codeCoverageIgnoreEnd
+        }
+
+        $params['client_secret'] = (isset($authParams['client_secret'])) ?
+                                            $authParams['client_secret'] :
+                                            $_POST['client_secret'];
+
+        // Validate client ID and client secret
+        $clientDetails = $this->_dbCall(
+            'validateClient',
+            $params['client_id'],
+            $params['client_secret'],
+            null
+        );
+
+        if ($clientDetails === false) {
+            // @codeCoverageIgnoreStart
+            throw new ClientException($this->errors['invalid_client'], 8);
+            // @codeCoverageIgnoreEnd
+        }
+
+        // User's username
+        if ( ! isset($authParams['username']) && ! isset($_POST['username'])) {
+            throw new ClientException(sprintf($this->errors['invalid_request'], 'username'), 0);
+        }
+
+        $params['username'] = (isset($authParams['username'])) ?
+                                            $authParams['username'] :
+                                            $_POST['username'];
+
+        // User's password
+        if ( ! isset($authParams['password']) && ! isset($_POST['password'])) {
+            throw new ClientException(sprintf($this->errors['invalid_request'], 'password'), 0);
+        }
+
+        $params['password'] = (isset($authParams['password'])) ?
+                                            $authParams['password'] :
+                                            $_POST['password'];
+
+        // Check if user's username and password are correct
+        $userId = call_user_func($this->_grantTypeCallbacks['password'], $params['username'], $params['password']);
+
+        if ($userId === false) {
+            throw new \Oauth2\Authentication\ClientException($this->errors['invalid_credentials'], 0);
+        }
+
+        // Generate an access token
+        $accessToken = $this->_generateCode();
+        $refreshToken = ($this->_grantTypes['refresh_token']) ?
+                            $this->_generateCode() :
+                            null;
+
+        $accessTokenExpires = time() + $this->_config['access_token_ttl'];
+        $accessTokenExpiresIn = $this->_config['access_token_ttl'];
+
+        // Delete any existing sessions just to be sure
+        $this->_dbCall('deleteSession', $params['client_id'], 'user', $userId);
+
+        // Create a new session
+        $this->_dbCall('newSession', $params['client_id'], null, 'user', $userId, null, $accessToken, $refreshToken, $accessTokenExpires, 'granted');
+
+        $response = array(
+            'access_token'  =>  $accessToken,
+            'token_type'    =>  'bearer',
+            'expires'       =>  $accessTokenExpires,
+            'expires_in'    =>  $accessTokenExpiresIn
+        );
+
+        if ($this->_grantTypes['refresh_token']) {
+            $response['refresh_token'] = $refreshToken;
+        }
+
+        return $response;
+    }
+
+    /**
+     * Complete the refresh token grant
+     *
+     * @access private
+     * @param  array $authParams Array of parsed $_POST keys
+     * @param  array $params     Generated parameters from issueAccessToken()
+     * @return array             Authorise request parameters
+     */
+    private function _completeRefreshTokenGrant($authParams = array(), $params = array())
+    {
+        // Client ID
+        if ( ! isset($authParams['client_id']) && ! isset($_POST['client_id'])) {
+            // @codeCoverageIgnoreStart
+            throw new ClientException(sprintf($this->errors['invalid_request'], 'client_id'), 0);
+            // @codeCoverageIgnoreEnd
+        }
+
+        $params['client_id'] = (isset($authParams['client_id'])) ?
+                                        $authParams['client_id'] :
+                                        $_POST['client_id'];
+
+        // Client secret
+        if ( ! isset($authParams['client_secret']) && ! isset($_POST['client_secret'])) {
+            // @codeCoverageIgnoreStart
+            throw new ClientException(sprintf($this->errors['invalid_request'], 'client_secret'), 0);
+            // @codeCoverageIgnoreEnd
+        }
+
+        $params['client_secret'] = (isset($authParams['client_secret'])) ?
+                                            $authParams['client_secret'] :
+                                            $_POST['client_secret'];
+
+        // Validate client ID and client secret
+        $clientDetails = $this->_dbCall(
+            'validateClient',
+            $params['client_id'],
+            $params['client_secret'],
+            null
+        );
+
+        if ($clientDetails === false) {
+            // @codeCoverageIgnoreStart
+            throw new ClientException($this->errors['invalid_client'], 8);
+            // @codeCoverageIgnoreEnd
+        }
+
+        // Refresh token
+        if ( ! isset($authParams['refresh_token']) && ! isset($_POST['refresh_token'])) {
+            throw new ClientException(sprintf($this->errors['invalid_request'], 'refresh_token'), 0);
+        }
+
+        $params['refresh_token'] = (isset($authParams['refresh_token'])) ?
+                                        $authParams['refresh_token'] :
+                                        $_POST['refresh_token'];
+
+        // Validate refresh token
+        $sessionId = $this->_dbCall('validateRefreshToken', $params['refresh_token'], $params['client_id']);
+
+        if ($sessionId === false) {
+            throw new \Oauth2\Authentication\ClientException($this->errors['invalid_refresh'], 0);
+        }
+
+        // Generate new tokens
+        $accessToken = $this->_generateCode();
+        $refreshToken = $this->_generateCode();
+
+        $accessTokenExpires = time() + $this->_config['access_token_ttl'];
+        $accessTokenExpiresIn = $this->_config['access_token_ttl'];
+
+        // Update the tokens
+        $this->_dbCall('updateRefreshToken', $sessionId, $accessToken, $refreshToken, $accessTokenExpires);
+
+        return array(
+            'access_token'  =>  $accessToken,
+            'refresh_token' =>  $refreshToken,
+            'token_type'    =>  'bearer',
+            'expires'       =>  $accessTokenExpires,
+            'expires_in'    =>  $accessTokenExpiresIn
+        );
    }

    /**
     * Generates the redirect uri with appended params
-     * 
+     *
     * @param  string $redirectUri     The redirect URI
     * @param  array  $params          The parameters to be appended to the URL
     * @param  string $query_delimeter The query string delimiter (default: ?)
-     * 
+     *
     * @return string                  The updated redirect URI
     */
    public function redirectUri($redirectUri, $params = array(), $queryDelimeter = '?')
    {
-      
-        if (strstr($redirectUri, $queryDelimeter)) {
-
-            $redirectUri = $redirectUri . '&' . http_build_query($params);
-
-        } else {
-
-            $redirectUri = $redirectUri . $queryDelimeter . http_build_query($params);
-
-        }
-        
-        return $redirectUri;
-
+        return (strstr($redirectUri, $queryDelimeter)) ? $redirectUri . '&' . http_build_query($params) : $redirectUri . $queryDelimeter . http_build_query($params);
    }

    /**
     * Call database methods from the abstractor
-     * 
+     *
     * @return mixed The query result
     */
    private function _dbCall()
--- a/src/Oauth2/Client/IDP.php
+++ b/src/Oauth2/Client/IDP.php
@@ -0,0 +1,230 @@
+<?php
+
+namespace OAuth2\Client;
+
+use Guzzle\Service\Client as GuzzleClient;
+
+class IDPException extends \Exception
+{
+    protected $result;
+
+    public function __construct($result)
+    {
+        $this->result = $result;
+
+        $code = isset($result['code']) ? $result['code'] : 0;
+
+        if (isset($result['error'])) {
+
+            // OAuth 2.0 Draft 10 style
+            $message = $result['error'];
+
+        } elseif (isset($result['message'])) {
+
+            // cURL style
+            $message = $result['message'];
+
+        } else {
+
+            $message = 'Unknown Error.';
+
+        }
+
+        parent::__construct($message['message'], $message['code']);
+    }
+
+    public function getType()
+    {
+        if (isset($this->result['error'])) {
+
+            $message = $this->result['error'];
+
+            if (is_string($message)) {
+                // OAuth 2.0 Draft 10 style
+                return $message;
+            }
+        }
+
+        return 'Exception';
+    }
+
+    /**
+     * To make debugging easier.
+     *
+     * @returns
+     *   The string representation of the error.
+     */
+    public function __toString()
+    {
+        $str = $this->getType() . ': ';
+
+        if ($this->code != 0) {
+            $str .= $this->code . ': ';
+        }
+
+        return $str . $this->message;
+    }
+
+}
+
+abstract class IDP {
+
+    public $clientId = '';
+
+    public $clientSecret = '';
+
+    public $redirectUri = '';
+
+    public $name;
+
+    public $uidKey = 'uid';
+
+    public $scopes = array();
+
+    public $method = 'post';
+
+    public $scopeSeperator = ',';
+
+    public $responseType = 'json';
+
+    public function __construct($options)
+    {
+        foreach ($options as $option => $value) {
+            if (isset($this->{$option})) {
+                $this->{$option} = $value;
+            }
+        }
+    }
+
+    abstract public function urlAuthorize();
+
+    abstract public function urlAccessToken();
+
+    abstract public function urlUserDetails(\Oauth2\Client\Token\Access $token);
+
+    abstract public function userDetails($response, \Oauth2\Client\Token\Access $token);
+
+    public function authorize($options = array())
+    {
+        $state = md5(uniqid(rand(), TRUE));
+        setcookie($this->name.'_authorize_state', $state);
+
+        $params = array(
+            'client_id'         => $this->clientId,
+            'redirect_uri'      => $this->redirectUri,
+            'state'             => $state,
+            'scope'             => is_array($this->scope) ? implode($this->scopeSeperator, $this->scope) : $this->scope,
+            'response_type'     => isset($options['response_type']) ? $options['response_type'] : 'code',
+            'approval_prompt'   => 'force' // - google force-recheck
+        );
+
+        header('Location: ' . $this->urlAuthorize().'?'.http_build_query($params));
+        exit;
+    }
+
+    public function getAccessToken($code = NULL, $options = array())
+    {
+        if ($code === NULL) {
+            throw new \BadMethodCallException('Missing authorization code');
+        }
+
+        $params = array(
+            'client_id'     => $this->clientId,
+            'client_secret' => $this->clientSecret,
+            'grant_type'    => isset($options['grantType']) ? $options['grantType'] : 'authorization_code',
+        );
+
+        switch ($params['grant_type']) {
+
+            case 'authorization_code':
+                $params['code'] = $code;
+                $params['redirect_uri'] = isset($options['redirectUri']) ? $options['redirectUri'] : $this->redirectUri;
+            break;
+
+            case 'refresh_token':
+                $params['refresh_token'] = $code;
+            break;
+
+        }
+
+        try {
+
+            switch ($this->method) {
+
+                case 'get':
+
+                    $client = new GuzzleClient($this->urlAccessToken() . '?' . http_build_query($params));
+                    $request = $client->send();
+                    $response = $request->getBody();
+
+                    break;
+
+                case 'post':
+
+                    $client = new GuzzleClient($this->urlAccessToken());
+                    $request = $client->post(null, null, $params)->send();
+                    $response = $request->getBody();
+
+                    break;
+
+            }
+
+        }
+
+        catch (\Guzzle\Http\Exception\BadResponseException $e)
+        {
+            $raw_response = explode("\n", $e->getResponse());
+            $response = end($raw_response);
+        }
+
+        switch ($this->responseType) {
+
+            case 'json':
+                $result = json_decode($response, true);
+            break;
+
+            case 'string':
+                parse_str($response, $result);
+            break;
+
+        }
+
+        if (isset($result['error']) && ! empty($result['error'])) {
+
+            throw new \Oauth2\Client\IDPException($result);
+
+        }
+
+        switch ($params['grant_type']) {
+
+            case 'authorization_code':
+                return \Oauth2\Client\Token::factory('access', $result);
+            break;
+
+            case 'refresh_token':
+                return \Oauth2\Client\Token::factory('refresh', $result);
+            break;
+
+        }
+    }
+
+    public function getUserDetails(\Oauth2\Client\Token\Access $token)
+    {
+        $url = $this->urlUserDetails($token);
+
+        try {
+            $client = new GuzzleClient($url);
+            $request = $client->get()->send();
+            $response = $request->getBody();
+
+            return $this->userDetails(json_decode($response), $token);
+        }
+
+        catch (\Guzzle\Http\Exception\BadResponseException $e)
+        {
+            $raw_response = explode("\n", $e->getResponse());
+            throw new \Oauth2\Client\IDPException(end($raw_response));
+        }
+    }
+
+}
--- a/src/Oauth2/Client/Provider.php
+++ b/src/Oauth2/Client/Provider.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace OAuth2\Client;
+
+class Provider
+{
+	private function __constuct() {}
+
+	public static function factory($name, array $options = null)
+	{
+		if ( ! class_exists($name)) {
+
+			throw new OAuth2\Client\Exception('There is no identity provider called: '.$name);
+
+		}
+
+		return new $name($options);
+	}
+}
--- a/src/Oauth2/Client/Provider/Blooie.php
+++ b/src/Oauth2/Client/Provider/Blooie.php
@@ -0,0 +1,42 @@
+<?php
+
+class Blooie extends Oauth2\Client\IDP
+{  
+	public $scope = array('user.profile', 'user.picture');
+
+	public $method = 'POST';
+
+	public function urlAuthorize()
+	{
+		return 'https://bloo.ie/oauth';	
+	}
+
+	public function urlAccessToken()
+	{
+		return 'https://bloo.ie/oauth/access_token';
+	}
+
+	public function getUserInfo(Oauth2\Token\Access $token)
+	{
+		$url = 'https://graph.facebook.com/me?'.http_build_query(array(
+			'access_token' => $token->access_token,
+		));
+
+		$user = json_decode(file_get_contents($url));
+
+		return array(
+			'uid' => $user->id,
+			'nickname' => $user->username,
+			'name' => $user->name,
+			'first_name' => $user->first_name,
+			'last_name' => $user->last_name,
+			'email' => isset($user->email) ? $user->email : null,
+			'location' => isset($user->hometown->name) ? $user->hometown->name : null,
+			'description' => isset($user->bio) ? $user->bio : null,
+			'image' => 'https://graph.facebook.com/me/picture?type=normal&access_token='.$token->access_token,
+			'urls' => array(
+			  'Facebook' => $user->link,
+			),
+		);
+	}
+}
--- a/src/Oauth2/Client/Provider/Facebook.php
+++ b/src/Oauth2/Client/Provider/Facebook.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Facebook OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Phil Sturgeon
+ * @copyright  (c) 2012 HappyNinjas Ltd
+ * @license    http://philsturgeon.co.uk/code/dbad-license
+ */
+
+class Facebook extends Oauth2\Client\IDP
+{
+	protected $scope = array('offline_access', 'email', 'read_stream');
+
+	public function urlAuthorize()
+	{
+		return 'https://www.facebook.com/dialog/oauth';
+	}
+
+	public function urlAccessToken()
+	{
+		return 'https://graph.facebook.com/oauth/access_token';
+	}
+
+	public function getUserInfo(Oauth2\Token\Access $token)
+	{
+		$url = 'https://graph.facebook.com/me?'.http_build_query(array(
+			'access_token' => $token->access_token,
+		));
+
+		$user = json_decode(file_get_contents($url));
+
+		return array(
+			'uid' => $user->id,
+			'nickname' => isset($user->username) ? $user->username : null,
+			'name' => $user->name,
+			'first_name' => $user->first_name,
+			'last_name' => $user->last_name,
+			'email' => isset($user->email) ? $user->email : null,
+			'location' => isset($user->hometown->name) ? $user->hometown->name : null,
+			'description' => isset($user->bio) ? $user->bio : null,
+			'image' => 'https://graph.facebook.com/me/picture?type=normal&access_token='.$token->access_token,
+			'urls' => array(
+			  'Facebook' => $user->link,
+			),
+		);
+	}
+}
--- a/src/Oauth2/Client/Provider/Foursquare.php
+++ b/src/Oauth2/Client/Provider/Foursquare.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Foursquare OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Phil Sturgeon
+ * @copyright  (c) 2012 HappyNinjas Ltd
+ * @license    http://philsturgeon.co.uk/code/dbad-license
+ */
+
+class Foursquare extends Oauth2\Client\IDP
+{  
+	public $method = 'POST';
+
+	public function urlAuthorize()
+	{
+		return 'https://foursquare.com/oauth2/authenticate';
+	}
+
+	public function urlAccessToken()
+	{
+		return 'https://foursquare.com/oauth2/access_token';
+	}
+
+	public function getUserInfo(Oauth2\Token\Access $token)
+	{
+		$url = 'https://api.foursquare.com/v2/users/self?'.http_build_query(array(
+			'oauth_token' => $token->access_token,
+		));
+
+		$response = json_decode(file_get_contents($url));
+
+		$user = $response->response->user;
+
+		// Create a response from the request
+		return array(
+			'uid' => $user->id,
+			'name' => sprintf('%s %s', $user->firstName, $user->lastName),
+			'email' => $user->contact->email,
+			'image' => $user->photo,
+			'location' => $user->homeCity,
+		);
+	}
+}
--- a/src/Oauth2/Client/Provider/Github.php
+++ b/src/Oauth2/Client/Provider/Github.php
@@ -0,0 +1,43 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * GitHub OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Phil Sturgeon
+ * @copyright  (c) 2012 HappyNinjas Ltd
+ * @license    http://philsturgeon.co.uk/code/dbad-license
+ */
+
+class OAuth2_Provider_Github extends Oauth2\Client\IDP
+{
+	public function urlAuthorize()
+	{
+		return 'https://github.com/login/oauth/authorize';
+	}
+
+	public function urlAccessToken()
+	{
+		return 'https://github.com/login/oauth/access_token';
+	}
+
+	public function getUserInfo(Oauth\Token\Access $token)
+	{
+		$url = 'https://api.github.com/user?'.http_build_query(array(
+			'access_token' => $token->access_token,
+		));
+
+		$user = json_decode(file_get_contents($url));
+
+		return array(
+			'uid' => $user->id,
+			'nickname' => $user->login,
+			'name' => $user->name,
+			'email' => $user->email,
+			'urls' => array(
+			  'GitHub' => 'http://github.com/'.$user->login,
+			  'Blog' => $user->blog,
+			),
+		);
+	}
+}
--- a/src/Oauth2/Client/Provider/Google.php
+++ b/src/Oauth2/Client/Provider/Google.php
@@ -0,0 +1,84 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Google OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Phil Sturgeon
+ * @copyright  (c) 2012 HappyNinjas Ltd
+ * @license    http://philsturgeon.co.uk/code/dbad-license
+ */
+
+class OAuth2_Provider_Google extends OAuth2_Provider
+{
+	/**
+	 * @var  string  the method to use when requesting tokens
+	 */
+	public $method = 'POST';
+
+	/**
+	 * @var  string  scope separator, most use "," but some like Google are spaces
+	 */
+	public $scope_seperator = ' ';
+
+	public function url_authorize()
+	{
+		return 'https://accounts.google.com/o/oauth2/auth';
+	}
+
+	public function url_access_token()
+	{
+		return 'https://accounts.google.com/o/oauth2/token';
+	}
+
+	public function __construct(array $options = array())
+	{
+		// Now make sure we have the default scope to get user data
+		empty($options['scope']) and $options['scope'] = array(
+			'https://www.googleapis.com/auth/userinfo.profile', 
+			'https://www.googleapis.com/auth/userinfo.email'
+		);
+	
+		// Array it if its string
+		$options['scope'] = (array) $options['scope'];
+		
+		parent::__construct($options);
+	}
+
+	/*
+	* Get access to the API
+	*
+	* @param	string	The access code
+	* @return	object	Success or failure along with the response details
+	*/	
+	public function access($code, $options = array())
+	{
+		if ($code === null)
+		{
+			throw new OAuth2_Exception(array('message' => 'Expected Authorization Code from '.ucfirst($this->name).' is missing'));
+		}
+
+		return parent::access($code, $options);
+	}
+
+	public function get_user_info(OAuth2_Token_Access $token)
+	{
+		$url = 'https://www.googleapis.com/oauth2/v1/userinfo?alt=json&'.http_build_query(array(
+			'access_token' => $token->access_token,
+		));
+		
+		$user = json_decode(file_get_contents($url), true);
+		return array(
+			'uid' => $user['id'],
+			'nickname' => url_title($user['name'], '_', true),
+			'name' => $user['name'],
+			'first_name' => $user['given_name'],
+			'last_name' => $user['family_name'],
+			'email' => $user['email'],
+			'location' => null,
+			'image' => (isset($user['picture'])) ? $user['picture'] : null,
+			'description' => null,
+			'urls' => array(),
+		);
+	}
+}
--- a/src/Oauth2/Client/Provider/Instagram.php
+++ b/src/Oauth2/Client/Provider/Instagram.php
@@ -0,0 +1,48 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Instagram OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Phil Sturgeon
+ * @copyright  (c) 2012 HappyNinjas Ltd
+ * @license    http://philsturgeon.co.uk/code/dbad-license
+ */
+
+class OAuth2_Provider_Instagram extends OAuth2_Provider
+{
+	/**
+	 * @var  string  scope separator, most use "," but some like Google are spaces
+	 */
+	public $scope_seperator = '+';
+
+	/**
+	 * @var  string  the method to use when requesting tokens
+	 */
+	public $method = 'POST';
+
+	public function url_authorize()
+	{
+		return 'https://api.instagram.com/oauth/authorize';
+	}
+
+	public function url_access_token()
+	{
+		return 'https://api.instagram.com/oauth/access_token';
+	}
+
+	public function get_user_info(OAuth2_Token_Access $token)
+	{
+		$user = $token->user;
+
+		return array(
+			'uid' => $user->id,
+			'nickname' => $user->username,
+			'name' => $user->full_name,
+			'image' => $user->profile_picture,
+			'urls' => array(
+			  'website' => $user->website,
+			),
+		);
+	}
+}
--- a/src/Oauth2/Client/Provider/Mailchimp.php
+++ b/src/Oauth2/Client/Provider/Mailchimp.php
@@ -0,0 +1,36 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Mailchimp OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Phil Sturgeon
+ * @copyright  (c) 2012 HappyNinjas Ltd
+ * @license    http://philsturgeon.co.uk/code/dbad-license
+ */
+
+class OAuth2_Provider_Mailchimp extends OAuth2_Provider
+{
+	/**
+	 * @var  string  the method to use when requesting tokens
+	 */
+	protected $method = 'POST';
+
+	public function url_authorize()
+	{
+		return 'https://login.mailchimp.com/oauth2/authorize';
+	}
+
+	public function url_access_token()
+	{
+		return 'https://login.mailchimp.com/oauth2/token';
+	}
+
+	public function get_user_info(OAuth2_Token_Access $token)
+	{
+		// Create a response from the request
+		return array(
+			'uid' => $token->access_token,
+		);
+	}
+}
--- a/src/Oauth2/Client/Provider/Mailru.php
+++ b/src/Oauth2/Client/Provider/Mailru.php
@@ -0,0 +1,73 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Mailru OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Lavr Lyndin
+ */
+
+class OAuth2_Provider_Mailru extends OAuth2_Provider
+{
+	public $method = 'POST';
+
+	public function url_authorize()
+	{
+		return 'https://connect.mail.ru/oauth/authorize';
+	}
+
+	public function url_access_token()
+	{
+		return 'https://connect.mail.ru/oauth/token';
+	}
+	
+	protected function sign_server_server(array $request_params, $secret_key)
+	{
+		ksort($request_params);
+		$params = '';
+		foreach ($request_params as $key => $value) {
+			$params .= "$key=$value";
+		}
+		return md5($params . $secret_key);
+	}
+
+	public function get_user_info(OAuth2_Token_Access $token)
+	{
+		$request_params = array(
+			'app_id' => $this->client_id,
+			'method' => 'users.getInfo',
+			'uids' => $token->uid,
+			'access_token' => $token->access_token,
+			'secure' => 1
+		);
+		
+		$sig = $this->sign_server_server($request_params,$this->client_secret);
+		$url = 'http://www.appsmail.ru/platform/api?'.http_build_query($request_params).'&sig='.$sig;
+
+		$user = json_decode(file_get_contents($url));
+
+		return array(
+			'uid' => $user[0]->uid,
+			'nickname' => $user[0]->nick,
+			'name' => $user[0]->first_name.' '.$user[0]->last_name,
+			'first_name' => $user[0]->first_name,
+			'last_name' => $user[0]->last_name,
+			'email' => isset($user[0]->email) ? $user[0]->email : null,
+			'image' => isset($user[0]->pic_big) ? $user[0]->pic_big : null,
+		);
+	}
+	
+	public function authorize($options = array())
+	{
+		$state = md5(uniqid(rand(), TRUE));
+		get_instance()->session->set_userdata('state', $state);
+
+		$params = array(
+			'client_id' 		=> $this->client_id,
+			'redirect_uri' 		=> isset($options['redirect_uri']) ? $options['redirect_uri'] : $this->redirect_uri,
+			'response_type' 	=> 'code',
+		);
+
+		redirect($this->url_authorize().'?'.http_build_query($params));
+	}
+}
--- a/src/Oauth2/Client/Provider/Paypal.php
+++ b/src/Oauth2/Client/Provider/Paypal.php
@@ -0,0 +1,59 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * PayPal OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Phil Sturgeon
+ * @copyright  (c) 2012 HappyNinjas Ltd
+ * @license    http://philsturgeon.co.uk/code/dbad-license
+ */
+
+class OAuth2_Provider_Paypal extends OAuth2_Provider
+{
+    /**
+     * @var  string  default scope (useful if a scope is required for user info)
+     */
+    protected $scope = array('https://identity.x.com/xidentity/resources/profile/me');
+
+    /**
+     * @var  string  the method to use when requesting tokens
+     */
+    protected $method = 'POST';
+
+    public function url_authorize()
+    {
+        return 'https://identity.x.com/xidentity/resources/authorize';
+    }
+
+    public function url_access_token()
+    {
+        return 'https://identity.x.com/xidentity/oauthtokenservice';
+    }
+
+    public function get_user_info(OAuth2_Token_Access $token)
+    {
+        $url = 'https://identity.x.com/xidentity/resources/profile/me?' . http_build_query(array(
+            'oauth_token' => $token->access_token
+        ));
+
+        $user = json_decode(file_get_contents($url));
+		$user = $user->identity;
+
+		return array(
+            'uid' => $user['userId'],
+            'nickname' => url_title($user['fullName'], '_', true),
+            'name' => $user['fullName'],
+            'first_name' => $user['firstName'],
+            'last_name' => $user['lastName'],
+            'email' => $user['emails'][0],
+            'location' => $user->addresses[0],
+            'image' => null,
+            'description' => null,
+            'urls' => array(
+				'PayPal' => null
+			)
+        );
+    }
+
+}
--- a/src/Oauth2/Client/Provider/Soundcloud.php
+++ b/src/Oauth2/Client/Provider/Soundcloud.php
@@ -0,0 +1,51 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Soundcloud OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Phil Sturgeon
+ * @copyright  (c) 2012 HappyNinjas Ltd
+ * @license    http://philsturgeon.co.uk/code/dbad-license
+ */
+
+class OAuth2_Provider_Soundcloud extends OAuth2_Provider
+{	
+	/**
+	 * @var  string  the method to use when requesting tokens
+	 */
+	protected $method = 'POST';
+
+	public function url_authorize()
+	{
+		return 'https://soundcloud.com/connect';
+	}
+
+	public function url_access_token()
+	{
+		return 'https://api.soundcloud.com/oauth2/token';
+	}
+
+	public function get_user_info(OAuth2_Token_Access $token)
+	{
+		$url = 'https://api.soundcloud.com/me.json?'.http_build_query(array(
+			'oauth_token' => $token->access_token,
+		));
+
+		$user = json_decode(file_get_contents($url));
+
+		// Create a response from the request
+		return array(
+			'uid' => $user->id,
+			'nickname' => $user->username,
+			'name' => $user->full_name,
+			'location' => $user->country.' ,'.$user->country,
+			'description' => $user->description,
+			'image' => $user->avatar_url,
+			'urls' => array(
+				'MySpace' => $user->myspace_name,
+				'Website' => $user->website,
+			),
+		);
+	}
+}
--- a/src/Oauth2/Client/Provider/Vkontakte.php
+++ b/src/Oauth2/Client/Provider/Vkontakte.php
@@ -0,0 +1,54 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Vkontakte OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Lavr Lyndin
+ */
+
+class OAuth2_Provider_Vkontakte extends OAuth2_Provider
+{
+	protected $method = 'POST';
+	public $uid_key = 'user_id';
+
+	public function url_authorize()
+	{
+		return 'http://oauth.vk.com/authorize';
+	}
+
+	public function url_access_token()
+	{
+		return 'https://oauth.vk.com/access_token';
+	}
+
+	public function get_user_info(OAuth2_Token_Access $token)
+	{
+		$scope = array('nickname', 'screen_name','photo_big');
+		$url = 'https://api.vk.com/method/users.get?'.http_build_query(array(
+			'uids' => $token->uid,
+			'fields' => implode(",",$scope),
+			'access_token' => $token->access_token,
+		));
+
+		$user = json_decode(file_get_contents($url))->response;
+
+		if(sizeof($user)==0)
+			return null;
+		else
+			$user = $user[0];
+
+		return array(
+			'uid' => $user->uid,
+			'nickname' => isset($user->nickname) ? $user->nickname : null,
+			'name' => isset($user->name) ? $user->name : null,
+			'first_name' => isset($user->first_name) ? $user->first_name : null,
+			'last_name' => isset($user->last_name) ? $user->last_name : null,
+			'email' => null,
+			'location' => null,
+			'description' => null,
+			'image' => isset($user->photo_big) ? $user->photo_big : null,
+			'urls' => array(),
+		);
+	}
+}
--- a/src/Oauth2/Client/Provider/Windowslive.php
+++ b/src/Oauth2/Client/Provider/Windowslive.php
@@ -0,0 +1,60 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Windows Live OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Phil Sturgeon
+ * @copyright  (c) 2012 HappyNinjas Ltd
+ * @license    http://philsturgeon.co.uk/code/dbad-license
+ */
+
+class OAuth2_Provider_Windowslive extends OAuth2_Provider
+{	
+	protected $scope = array('wl.basic', 'wl.emails');
+	
+	/**
+	 * @var  string  the method to use when requesting tokens
+	 */
+	protected $method = 'POST';
+	
+	// authorise url
+	public function url_authorize()
+	{
+		return 'https://oauth.live.com/authorize';
+	}
+	
+	// access token url
+	public function url_access_token()
+	{
+		return 'https://oauth.live.com/token';
+	}
+	
+	// get basic user information
+	/********************************
+	** this can be extended through the 
+	** use of scopes, check out the document at
+	** http://msdn.microsoft.com/en-gb/library/hh243648.aspx#user
+	*********************************/
+	public function get_user_info(OAuth2_Token_Access $token)
+	{
+		// define the get user information token
+		$url = 'https://apis.live.net/v5.0/me?'.http_build_query(array(
+			'access_token' => $token->access_token,
+		));
+		
+		// perform network request
+		$user = json_decode(file_get_contents($url));
+
+		// create a response from the request and return it
+		return array(
+			'uid' 		=> $user->id,
+			'name' 		=> $user->name,
+			'nickname' 	=> url_title($user->name, '_', true),
+//			'location' 	=> $user[''], # scope wl.postal_addresses is required
+										  # but won't be implemented by default
+			'locale' 	=> $user->locale,
+			'urls' 		=> array('Windows Live' => $user->link),
+		);
+	}
+}
--- a/src/Oauth2/Client/Provider/Yandex.php
+++ b/src/Oauth2/Client/Provider/Yandex.php
@@ -0,0 +1,115 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Yandex OAuth2 Provider
+ *
+ * @package    CodeIgniter/OAuth2
+ * @category   Provider
+ * @author     Lavr Lyndin
+ */
+
+class OAuth2_Provider_Yandex extends OAuth2_Provider
+{
+	public $method = 'POST';
+	
+	public function url_authorize()
+	{
+		return 'https://oauth.yandex.ru/authorize';
+	}
+
+	public function url_access_token()
+	{
+		return 'https://oauth.yandex.ru/token';
+	}
+
+	public function get_user_info(OAuth2_Token_Access $token)
+	{
+		$opts = array(
+			'http' => array(
+				'method' => 'GET',
+				'header' => 'Authorization: OAuth '.$token->access_token
+			)
+		);
+		$_default_opts = stream_context_get_params(stream_context_get_default());
+		
+		$opts = array_merge_recursive($_default_opts['options'], $opts);
+		$context = stream_context_create($opts);
+		$url = 'http://api-yaru.yandex.ru/me/?format=json';
+
+		$user = json_decode(file_get_contents($url,false,$context));
+
+		preg_match("/\d+$/",$user->id,$uid);
+		
+		return array(
+			'uid' => $uid[0],
+			'nickname' => isset($user->name) ? $user->name : null,
+			'name' => isset($user->name) ? $user->name : null,
+			'first_name' => isset($user->first_name) ? $user->first_name : null,
+			'last_name' => isset($user->last_name) ? $user->last_name : null,
+			'email' => isset($user->email) ? $user->email : null,
+			'location' => isset($user->hometown->name) ? $user->hometown->name : null,
+			'description' => isset($user->bio) ? $user->bio : null,
+			'image' => $user->links->userpic,
+		);
+	}
+	
+	public function access($code, $options = array())
+	{
+		$params = array(
+			'client_id' 	=> $this->client_id,
+			'client_secret' => $this->client_secret,
+			'grant_type' 	=> isset($options['grant_type']) ? $options['grant_type'] : 'authorization_code',
+		);
+
+		switch ($params['grant_type'])
+		{
+			case 'authorization_code':
+				$params['code'] = $code;
+				$params['redirect_uri'] = isset($options['redirect_uri']) ? $options['redirect_uri'] : $this->redirect_uri;
+			break;
+
+			case 'refresh_token':
+				$params['refresh_token'] = $code;
+			break;
+		}
+
+		$response = null;	
+		$url = $this->url_access_token();
+
+		$curl = curl_init($url);
+
+		$headers[] = 'Content-Type: application/x-www-form-urlencoded; charset=UTF-8;';
+		curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+
+//		curl_setopt($curl, CURLOPT_USERAGENT, 'yamolib-php');
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 30);
+		curl_setopt($curl, CURLOPT_TIMEOUT, 80);
+		curl_setopt($curl, CURLOPT_POST, true);
+		curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($params));
+		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+		//        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
+		//        curl_setopt($curl, CURLOPT_CAINFO, dirname(__FILE__) . '/../data/ca-certificate.crt');
+
+		$response = curl_exec($curl);
+		curl_close($curl);
+
+		$return = json_decode($response, true);
+
+		if ( ! empty($return['error']))
+		{
+			throw new OAuth2_Exception($return);
+		}
+
+		switch ($params['grant_type'])
+		{
+			case 'authorization_code':
+				return OAuth2_Token::factory('access', $return);
+			break;
+
+			case 'refresh_token':
+				return OAuth2_Token::factory('refresh', $return);
+			break;
+		}
+	}
+
+}
--- a/src/Oauth2/Client/Token.php
+++ b/src/Oauth2/Client/Token.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Oauth2\Client;
+
+abstract class Token
+{
+
+	/**
+	 * Create a new token object.
+	 *
+	 * @param   string  token type
+	 * @param   array   token options
+	 * @return  Token
+	 */
+	public static function factory($name = 'access', array $options = null)
+	{
+		include_once 'Token/'.ucfirst(strtolower($name)).'.php';
+
+		$class = 'Oauth2\Client\Token\\'.ucfirst($name);
+
+		return new $class($options);
+	}
+
+	/**
+	 * Return the value of any protected class variable.
+	 *
+	 * @param   string  variable name
+	 * @return  mixed
+	 */
+	public function __get($key)
+	{
+		return $this->$key;
+	}
+
+	/**
+	 * Return a boolean if the property is set
+	 *
+	 * @param   string  variable name
+	 * @return  bool
+	 */
+	public function __isset($key)
+	{
+		return isset($this->$key);
+	}
+
+} // End Token
--- a/src/Oauth2/Client/Token/Access.php
+++ b/src/Oauth2/Client/Token/Access.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Oauth2\Client\Token;
+
+/**
+ * OAuth2 Token
+ *
+ * @package    OAuth2
+ * @category   Token
+ * @author     Phil Sturgeon
+ * @copyright  (c) 2011 HappyNinjas Ltd
+ */
+
+class Access extends \Oauth2\Client\Token
+{
+	/**
+	 * @var  string  accessToken
+	 */
+	protected $accessToken;
+
+	/**
+	 * @var  int  expires
+	 */
+	protected $expires;
+
+	/**
+	 * @var  string  refreshToken
+	 */
+	protected $refreshToken;
+
+	/**
+	 * @var  string  uid
+	 */
+	protected $uid;
+
+	/**
+	 * Sets the token, expiry, etc values.
+	 *
+	 * @param   array   token options
+	 * @return  void
+	 */
+	public function __construct(array $options = null)
+	{
+		if ( ! isset($options['access_token'])) {
+			throw new \BadMethodCallException('Required option not passed: access_token'.PHP_EOL.print_r($options, true));
+		}
+
+		$this->accessToken = $options['access_token'];
+
+		// Some providers (not many) give the uid here, so lets take it
+		isset($options['uid']) and $this->uid = $options['uid'];
+
+		//Vkontakte uses user_id instead of uid
+		isset($options['user_id']) and $this->uid = $options['user_id'];
+
+		//Mailru uses x_mailru_vid instead of uid
+		isset($options['x_mailru_vid']) and $this->uid = $options['x_mailru_vid'];
+
+		// We need to know when the token expires, add num. seconds to current time
+		isset($options['expires_in']) and $this->expires = time() + ((int) $options['expires_in']);
+
+		// Facebook is just being a spec ignoring jerk
+		isset($options['expires']) and $this->expires = time() + ((int) $options['expires']);
+
+		// Grab a refresh token so we can update access tokens when they expires
+		isset($options['refresh_token']) and $this->refreshToken = $options['refresh_token'];
+	}
+
+	/**
+	 * Returns the token key.
+	 *
+	 * @return  string
+	 */
+	public function __toString()
+	{
+		return (string) $this->accessToken;
+	}
+
+}
--- a/src/Oauth2/Client/Token/Authorize.php
+++ b/src/Oauth2/Client/Token/Authorize.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * OAuth2 Token
+ *
+ * @package    OAuth2
+ * @category   Token
+ * @author     Phil Sturgeon
+ * @copyright  (c) 2011 HappyNinjas Ltd
+ */
+
+class Authorize extends \Oauth2\Client\Token
+{
+	/**
+	 * @var  string  code
+	 */
+	protected $code;
+
+	/**
+	 * @var  string  redirect_uri
+	 */
+	protected $redirectUri;
+
+	/**
+	 * Sets the token, expiry, etc values.
+	 *
+	 * @param   array   token options
+	 * @return  void
+	 */
+	public function __construct(array $options)
+	{
+		if ( ! isset($options['code'])) {
+
+            throw new Exception('Required option not passed: code');
+
+        } elseif ( ! isset($options['redirect_uri'])) {
+
+            throw new Exception('Required option not passed: redirect_uri');
+
+        }
+
+		$this->code = $options['code'];
+		$this->redirectUri = $options['redirect_uri'];
+	}
+
+	/**
+	 * Returns the token key.
+	 *
+	 * @return  string
+	 */
+	public function __toString()
+	{
+		return (string) $this->code;
+	}
+
+}
--- a/src/Oauth2/Resource/Database.php
+++ b/src/Oauth2/Resource/Database.php
@@ -6,17 +6,17 @@ interface Database
 {
    /**
     * Validate an access token and return the session details.
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
     * SELECT id, owner_type, owner_id FROM oauth_sessions WHERE access_token =
     *  $accessToken AND stage = 'granted' AND
     *  access_token_expires > UNIX_TIMESTAMP(now())
     * </code>
-     * 
+     *
     * Response:
-     * 
+     *
     * <code>
     * Array
     * (
@@ -25,7 +25,7 @@ interface Database
     *     [owner_id] => (string) The session owner's ID
     * )
     * </code>
-     * 
+     *
     * @param  string     $accessToken The access token
     * @return array|bool              Return an array on success or false on failure
     */
@@ -33,16 +33,16 @@ interface Database

    /**
     * Returns the scopes that the session is authorised with.
-     * 
+     *
     * Database query:
-     * 
+     *
     * <code>
-     * SELECT scope FROM oauth_session_scopes WHERE access_token =
-     *  '291dca1c74900f5f252de351e0105aa3fc91b90b'
+     * SELECT scope FROM oauth_session_scopes WHERE session_id =
+     *  $sessionId
     * </code>
-     * 
+     *
     * Response:
-     * 
+     *
     * <code>
     * Array
     * (
@@ -51,7 +51,7 @@ interface Database
     *      ...
     * )
     * </code>
-     * 
+     *
     * @param  int   $sessionId The session ID
     * @return array            A list of scopes
     */
--- a/src/Oauth2/Resource/Server.php
+++ b/src/Oauth2/Resource/Server.php
@@ -54,9 +54,9 @@ class Server

    /**
     * Error codes.
-     * 
+     *
     * To provide i8ln errors just overwrite the keys
-     * 
+     *
     * @var array
     */
    public $errors = array(
@@ -68,14 +68,14 @@ class Server

    /**
     * Constructor
-     * 
+     *
     * @access public
     * @return void
     */
    public function __construct($options = null)
    {
        if ($options !== null) {
-            $this->config = array_merge($this->config, $options);
+            $this->_config = array_merge($this->_config, $options);
        }
    }

@@ -92,7 +92,7 @@ class Server
            if ($this->_type === strtolower(substr($method, 2))) {
                return $this->_typeId;
            }
-            
+
            return false;
        }

@@ -101,7 +101,7 @@ class Server

    /**
     * Register a database abstrator class
-     * 
+     *
     * @access public
     * @param  object $db A class that implements OAuth2ServerDatabase
     * @return void
@@ -110,10 +110,10 @@ class Server
    {
        $this->_db = $db;
    }
-    
+
    /**
     * Init function
-     * 
+     *
     * @access public
     * @return void
     */
@@ -121,18 +121,23 @@ class Server
    {
        $accessToken = null;

-        
-        $_SERVER['REQUEST_METHOD'] = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
+        $_SERVER['REQUEST_METHOD'] = isset($_SERVER['REQUEST_METHOD']) ?
+                                                $_SERVER['REQUEST_METHOD'] :
+                                                null;

        // Try and get the access token via an access_token or oauth_token parameter
        switch ($_SERVER['REQUEST_METHOD'])
-        {           
+        {
            case 'POST':
-                $accessToken = isset($_POST[$this->_config['token_key']]) ? $_POST[$this->_config['token_key']] : null;
+                $accessToken = isset($_POST[$this->_config['token_key']]) ?
+                                        $_POST[$this->_config['token_key']] :
+                                        null;
                break;

            default:
-            $accessToken = isset($_GET[$this->_config['token_key']]) ? $_GET[$this->_config['token_key']] : null;
+            $accessToken = isset($_GET[$this->_config['token_key']]) ?
+                                        $_GET[$this->_config['token_key']] :
+                                        null;
                break;
        }

@@ -140,17 +145,17 @@ class Server
        if (function_exists('getallheaders')) {

            $headers = getallheaders();
-            
+
            if (isset($headers['Authorization'])) {

-                $rawToken = trim(str_replace('Bearer', '', $headers['Authorization']));
+                $rawToken = base64_decode(str_replace('Bearer ', '', trim($headers['Authorization'])));

                if ( ! empty($rawToken)) {
-                    $accessToken = base64_decode($rawToken);
+                    $accessToken = $rawToken;
                }
            }
        }
-        
+
        if ($accessToken) {

            $result = $this->_dbCall('validateAccessToken', $accessToken);
@@ -161,7 +166,8 @@ class Server

            } else {

-                if ( ! array_key_exists('id', $result) || ! array_key_exists('owner_id', $result) || 
+                if ( ! array_key_exists('id', $result) ||
+                     ! array_key_exists('owner_id', $result) ||
                     ! array_key_exists('owner_type', $result)) {
                    throw new ServerException($this->errors['missing_access_token_details']);
                }
@@ -187,12 +193,12 @@ class Server

        }
    }
-    
+
    /**
     * Test if the access token has a specific scope
-     * 
+     *
     * @param mixed $scopes Scope(s) to check
-     * 
+     *
     * @access public
     * @return string|bool
     */
@@ -203,7 +209,7 @@ class Server
            if (in_array($scopes, $this->_scopes)) {
                return true;
            }
-            
+
            return false;

        } elseif (is_array($scopes)) {
@@ -215,16 +221,16 @@ class Server
                }

            }
-            
+
            return true;
        }
-        
+
        return false;
    }

    /**
     * Call database methods from the abstractor
-     * 
+     *
     * @return mixed The query result
     */
    private function _dbCall()
@@ -244,4 +250,4 @@ class Server

        return call_user_func_array(array($this->_db, $method), $params);
    }
-}
+}
--- a/1
+++ b/1
@@ -1 +0,0 @@
-vendor/bin/phpunit --coverage-text --configuration build/phpunit.xml
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -0,0 +1,6 @@
+<?php
+
+if ( ! @include_once __DIR__ . '/../vendor/autoload.php')
+{
+    exit("You must set up the project dependencies, run the following commands:\n> wget http://getcomposer.org/composer.phar\n> php composer.phar install\n");
+}
--- a/tests/authentication/database_mock.php
+++ b/tests/authentication/database_mock.php
@@ -4,188 +4,165 @@ use Oauth2\Authentication\Database;

 class OAuthdb implements Database
 {
-	private $sessions = array();
-	private $sessions_client_type_id = array();
-	private $sessions_code = array();
-	private $session_scopes = array();
+    private $sessions = array();
+    private $sessions_client_type_id = array();
+    private $sessions_code = array();
+    private $session_scopes = array();

-	private $clients = array(0 => array(
-		'client_id'	=>	'test',
-		'client_secret'	=>	'test',
-		'redirect_uri'	=>	'http://example.com/test',
-		'name'	=>	'Test Client'
-	));
+    private $clients = array(0 => array(
+        'client_id' =>  'test',
+        'client_secret' =>  'test',
+        'redirect_uri'  =>  'http://example.com/test',
+        'name'  =>  'Test Client'
+    ));

-	private $scopes = array('test' => array(
-		'id'	=>	1,
-		'scope'	=>	'test',
-		'name'	=>	'test',
-		'description'	=>	'test'
-	));
+    private $scopes = array('test' => array(
+        'id'    =>  1,
+        'scope' =>  'test',
+        'name'  =>  'test',
+        'description'   =>  'test'
+    ));

-	public function validateClient(
-        $clientId,
-        $clientSecret = null,
-        $redirectUri = null
-    )
+    public function validateClient($clientId, $clientSecret = null, $redirectUri = null)
    {
-    	if ($clientId !== $this->clients[0]['client_id'])
-    	{
-    		return false;
-    	}
+        if ($clientId !== $this->clients[0]['client_id']) {
+            return false;
+        }

-    	if ($clientSecret !== null && $clientSecret !== $this->clients[0]['client_secret'])
-    	{
-    		return false;
-    	}
+        if ($clientSecret !== null && $clientSecret !== $this->clients[0]['client_secret']) {
+            return false;
+        }

-    	if ($redirectUri !== null && $redirectUri !== $this->clients[0]['redirect_uri'])
-    	{
-    		return false;
-    	}
+        if ($redirectUri !== null && $redirectUri !== $this->clients[0]['redirect_uri']) {
+            return false;
+        }

-    	return $this->clients[0];
+        return $this->clients[0];
    }

-    public function newSession(
-        $clientId,
-        $redirectUri,
-        $type = 'user',
-        $typeId = null,
-        $authCode = null,
-        $accessToken = null,
-        $accessTokenExpire = null,
-        $stage = 'requested'
-    )
+    public function newSession($clientId, $redirectUri, $type = 'user', $typeId = null, $authCode = null, $accessToken = null, $refreshToken = null, $accessTokenExpire = null, $stage = 'requested')
    {
-    	$id = count($this->sessions);
+        $id = count($this->sessions);

-    	$this->sessions[$id] = array(
-    		'id'	=>	$id,
-    		'client_id'	=>	$clientId,
-    		'redirect_uri'	=>	$redirectUri,
-    		'owner_type'	=>	$type,
-    		'owner_id'	=>	$typeId,
-    		'auth_code'	=>	$authCode,
-    		'access_token'	=>	$accessToken,
-    		'access_token_expire'	=>	$accessTokenExpire,
-    		'stage'	=>	$stage
-    	);
+        $this->sessions[$id] = array(
+            'id'    =>  $id,
+            'client_id' =>  $clientId,
+            'redirect_uri'  =>  $redirectUri,
+            'owner_type'    =>  $type,
+            'owner_id'  =>  $typeId,
+            'auth_code' =>  $authCode,
+            'access_token'  =>  $accessToken,
+            'refresh_token' =>  $refreshToken,
+            'access_token_expire'   =>  $accessTokenExpire,
+            'stage' =>  $stage
+        );

-    	$this->sessions_client_type_id[$clientId . ':' . $type . ':' . $typeId] = $id;
-    	$this->sessions_code[$clientId . ':' . $redirectUri . ':' . $authCode] = $id;
+        $this->sessions_client_type_id[$clientId . ':' . $type . ':' . $typeId] = $id;
+        $this->sessions_code[$clientId . ':' . $redirectUri . ':' . $authCode] = $id;

-    	return true;
+        return $id;
    }

-    public function updateSession(
-        $sessionId,
-        $authCode = null,
-        $accessToken = null,
-        $accessTokenExpire = null,
-        $stage = 'requested'
-    )
+    public function updateSession($sessionId, $authCode = null, $accessToken = null, $refreshToken = null, $accessTokenExpire = null, $stage = 'requested')
    {
-    	$this->sessions[$sessionId]['auth_code'] = $authCode;
-    	$this->sessions[$sessionId]['access_token'] = $accessToken;
-    	$this->sessions[$sessionId]['access_token_expire'] = $accessTokenExpire;
-    	$this->sessions[$sessionId]['stage'] = $stage;
+        $this->sessions[$sessionId]['auth_code'] = $authCode;
+        $this->sessions[$sessionId]['access_token'] = $accessToken;
+        $this->sessions[$sessionId]['refresh_token'] = $refreshToken;
+        $this->sessions[$sessionId]['access_token_expire'] = $accessTokenExpire;
+        $this->sessions[$sessionId]['stage'] = $stage;

-    	return true;
+        return true;
    }

-    public function deleteSession(
-        $clientId,
-        $type,
-        $typeId
-    )
+    public function deleteSession($clientId, $type, $typeId)
    {
-    	$key = $clientId . ':' . $type . ':' . $typeId;
-    	if (isset($this->sessions_client_type_id[$key]))
-    	{
-    		unset($this->sessions[$this->sessions_client_type_id[$key]]);
-    	}
-    	return true;
+        $key = $clientId . ':' . $type . ':' . $typeId;
+        if (isset($this->sessions_client_type_id[$key])) {
+            unset($this->sessions[$this->sessions_client_type_id[$key]]);
+        }
+        return true;
    }

-    public function validateAuthCode(
-        $clientId,
-        $redirectUri,
-        $authCode
-    )
+    public function refreshToken($currentRefreshToken, $newAccessToken, $newRefreshToken, $accessTokenExpires)
    {
-    	$key = $clientId . ':' . $redirectUri . ':' . $authCode;
-
-    	if (isset($this->sessions_code[$key]))
-    	{
-    		return $this->sessions[$this->sessions_code[$key]];
-    	}
-
-    	return false;
+        die('not implemented refreshToken');
    }

-    public function hasSession(
-        $type,
-        $typeId,
-        $clientId
-    )
+    public function validateAuthCode($clientId, $redirectUri, $authCode)
    {
-    	die('not implemented hasSession');
+        $key = $clientId . ':' . $redirectUri . ':' . $authCode;
+
+        if (isset($this->sessions_code[$key])) {
+            return $this->sessions[$this->sessions_code[$key]];
+        }
+
+        return false;
+    }
+
+    public function hasSession($type, $typeId, $clientId)
+    {
+        die('not implemented hasSession');
    }

    public function getAccessToken($sessionId)
    {
-    	die('not implemented getAccessToken');
+        die('not implemented getAccessToken');
    }

    public function removeAuthCode($sessionId)
    {
-    	die('not implemented removeAuthCode');
+        die('not implemented removeAuthCode');
    }

-    public function setAccessToken(
-        $sessionId,
-        $accessToken
-    )
+    public function setAccessToken($sessionId, $accessToken)
    {
-    	die('not implemented setAccessToken');
+        die('not implemented setAccessToken');
    }

-    public function addSessionScope(
-        $sessionId,
-        $scope
-    )
+    public function addSessionScope($sessionId, $scope)
    {
-    	if ( ! isset($this->session_scopes[$sessionId]))
-    	{
-    		$this->session_scopes[$sessionId] = array();
-    	}
+        if ( ! isset($this->session_scopes[$sessionId])) {
+            $this->session_scopes[$sessionId] = array();
+        }

-    	$this->session_scopes[$sessionId][] = $scope;
+        $this->session_scopes[$sessionId][] = $scope;

-    	return true;
+        return true;
    }

    public function getScope($scope)
    {
-    	if ( ! isset($this->scopes[$scope]))
-    	{
-    		return false;
-    	}
+        if ( ! isset($this->scopes[$scope])) {
+            return false;
+        }

-    	return $this->scopes[$scope];
+        return $this->scopes[$scope];
    }

-    public function updateSessionScopeAccessToken(
-        $sessionId,
-        $accessToken
-    )
+    public function updateSessionScopeAccessToken($sessionId, $accessToken)
    {
-    	return true;
+        return true;
    }

    public function accessTokenScopes($accessToken)
    {
-    	die('not implemented accessTokenScopes');
+        die('not implemented accessTokenScopes');
+    }
+
+    public function validateRefreshToken($refreshToken, $clientId)
+    {
+        if ($refreshToken !== $this->sessions[0]['refresh_token'])
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function updateRefreshToken($sessionId, $newAccessToken, $newRefreshToken, $accessTokenExpires)
+    {
+        $this->sessions[$sessionId]['access_token'] = $newAccessToken;
+        $this->sessions[$sessionId]['refresh_token'] = $newRefreshToken;
+        $this->sessions[$sessionId]['access_token_expire'] = $accessTokenExpires;
    }
 }
--- a/tests/authentication/server_test.php
+++ b/tests/authentication/server_test.php
--- a/tests/resource/server_test.php
+++ b/tests/resource/server_test.php
@@ -2,120 +2,120 @@

 class Resource_Server_test extends PHPUnit_Framework_TestCase {

-	function setUp()
-	{
-		require_once('database_mock.php');
-		$this->server = new Oauth2\Resource\Server();
-		$this->db = new ResourceDB();
+    function setUp()
+    {
+        require_once('database_mock.php');
+        $this->server = new Oauth2\Resource\Server();
+        $this->db = new ResourceDB();

-		$this->assertInstanceOf('Oauth2\Resource\Database', $this->db);
-		$this->server->registerDbAbstractor($this->db);
-	}
+        $this->assertInstanceOf('Oauth2\Resource\Database', $this->db);
+        $this->server->registerDbAbstractor($this->db);
+    }

-	function test_init_POST()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-		$_POST['oauth_token'] = 'test12345';
+    function test_init_POST()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST['oauth_token'] = 'test12345';

-		$this->server->init();
+        $this->server->init();

-		$reflector = new ReflectionClass($this->server);
+        $reflector = new ReflectionClass($this->server);

-		$_accessToken = $reflector->getProperty('_accessToken');
-		$_accessToken->setAccessible(true);
+        $_accessToken = $reflector->getProperty('_accessToken');
+        $_accessToken->setAccessible(true);

-		$_type = $reflector->getProperty('_type');
-		$_type->setAccessible(true);
+        $_type = $reflector->getProperty('_type');
+        $_type->setAccessible(true);

-		$_typeId = $reflector->getProperty('_typeId');
-		$_typeId->setAccessible(true);
+        $_typeId = $reflector->getProperty('_typeId');
+        $_typeId->setAccessible(true);

-		$_scopes = $reflector->getProperty('_scopes');
-		$_scopes->setAccessible(true);
+        $_scopes = $reflector->getProperty('_scopes');
+        $_scopes->setAccessible(true);

-		$this->assertEquals($_accessToken->getValue($this->server), $_POST['oauth_token']);
-		$this->assertEquals($_type->getValue($this->server), 'user');
-		$this->assertEquals($_typeId->getValue($this->server), 123);
-		$this->assertEquals($_scopes->getValue($this->server), array('foo', 'bar'));
-	}
+        $this->assertEquals($_accessToken->getValue($this->server), $_POST['oauth_token']);
+        $this->assertEquals($_type->getValue($this->server), 'user');
+        $this->assertEquals($_typeId->getValue($this->server), 123);
+        $this->assertEquals($_scopes->getValue($this->server), array('foo', 'bar'));
+    }

-	function test_init_GET()
-	{
-		$_GET['oauth_token'] = 'test12345';
+    function test_init_GET()
+    {
+        $_GET['oauth_token'] = 'test12345';

-		$this->server->init();
+        $this->server->init();

-		$reflector = new ReflectionClass($this->server);
+        $reflector = new ReflectionClass($this->server);

-		$_accessToken = $reflector->getProperty('_accessToken');
-		$_accessToken->setAccessible(true);
+        $_accessToken = $reflector->getProperty('_accessToken');
+        $_accessToken->setAccessible(true);

-		$_type = $reflector->getProperty('_type');
-		$_type->setAccessible(true);
+        $_type = $reflector->getProperty('_type');
+        $_type->setAccessible(true);

-		$_typeId = $reflector->getProperty('_typeId');
-		$_typeId->setAccessible(true);
+        $_typeId = $reflector->getProperty('_typeId');
+        $_typeId->setAccessible(true);

-		$_scopes = $reflector->getProperty('_scopes');
-		$_scopes->setAccessible(true);
+        $_scopes = $reflector->getProperty('_scopes');
+        $_scopes->setAccessible(true);

-		$this->assertEquals($_accessToken->getValue($this->server), $_GET['oauth_token']);
-		$this->assertEquals($_type->getValue($this->server), 'user');
-		$this->assertEquals($_typeId->getValue($this->server), 123);
-		$this->assertEquals($_scopes->getValue($this->server), array('foo', 'bar'));
-	}
+        $this->assertEquals($_accessToken->getValue($this->server), $_GET['oauth_token']);
+        $this->assertEquals($_type->getValue($this->server), 'user');
+        $this->assertEquals($_typeId->getValue($this->server), 123);
+        $this->assertEquals($_scopes->getValue($this->server), array('foo', 'bar'));
+    }

-	function test_init_header()
-	{
-		// Test with authorisation header
-		$this->markTestIncomplete('Authorisation header test has not been implemented yet.');
-	}
+    function test_init_header()
+    {
+        // Test with authorisation header
+        $this->markTestIncomplete('Authorisation header test has not been implemented yet.');
+    }

-	/**
-	 * @expectedException        \Oauth2\Resource\ClientException
-	 * @expectedExceptionMessage An access token was not presented with the request
-	 */
-	function test_init_missingToken()
-	{
-		$this->server->init();
-	}
+    /**
+     * @expectedException        \Oauth2\Resource\ClientException
+     * @expectedExceptionMessage An access token was not presented with the request
+     */
+    function test_init_missingToken()
+    {
+        $this->server->init();
+    }

-	/**
-	 * @expectedException        \Oauth2\Resource\ClientException
-	 * @expectedExceptionMessage The access token is not registered with the resource server
-	 */
-	function test_init_wrongToken()
-	{
-		$_POST['oauth_token'] = 'blah';
-		$_SERVER['REQUEST_METHOD'] = 'POST';
+    /**
+     * @expectedException        \Oauth2\Resource\ClientException
+     * @expectedExceptionMessage The access token is not registered with the resource server
+     */
+    function test_init_wrongToken()
+    {
+        $_POST['oauth_token'] = 'blah';
+        $_SERVER['REQUEST_METHOD'] = 'POST';

-		$this->server->init();
-	}
+        $this->server->init();
+    }

-	function test_hasScope()
-	{
-		$_POST['oauth_token'] = 'test12345';
-		$_SERVER['REQUEST_METHOD'] = 'POST';
+    function test_hasScope()
+    {
+        $_POST['oauth_token'] = 'test12345';
+        $_SERVER['REQUEST_METHOD'] = 'POST';

-		$this->server->init();
+        $this->server->init();

-		$this->assertEquals(true, $this->server->hasScope('foo'));
-		$this->assertEquals(true, $this->server->hasScope('bar'));
-		$this->assertEquals(true, $this->server->hasScope(array('foo', 'bar')));
+        $this->assertEquals(true, $this->server->hasScope('foo'));
+        $this->assertEquals(true, $this->server->hasScope('bar'));
+        $this->assertEquals(true, $this->server->hasScope(array('foo', 'bar')));

-		$this->assertEquals(false, $this->server->hasScope('foobar'));
-		$this->assertEquals(false, $this->server->hasScope(array('foobar')));
-	}
+        $this->assertEquals(false, $this->server->hasScope('foobar'));
+        $this->assertEquals(false, $this->server->hasScope(array('foobar')));
+    }

-	function test___call()
-	{
-		$_POST['oauth_token'] = 'test12345';
-		$_SERVER['REQUEST_METHOD'] = 'POST';
+    function test___call()
+    {
+        $_POST['oauth_token'] = 'test12345';
+        $_SERVER['REQUEST_METHOD'] = 'POST';

-		$this->server->init();
+        $this->server->init();

-		$this->assertEquals(123, $this->server->isUser());
-		$this->assertEquals(false, $this->server->isMachine());
-	}
+        $this->assertEquals(123, $this->server->isUser());
+        $this->assertEquals(false, $this->server->isMachine());
+    }

 }
Author	SHA1	Message	Date
Alex Bilbie	e415e0051a	Version bump	2013-01-24 15:44:07 +00:00
Nick Jackson	608bcb767b	Bearer token now correctly base64 decoding	2013-01-08 15:52:17 +00:00
Alex Bilbie	b4e8c27618	Merge branch 'release/0.4.1'	2013-01-02 22:36:48 +00:00
Alex Bilbie	d65cdaf028	Version bump	2013-01-02 22:36:41 +00:00
Alex Bilbie	5f1779c4e7	Autoload dependencies with autoloader in bootstrap.php	2013-01-02 22:32:49 +00:00
Alex Bilbie	b10613c5e3	Composer install	2013-01-02 21:31:33 +00:00
Alex Bilbie	1c3b319aa6	Altered the script parameter of .travis.yml	2013-01-02 21:22:09 +00:00
Alex Bilbie	1069507ab4	Revert require_once statements	2013-01-02 21:13:32 +00:00
Alex Bilbie	5ca63c921a	Updated PHPUnit.xml	2013-01-02 21:13:12 +00:00
Alex Bilbie	943fc1cc82	Possible fix for Travis?	2013-01-02 20:34:09 +00:00
Alex Bilbie	a158883aed	Another attempt to fix paths for travis	2013-01-02 20:32:38 +00:00
Alex Bilbie	8aba2b29b8	Better travis debugging	2013-01-02 20:24:45 +00:00
Alex Bilbie	b5e8f9206b	Fool.	2013-01-02 20:21:25 +00:00
Alex Bilbie	755a753cb5	Test include path on travis	2013-01-02 20:19:26 +00:00
Alex Bilbie	e99211db31	Moved require_once statement outside of setUp tests method	2013-01-02 20:13:02 +00:00
Alex Bilbie	1142f8d86b	Merge branch 'release/0.4' into develop	2013-01-02 19:17:12 +00:00
Alex Bilbie	5772a2f12f	Merge branch 'release/0.4'	2013-01-02 19:17:01 +00:00
Alex Bilbie	f351cea442	Version bump	2013-01-02 19:16:51 +00:00
Alex Bilbie	2e1f1c05cf	Updated README	2013-01-02 19:16:16 +00:00
Alex Bilbie	7279c8675b	Merge branch 'feature/grants' into develop	2013-01-02 19:14:33 +00:00
Alex Bilbie	94945ec49e	Added support for refresh tokens, user credentials and client credentials grant. 100% unit test code coverage for authentication. Fixes #2	2013-01-02 19:14:22 +00:00
Alex Bilbie	2b8a27ef47	Ignore code coverage in ../tests folder	2013-01-02 19:12:53 +00:00
Alex Bilbie	7d1aa28087	Added .travis.yml	2012-12-30 21:31:19 +00:00
Alex Bilbie	0fcbeb8158	PSR fixes	2012-12-23 22:13:22 +00:00
Alex Bilbie	0876fd9ad3	Spacing fixes	2012-12-23 22:12:51 +00:00
Alex Bilbie	2545ea7dc1	Added refresh token params and examples	2012-12-23 22:12:44 +00:00
Alex Bilbie	6eeb7e13e4	Updated unit tests	2012-12-23 22:11:33 +00:00
Alex Bilbie	38c50c00b0	PSR fixes	2012-12-23 21:39:42 +00:00
Alex Bilbie	df85c98e53	PSR fixes	2012-12-23 21:36:30 +00:00
Alex Bilbie	0f30b2a803	Removed lots of unnecessary if/else blocks. Removed null value of expires/expiresIn parameter	2012-12-23 21:21:37 +00:00
Alex Bilbie	f2dc89cdf3	Merge remote-tracking branch 'dhorrigan/master' into feature/grants	2012-12-23 20:34:21 +00:00
Alex Bilbie	c676ba9857	Merge remote-tracking branch 'origin/develop' into develop	2012-12-23 20:33:42 +00:00
Alex Bilbie	d99e871e11	Set a default token ttl of one hour	2012-12-23 20:31:16 +00:00
Daniel Horrigan	0f6f5e2939	Added the user_credentials and refresh_token grants. Fixed expires_in so it is inline with the spec, but added expires for the old usage of expires_in. Made redirect_uri in oauth_sessions ALLOW NULL since user_credential grants don't have a redirect	2012-12-19 16:12:48 -05:00
Alex Bilbie	9fd6f309df	Merge branch 'release/0.3.5' into develop	2012-12-12 11:45:07 +00:00
Alex Bilbie	41d8a1efa3	Merge branch 'release/0.3.5'	2012-12-12 11:44:56 +00:00
Alex Bilbie	4928221b49	Version bump	2012-12-12 11:44:51 +00:00
Alex Bilbie	8131d5be90	Merge branch 'hotfix/resourceConfig' into develop	2012-12-12 11:44:04 +00:00
Alex Bilbie	a948335e45	Merge branch 'hotfix/resourceConfig'	2012-12-12 11:43:11 +00:00
Alex Bilbie	aa978d3581	Fix variable name	2012-12-12 11:43:01 +00:00
Alex Bilbie	b1d91f33cf	Merge branch 'release/0.3.4' into develop	2012-12-11 15:33:20 +00:00
Alex Bilbie	1be25955d6	Merge branch 'release/0.3.4'	2012-12-11 15:33:05 +00:00
Alex Bilbie	3365953257	Version bump	2012-12-11 15:32:27 +00:00
Alex Bilbie	302bf1f70d	Clean trailing whitespace	2012-12-11 15:31:42 +00:00
Alex Bilbie	6553fb3f22	Return client details	2012-12-11 12:09:56 +00:00
Alex Bilbie	fdfe80289a	Merge branch 'release/0.3.3'. Release version 0.3.3 Conflicts: composer.json	2012-12-10 21:31:58 +00:00
Alex Bilbie	0ed6674ceb	Version bump. Fixed website	2012-12-10 21:31:08 +00:00
Alex Bilbie	912cd3fa25	Changed session stage to 'requested' as per enum	2012-12-10 21:19:11 +00:00
Alex Bilbie	1b29c0f1a0	Merge branch 'release/0.3.2' into develop	2012-11-20 15:30:02 +00:00
Alex Bilbie	a5b83c00bd	Version bump	2012-11-20 15:29:43 +00:00
Alex Bilbie	129c9a7b7a	Version bump	2012-11-20 15:28:48 +00:00
Alex Bilbie	958eab33a7	Lots of small documentation updates and clarifications	2012-11-20 15:27:33 +00:00
Alex Bilbie	fead044830	Spacing fixes and fixed sessionScopes() example query	2012-11-20 15:27:15 +00:00
Alex Bilbie	21f48c0491	Spacing updates	2012-11-20 15:26:04 +00:00
Alex Bilbie	ac990b609a	Fixed client_id column length	2012-11-16 16:40:01 +00:00
Alex Bilbie	e5bbd41570	Version bump Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-14 17:33:46 +01:00
Alex Bilbie	99f54d1a02	Missing provider class Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-14 17:33:22 +01:00
Alex Bilbie	b2188514d9	Merge branch 'release/0.3' into develop	2012-10-14 17:21:04 +01:00
Alex Bilbie	0897e6226c	Merge branch 'release/0.3'	2012-10-14 17:20:58 +01:00
Alex Bilbie	3ee9175a5d	Version bump Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-14 17:20:48 +01:00
Alex Bilbie	cca5ae6229	Merge branch 'feature/clients' into develop	2012-10-14 17:18:52 +01:00
Alex Bilbie	b1082ecb41	Lots of updates so it all works now Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-14 17:18:27 +01:00
Alex Bilbie	af83b1e80e	Added urlUserInfo() method Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-12 14:42:36 +01:00
Alex Bilbie	92ace5c6e5	Fixed PHP error with missing bracket Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-12 13:09:56 +01:00
Alex Bilbie	5ed4a8a2c4	Don't base64 decode the bearer token Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-10 09:32:50 +01:00
Alex Bilbie	4fdfb63128	Removed old test bash file Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-05 15:27:34 +01:00
Alex Bilbie	ddfb355280	Code beautification	2012-10-05 15:24:59 +01:00
Alex Bilbie	ac3743027b	Code beautification	2012-10-05 15:22:29 +01:00
Alex Bilbie	ed5c33008d	Merge branch 'refs/heads/master' into develop	2012-10-05 15:07:38 +01:00
Alex Bilbie	0ce0459cfe	Merge branch 'refs/heads/master' into feature/clients	2012-10-05 15:07:21 +01:00
Alex Bilbie	a76fbcd23d	Epic rewriting to use Guzzle Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-05 15:05:27 +01:00
Alex Bilbie	bef7a212e3	Fixes and cleanup Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-05 15:03:15 +01:00
Alex Bilbie	ec191cffe1	Cleanup Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-05 15:02:56 +01:00
Alex Bilbie	5c13c3ee54	Namespace fixes Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-05 15:01:09 +01:00
Alex Bilbie	52bd18a2b4	Fixed namespaces in providers Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-05 15:00:51 +01:00
Alex Bilbie	74338bca6c	Changed email + require Guzzle Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-10-05 14:59:43 +01:00
Alex Bilbie	6d1702a15d	Merge branch 'develop' into feature/clients	2012-09-19 23:29:40 +01:00
Alex Bilbie	500640c56c	phpunit/phpunit is now officially composer compatible Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-09-19 22:04:18 +01:00
Alex Bilbie	7d50b8e812	Moved SQL files Signed-off-by: Alex Bilbie <alex@alexbilbie.com>	2012-09-19 19:59:00 +01:00
Alex Bilbie	43ce218cbb	Merge branch 'release/0.2.3' into develop	2012-09-19 19:54:30 +01:00
Alex Bilbie	c993a0cdc0	Use namespace, use PSR, get rid of Pyro settings	2012-09-04 14:50:20 +01:00
Alex Bilbie	9dfa485bcb	PSR fixes	2012-09-04 14:49:56 +01:00
Alex Bilbie	c760667448	PSR style class braces	2012-09-04 12:43:18 +01:00
Alex Bilbie	0298f6fb7d	Include IDP.php	2012-09-04 12:42:33 +01:00
Alex Bilbie	17b7bf7d1d	Test if provider config exists	2012-09-04 12:40:32 +01:00
Alex Bilbie	ed6301a497	Renamed provider.php to IDP.php	2012-09-04 12:40:02 +01:00
Alex Bilbie	c423ef810f	Require instead of include	2012-09-04 12:33:17 +01:00
Alex Bilbie	485a3772b6	Changed function to __construct	2012-09-04 12:32:59 +01:00
Alex Bilbie	6f03eec814	Class rename	2012-09-04 12:32:44 +01:00
Alex Bilbie	0a5455642f	PSR style if/else block	2012-09-04 12:31:04 +01:00
Alex Bilbie	8fdcb02740	Exception class rename	2012-09-04 12:30:49 +01:00
Alex Bilbie	153bb962c5	PSR variable rename	2012-09-04 12:30:38 +01:00
Alex Bilbie	3ee5f22a55	Class rename	2012-09-04 12:30:15 +01:00
Alex Bilbie	c09663f2b8	Class rename	2012-09-04 12:30:06 +01:00
Alex Bilbie	6a41ae5254	PSR style if block	2012-09-04 12:29:52 +01:00
Alex Bilbie	dd5fc7dc24	PSR variable rename	2012-09-04 12:29:10 +01:00
Alex Bilbie	11415bea0b	PSR style if/else block	2012-09-04 12:28:28 +01:00
Alex Bilbie	eb5010a3f8	PSR variable rename	2012-09-04 12:28:06 +01:00
Alex Bilbie	da329b6b37	Merge branch 'refs/heads/develop' into feature/clients Conflicts: src/Oauth2/Authentication/Server.php	2012-09-04 12:09:13 +01:00
Alex Bilbie	a9b6cd3e12	Mini fixes	2012-08-14 15:43:11 +01:00
Alex Bilbie	44666402dd	Renamed variable	2012-08-14 14:20:14 +01:00
Alex Bilbie	4c82648a9a	First commit of Phil's code with some namespace and class name tweaks	2012-08-13 16:36:45 +01:00
				`@@ -1 +0,0 @@`
				`vendor/bin/phpunit --coverage-text --configuration build/phpunit.xml`