Merge branch 'release/4.0.0'

Associate the $client with $session.

.gitattributes

@@ -1,4 +1,5 @@
 tests/ export-ignore
 phpunit.xml export-ignore
 build.xml export-ignore
-test export-ignore
+test export-ignore
+.travis.yml export-ignore

.gitignore

@@ -1,8 +1,14 @@
-/vendor/
+/vendor
 /composer.lock
-/docs/build/
-/build/logs/
-/build/coverage/
-test
-/docs/
-/testing/
+/build
+/docs
+/testing
+/examples/relational/vendor
+/examples/relational/config/oauth2.sqlite3
+/examples/nosql/vendor
+/examples/nosql/config/oauth2.sqlite3
+/examples/relational/composer.lock
+/tests/codecept/tests/_log
+oauth2-server.paw
+/output_*/
+/_site

.scrutinizer.yml

@@ -0,0 +1,37 @@
+filter:
+    excluded_paths:
+        - tests/*
+        - vendor/*
+        - examples/*
+checks:
+    php:
+        code_rating: true
+        remove_extra_empty_lines: true
+        remove_php_closing_tag: true
+        remove_trailing_whitespace: true
+        fix_use_statements:
+            remove_unused: true
+            preserve_multiple: false
+            preserve_blanklines: true
+            order_alphabetically: true
+        fix_php_opening_tag: true
+        fix_linefeed: true
+        fix_line_ending: true
+        fix_identation_4spaces: true
+        fix_doc_comments: true
+tools:
+    external_code_coverage:
+        timeout: 600
+        runs: 3
+    php_code_coverage: false
+    php_code_sniffer:
+        config:
+            standard: PSR2
+        filter:
+            paths: ['src']
+    php_loc:
+        enabled: true
+        excluded_dirs: [vendor, tests, examples]
+    php_cpd:
+        enabled: true
+        excluded_dirs: [vendor, tests, examples]

.travis.yml

@@ -1,8 +1,19 @@
 language: php
 
 php:
-  - 5.3
   - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
 
-before_script: composer install --dev
-script: phpunit -c build/phpunit.xml
+before_script:
+    - travis_retry composer self-update
+    - travis_retry composer install --no-interaction --prefer-source --dev
+
+script:
+  - mkdir -p build/logs
+  - phpunit --coverage-text --verbose --coverage-clover=coverage.clover
+
+after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

CHANGELOG.md

@@ -1,5 +1,112 @@
 # Changelog
 
+## 4.0.0 (released 2014-11-08)
+
+* Complete rewrite
+* Check out the documentation - [http://oauth2.thephpleague.com](http://oauth2.thephpleague.com)
+
+## 3.2.0 (released 2014-04-16)
+
+* Added the ability to change the algorithm that is used to generate the token strings (Issue #151)
+
+## 3.1.2 (released 2014-02-26)
+
+* Support Authorization being an environment variable. [See more](http://fortrabbit.com/docs/essentials/quirks-and-constraints#authorization-header)
+
+## 3.1.1 (released 2013-12-05)
+
+* Normalize headers when `getallheaders()` is available (Issues #108 and #114)
+
+## 3.1.0 (released 2013-12-05)
+
+* No longer necessary to inject the authorisation server into a grant, the server will inject itself
+* Added test for 1419ba8cdcf18dd034c8db9f7de86a2594b68605
+
+## 3.0.1 (released 2013-12-02)
+
+* Forgot to tell TravisCI from testing PHP 5.3
+
+## 3.0.0 (released 2013-12-02)
+
+* Fixed spelling of Implicit grant class (Issue #84)
+* Travis CI now tests for PHP 5.5
+* Fixes for checking headers for resource server (Issues #79 and #)
+* The word "bearer" now has a capital "B" in JSON output to match OAuth 2.0 spec
+* All grants no longer remove old sessions by default
+* All grants now support custom access token TTL (Issue #92)
+* All methods which didn't before return a value now return `$this` to support method chaining
+* Removed the build in DB providers - these will be put in their own repos to remove baggage in the main repository
+* Removed support for PHP 5.3 because this library now uses traits and will use other modern PHP features going forward
+* Moved some grant related functions into a trait to reduce duplicate code
+
+## 2.1.1 (released 2013-06-02)
+
+* Added conditional `isValid()` flag to check for Authorization header only (thanks @alexmcroberts)
+* Fixed semantic meaning of `requireScopeParam()` and `requireStateParam()` by changing their default value to true
+* Updated some duff docblocks
+* Corrected array key call in Resource.php (Issue #63)
+
+## 2.1 (released 2013-05-10)
+
+* Moved zetacomponents/database to "suggest" in composer.json. If you rely on this feature you now need to include " zetacomponents/database" into "require" key in your own composer.json. (Issue #51)
+* New method in Refresh grant called `rotateRefreshTokens()`. Pass in `true` to issue a new refresh token each time an access token is refreshed. This parameter needs to be set to true in order to request reduced scopes with the new access token. (Issue #47)
+* Rename `key` column in oauth_scopes table to `scope` as `key` is a reserved SQL word. (Issue #45)
+* The `scope` parameter is no longer required by default as per the RFC. (Issue #43)
+* You can now set multiple default scopes by passing an array into `setDefaultScope()`. (Issue #42)
+* The password and client credentials grants now allow for multiple sessions per user. (Issue #32)
+* Scopes associated to authorization codes are not held in their own table (Issue #44)
+* Database schema updates.
+
+## 2.0.5 (released 2013-05-09)
+
+* Fixed `oauth_session_token_scopes` table primary key
+* Removed `DEFAULT ''` that has slipped into some tables
+* Fixed docblock for `SessionInterface::associateRefreshToken()`
+
+## 2.0.4 (released 2013-05-09)
+
+* Renamed primary key in oauth_client_endpoints table
+* Adding missing column to oauth_session_authcodes
+* SECURITY FIX: A refresh token should be bound to a client ID
+
+## 2.0.3 (released 2013-05-08)
+
+* Fixed a link to code in composer.json
+
+## 2.0.2 (released 2013-05-08)
+
+* Updated README with wiki guides
+* Removed `null` as default parameters in some methods in the storage interfaces
+* Fixed license copyright
+
+## 2.0.0 (released 2013-05-08)
+
+**If you're upgrading from v1.0.8 there are lots of breaking changes**
+
+* Rewrote the session storage interface from scratch so methods are more obvious
+* Included a PDO driver which implements the storage interfaces so the library is more "get up and go"
+* Further normalised the database structure so all sessions no longer contain infomation related to authorization grant (which may or may not be enabled)
+* A session can have multiple associated access tokens
+* Induvidual grants can have custom expire times for access tokens
+* Authorization codes now have a TTL of 10 minutes by default (can be manually set)
+* Refresh tokens now have a TTL of one week by default (can be manually set)
+* The client credentials grant will no longer gives out refresh tokens as per the specification
+
+## 1.0.8 (released 2013-03-18)
+
+* Fixed check for required state parameter
+* Fixed check that user's credentials are correct in Password grant
+
+## 1.0.7 (released 2013-03-04)
+
+* Added method `requireStateParam()`
+* Added method `requireScopeParam()`
+
+## 1.0.6 (released 2013-02-22)
+
+* Added links to tutorials in the README
+* Added missing `state` parameter request to the `checkAuthoriseParams()` method.
+
 ## 1.0.5 (released 2013-02-21)
 
 * Fixed the SQL example for SessionInterface::getScopes()
@@ -19,4 +126,4 @@
 
 ## 1.0.0 (released 2013-02-15)
 
-* First release
+* First major release

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+Thanks for contributing to this project.
+
+
+**Please submit your pull request against the `develop` branch only.**
+
+
+Please ensure that you run `phpunit` from the project root after you've made any changes.
+
+If you've added something new please create a new unit test, if you've changed something please update any unit tests as appropritate.
+
+We're trying to ensure there is **100%** test code coverage (including testing PHP errors and exceptions) so please ensure any new/updated tests cover all of your changes.
+
+Thank you,
+
+@alexbilbie

README.md

@@ -1,52 +1,72 @@
-# PHP OAuth Framework
+# PHP OAuth 2.0 Server by [@alexbilbie](https://twitter.com/alexbilbie)
 
-The goal of this project is to develop a standards compliant [OAuth 2](http://tools.ietf.org/wg/oauth/draft-ietf-oauth-v2/) authorization server and resource server.
+[![Latest Version](http://img.shields.io/packagist/v/league/oauth2-server.svg?style=flat-square)](https://github.com/thephpleague/oauth2-server/releases)
+[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
+[![Build Status](https://img.shields.io/travis/thephpleague/oauth2-server/master.svg?style=flat-square)](https://travis-ci.org/thephpleague/oauth2-server)
+[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/thephpleague/oauth2-server.svg?style=flat-square)](https://scrutinizer-ci.com/g/thephpleague/oauth2-server/code-structure)
+[![Quality Score](https://img.shields.io/scrutinizer/g/thephpleague/oauth2-server.svg?style=flat-square)](https://scrutinizer-ci.com/g/thephpleague/oauth2-server)
+[![Total Downloads](https://img.shields.io/packagist/dt/league/oauth2-server.svg?style=flat-square)](https://packagist.org/packages/league/oauth2-server)
 
-## Package Installation
 
-The framework is provided as a Composer package which can be installed by adding the package to your composer.json file:
+A standards compliant [OAuth 2.0](http://tools.ietf.org/wg/oauth/draft-ietf-oauth-v2/) authorization server and resource server written in PHP which makes working with OAuth 2.0 trivial. You can easily configure an OAuth 2.0 server to protect your API with access tokens, or allow clients to request new access tokens and refresh them.
 
-```javascript
-{
-	"require": {
-		"lncd/OAuth2": "*"
-	}
-}
-```
+It supports out of the box the following grants:
 
----
+* Authorization code grant
+* Client credentials grant
+* Resource owner password credentials grant
+* Refresh grant
 
-The library features 100% unit test code coverage. To run the tests yourself run `phpunit -c build/phpunit.xml`.
+You can also define your own grants.
 
-## Current Features
+In addition it supports the following token types:
 
-### Authorization Server
+* Bearer tokens
+* MAC tokens (coming soon)
+* JSON web tokens (coming soon)
 
-The authorization server is a flexible class and following core specification grants are implemented:
 
-* authorization code ([section 4.1](http://tools.ietf.org/html/rfc6749#section-4.1))
-* refresh token ([section 6](http://tools.ietf.org/html/rfc6749#section-6))
-* client credentials ([section 2.3.1](http://tools.ietf.org/html/rfc6749#section-2.3.1))
-* password (user credentials) ([section 4.3](http://tools.ietf.org/html/rfc6749#section-4.3))
+## Requirements
 
-### Resource Server
+The following versions of PHP are supported:
 
-The resource server allows you to secure your API endpoints by checking for a valid OAuth access token in the request and ensuring the token has the correct permission to access resources.
+* PHP 5.4
+* PHP 5.5
+* PHP 5.6
+* HHVM
 
-## Future Goals
+## Documentation
 
-### Authorization Server
+This library has [full documentation](http://oauth2.thephpleague.com), powered by [Jekyll](http://jekyllrb.com/).
 
-* Support for [JSON web tokens](http://tools.ietf.org/wg/oauth/draft-ietf-oauth-json-web-token/).
-* Support for [SAML assertions](http://tools.ietf.org/wg/oauth/draft-ietf-oauth-saml2-bearer/).
+Contribute to this documentation in the [gh-pages branch](https://github.com/thephpleague/oauth2-server/tree/gh-pages/).
 
----
+## Changelog
 
-This code will be developed as part of the [Linkey](http://linkey.blogs.lincoln.ac.uk) project which has been funded by [JISC](http://jisc.ac.uk) under the Access and Identity Management programme.
+[See the project releases page](https://github.com/thephpleague/oauth2-server/releases)
 
-This code was principally developed by [Alex Bilbie](http://alexbilbie.com/) ([Twitter](https://twitter.com/alexbilbie)|[Github](https://github.com/alexbilbie)).
+## Contributing
 
-Valuable contribtions have been made by the following:
+Please see [CONTRIBUTING](https://github.com/thephpleague/oauth2-server/blob/master/CONTRIBUTING.md) for details.
 
-* [Dan Horrigan](http://dandoescode.com) ([Twitter](https://twitter.com/dandoescode)|[Github](https://github.com/dandoescode))
-* [Nick Jackson](http://nickjackson.me) ([Twitter](https://twitter.com/jacksonj04)|[Github](https://github.com/jacksonj04))
+## Support
+
+Bugs and feature request are tracked on [GitHub](https://github.com/thephpleague/oauth2-server/issues)
+
+## License
+
+This package is released under the MIT License. See the bundled [LICENSE](https://github.com/thephpleague/oauth2-server/blob/master/LICENSE) file for details.
+
+## Credits
+
+This code is principally developed and maintained by [Alex Bilbie](https://twitter.com/alexbilbie).
+
+Special thanks to:
+
+* [Dan Horrigan](https://github.com/dandoescode)
+* [Nick Jackson](https://github.com/jacksonj04)
+* [Michael Gooden](https://github.com/MichaelGooden)
+* [Phil Sturgeon](https://github.com/philsturgeon)
+* [and all the other contributors](https://github.com/thephpleague/oauth2-server/contributors)
+
+The initial code was developed as part of the [Linkey](http://linkey.blogs.lincoln.ac.uk) project which was funded by [JISC](http://jisc.ac.uk) under the Access and Identity Management programme.

build.xml

@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="PHP OAuth 2.0 Server" default="build">
-
-	<target name="build" depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,composer,phpunit,phpdox,phpcb"/>
-	
-	<target name="build-parallel" depends="prepare,lint,tools-parallel,phpcb"/>
-	
-	<target name="minimal" depends="prepare,lint,phploc,pdepend,phpcpd,composer,phpunit,phpdox,phpcb" />
-	
-	<target name="tools-parallel" description="Run tools in parallel">
-		<parallel threadCount="2">
-			<sequential>
-				<antcall target="pdepend"/>
-				<antcall target="phpmd-ci"/>
-			</sequential>
-			<antcall target="phpcpd"/>
-			<antcall target="phpcs-ci"/>
-			<antcall target="phploc"/>
-			<antcall target="phpdox"/>
-		</parallel>
-	</target>
-	
-	<target name="clean" description="Cleanup build artifacts">
-		<delete dir="${basedir}/build/api"/>
-		<delete dir="${basedir}/build/code-browser"/>
-		<delete dir="${basedir}/build/coverage"/>
-		<delete dir="${basedir}/build/logs"/>
-		<delete dir="${basedir}/build/pdepend"/>
-	</target>
-	
-	<target name="prepare" depends="clean" description="Prepare for build">
-		<mkdir dir="${basedir}/build/api"/>
-		<mkdir dir="${basedir}/build/code-browser"/>
-		<mkdir dir="${basedir}/build/coverage"/>
-		<mkdir dir="${basedir}/build/logs"/>
-		<mkdir dir="${basedir}/build/pdepend"/>
-		<mkdir dir="${basedir}/build/phpdox"/>
-	</target>
-	
-	<target name="lint">
-		<apply executable="php" failonerror="true">
-			<arg value="-l" />
-			
-			<fileset dir="${basedir}/src">
-				<include name="**/*.php" />
-				<modified />
-			</fileset>
-		</apply>
-	</target>
-	
-	<target name="phploc" description="Measure project size using PHPLOC">
-		<exec executable="phploc">
-			<arg value="--log-csv" />
-			<arg value="${basedir}/build/logs/phploc.csv" />
-			<arg path="${basedir}/src" />
-		</exec>
-	</target>
-	
-	<target name="pdepend" description="Calculate software metrics using PHP_Depend">
-		<exec executable="pdepend">
-			<arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
-			<arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
-			<arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
-			<arg path="${basedir}/src" />
-		</exec>
-	</target>
-	
-	<target name="phpmd" description="Perform project mess detection using PHPMD and print human readable output. Intended for usage on the command line before committing.">
-		<exec executable="phpmd">
-			<arg path="${basedir}/src" />
-			<arg value="text" />
-			<arg value="${basedir}/build/phpmd.xml" />
-		</exec>
-	</target>
-	
-	<target name="phpmd-ci" description="Perform project mess detection using PHPMD creating a log file for the continuous integration server">
-		<exec executable="phpmd">
-			<arg path="${basedir}/src" />
-			<arg value="xml" />
-			<arg value="${basedir}/build/phpmd.xml" />
-			<arg value="--reportfile" />
-			<arg value="${basedir}/build/logs/pmd.xml" />
-		</exec>
-	</target>
-	
-	<target name="phpcs" description="Find coding standard violations using PHP_CodeSniffer and print human readable output. Intended for usage on the command line before committing.">
-		<exec executable="phpcs">
-			<arg value="--standard=${basedir}/build/phpcs.xml" />
-			<arg value="--extensions=php" />
-			<arg value="--ignore=third_party/CIUnit" />
-			<arg path="${basedir}/src" />
-		</exec>
-	</target>
-	
-	<target name="phpcs-ci" description="Find coding standard violations using PHP_CodeSniffer creating a log file for the continuous integration server">
-		<exec executable="phpcs" output="/dev/null">
-			<arg value="--report=checkstyle" />
-			<arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
-			<arg value="--standard=${basedir}/build/phpcs.xml" />
-			<arg value="--extensions=php" />
-			<arg value="--ignore=third_party/CIUnit" />
-			<arg path="${basedir}/src" />
-		</exec>
-	</target>
-	
-	<target name="phpcpd" description="Find duplicate code using PHPCPD">
-		<exec executable="phpcpd">
-			<arg value="--log-pmd" />
-			<arg value="${basedir}/build/logs/pmd-cpd.xml" />
-			<arg path="${basedir}/src" />
-		</exec>
-	</target>
-
-	<target name="composer" description="Install Composer requirements">
-		<exec executable="composer.phar" failonerror="true">
-			<arg value="install" />
-			<arg value="--dev" />
-		</exec>
-	</target>
-
-	<target name="phpunit" description="Run unit tests with PHPUnit">
-		<exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
-			<arg value="--configuration" />
-			<arg value="${basedir}/build/phpunit.xml" />
-		</exec>
-	</target>
-	
-	<target name="phpdox" description="Generate API documentation using phpDox">
-		<exec executable="phpdox"/>
-	</target>
-	
-	<target name="phpcb" description="Aggregate tool output with PHP_CodeBrowser">
-		<exec executable="phpcb">
-			<arg value="--log" />
-			<arg path="${basedir}/build/logs" />
-			<arg value="--source" />
-			<arg path="${basedir}/src" />
-			<arg value="--output" />
-			<arg path="${basedir}/build/code-browser" />
-		</exec>
-	</target>
-</project>

build/phpcs.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="PHP_CodeSniffer">
-
-	<description>PHP_CodeSniffer configuration</description>
-
-	<rule ref="PSR2"/>
-
-</ruleset>

build/phpmd.xml

@@ -1,14 +0,0 @@
-<ruleset name="OAuth 2.0 Server"
-	xmlns="http://pmd.sf.net/ruleset/1.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
-		http://pmd.sf.net/ruleset_xml_schema.xsd"
-	xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-
-	<description>
-		Ruleset for OAuth 2.0 server
-	</description>
-
-	<!-- Import the entire unused code rule set -->
-	<rule ref="rulesets/unusedcode.xml" />
-</ruleset>

build/phpunit.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" bootstrap="../tests/Bootstrap.php">
-	<testsuites>
-		<testsuite name="Authorization Server">
-			<directory suffix="Test.php">../tests/authorization</directory>
-		</testsuite>
-		<testsuite name="Resource Server">
-			<directory suffix="Test.php">../tests/resource</directory>
-		</testsuite>
-		<testsuite name="Utility Methods">
-			<directory suffix="Test.php">../tests/util</directory>
-		</testsuite>
-	</testsuites>
-	<filter>
-		<blacklist>
-			<directory suffix=".php">PEAR_INSTALL_DIR</directory>
-			<directory suffix=".php">PHP_LIBDIR</directory>
-			<directory suffix=".php">../vendor/composer</directory>
-			<directory suffix=".php">../vendor/mockery</directory>
-			<directory suffix=".php">../vendor/phpunit</directory>
-			<directory suffix=".php">../tests</directory>
-			<directory suffix=".php">../testing</directory>
-		</blacklist>
-	</filter>
-	<logging>
-		<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>
-</phpunit>

composer.json

@@ -1,30 +1,38 @@
 {
-	"name": "lncd/oauth2",
-	"description": "OAuth 2.0 Framework",
-	"version": "1.0.5",
-	"homepage": "https://github.com/lncd/OAuth2",
+	"name": "league/oauth2-server",
+	"description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.",
+	"homepage": "http://oauth2.thephpleague.com/",
 	"license": "MIT",
 	"require": {
-		"php": ">=5.3.0"
+		"php": ">=5.4.0",
+		"symfony/http-foundation": "~2.5",
+		"league/event": "1.0.*"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "*",
-        "mockery/mockery": ">=0.7.2"
+		"phpunit/phpunit": "4.3.*",
+		"mockery/mockery": "0.9.*"
 	},
 	"repositories": [
 		{
 			"type": "git",
-			"url": "https://github.com/lncd/OAuth2"
+			"url": "https://github.com/thephpleague/oauth2-server.git"
 		}
 	],
 	"keywords": [
 		"oauth",
 		"oauth2",
+		"oauth 2",
+		"oauth 2.0",
 		"server",
+		"auth",
 		"authorization",
+		"authorisation",
 		"authentication",
 		"resource",
-		"api"
+		"api",
+		"auth",
+		"protect",
+		"secure"
 	],
 	"authors": [
 		{
@@ -34,10 +42,23 @@
 			"role": "Developer"
 		}
 	],
+	"replace": {
+		"lncd/oauth2": "*",
+		"league/oauth2server": "*"
+	},
 	"autoload": {
-		"psr-0": {
-			"OAuth2": "src/"
+		"psr-4": {
+			"League\\OAuth2\\Server\\": "src/"
 		}
 	},
-	"suggest": {}
+	"autoload-dev": {
+		"psr-4": {
+			"LeagueTests\\": "tests/unit/"
+		}
+	},
+	"extra": {
+       		"branch-alias": {
+            		"dev-develop": "4.0.x-dev"
+        	}
+	}
 }

examples/relational/Model/Users.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace RelationalExample\Model;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+class Users
+{
+    public function get($username = null)
+    {
+        $query = Capsule::table('users')->select(['username', 'password', 'name', 'email', 'photo']);
+
+        if ($username !== null) {
+            $query->where('username', '=', $username);
+        }
+
+        $result = $query->get();
+
+        if (count($result) > 0) {
+            return $result;
+        }
+
+        return null;
+    }
+}

examples/relational/Storage/AccessTokenStorage.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace RelationalExample\Storage;
+
+use League\OAuth2\Server\Storage\AccessTokenInterface;
+use League\OAuth2\Server\Storage\Adapter;
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\AbstractTokenEntity;
+use League\OAuth2\Server\Entity\RefreshTokenEntity;
+use League\OAuth2\Server\Entity\ScopeEntity;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+class AccessTokenStorage extends Adapter implements AccessTokenInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function get($token)
+    {
+        $result = Capsule::table('oauth_access_tokens')
+                            ->where('access_token', $token)
+                            ->get();
+
+        if (count($result) === 1) {
+            $token = (new AccessTokenEntity($this->server))
+                        ->setId($result[0]['access_token'])
+                        ->setExpireTime($result[0]['expire_time']);
+
+            return $token;
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getScopes(AbstractTokenEntity $token)
+    {
+        $result = Capsule::table('oauth_access_token_scopes')
+                                    ->select(['oauth_scopes.id', 'oauth_scopes.description'])
+                                    ->join('oauth_scopes', 'oauth_access_token_scopes.scope', '=', 'oauth_scopes.id')
+                                    ->where('access_token', $token->getId())
+                                    ->get();
+
+        $response = [];
+
+        if (count($result) > 0) {
+            foreach ($result as $row) {
+                $scope = (new ScopeEntity($this->server))->hydrate([
+                    'id'            =>  $row['id'],
+                    'description'   =>  $row['description']
+                ]);
+                $response[] = $scope;
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create($token, $expireTime, $sessionId)
+    {
+        Capsule::table('oauth_access_tokens')
+                    ->insert([
+                        'access_token'     =>  $token,
+                        'session_id'    =>  $sessionId,
+                        'expire_time'   =>  $expireTime
+                    ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function associateScope(AbstractTokenEntity $token, ScopeEntity $scope)
+    {
+        Capsule::table('oauth_access_token_scopes')
+                    ->insert([
+                        'access_token'  =>  $token->getId(),
+                        'scope' =>  $scope->getId()
+                    ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete(AbstractTokenEntity $token)
+    {
+        Capsule::table('oauth_access_token_scopes')
+                    ->where('access_token', $token->getId())
+                    ->delete();
+    }
+}

examples/relational/Storage/AuthCodeStorage.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace RelationalExample\Storage;
+
+use League\OAuth2\Server\Storage\AuthCodeInterface;
+use League\OAuth2\Server\Storage\Adapter;
+use League\OAuth2\Server\Entity\AuthCodeEntity;
+use League\OAuth2\Server\Entity\ScopeEntity;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+class AuthCodeStorage extends Adapter implements AuthCodeInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function get($code)
+    {
+        $result = Capsule::table('oauth_auth_codes')
+                            ->where('auth_code', $code)
+                            ->where('expire_time', '>=', time())
+                            ->get();
+
+        if (count($result) === 1) {
+            $token = new AuthCodeEntity($this->server);
+            $token->setId($result[0]['auth_code']);
+            $token->setRedirectUri($result[0]['client_redirect_uri']);
+            return $token;
+        }
+
+        return null;
+    }
+
+    public function create($token, $expireTime, $sessionId, $redirectUri)
+    {
+        Capsule::table('oauth_auth_codes')
+                    ->insert([
+                        'auth_code'     =>  $token,
+                        'client_redirect_uri'  =>  $redirectUri,
+                        'session_id'    =>  $sessionId,
+                        'expire_time'   =>  $expireTime
+                    ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getScopes(AuthCodeEntity $token)
+    {
+        $result = Capsule::table('oauth_auth_code_scopes')
+                                    ->select(['oauth_scopes.id', 'oauth_scopes.description'])
+                                    ->join('oauth_scopes', 'oauth_auth_code_scopes.scope', '=', 'oauth_scopes.id')
+                                    ->where('auth_code', $token->getId())
+                                    ->get();
+
+        $response = [];
+
+        if (count($result) > 0) {
+            foreach ($result as $row) {
+                $scope = (new ScopeEntity($this->server))->hydrate([
+                    'id'            =>  $row['id'],
+                    'description'   =>  $row['description']
+                ]);
+                $response[] = $scope;
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function associateScope(AuthCodeEntity $token, ScopeEntity $scope)
+    {
+        Capsule::table('oauth_auth_code_scopes')
+                    ->insert([
+                        'auth_code' =>  $token->getId(),
+                        'scope'     =>  $scope->getId()
+                    ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete(AuthCodeEntity $token)
+    {
+        Capsule::table('oauth_auth_codes')
+                    ->where('auth_code', $token->getId())
+                    ->delete();
+    }
+}

examples/relational/Storage/ClientStorage.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace RelationalExample\Storage;
+
+use League\OAuth2\Server\Storage\ClientInterface;
+use League\OAuth2\Server\Storage\Adapter;
+use League\OAuth2\Server\Entity\ClientEntity;
+use League\OAuth2\Server\Entity\SessionEntity;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+class ClientStorage extends Adapter implements ClientInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function get($clientId, $clientSecret = null, $redirectUri = null, $grantType = null)
+    {
+        $query = Capsule::table('oauth_clients')
+                          ->select('oauth_clients.*')
+                          ->where('oauth_clients.id', $clientId);
+
+        if ($clientSecret !== null) {
+            $query->where('oauth_clients.secret', $clientSecret);
+        }
+
+        if ($redirectUri) {
+            $query->join('oauth_client_redirect_uris', 'oauth_clients.id', '=', 'oauth_client_redirect_uris.client_id')
+                  ->select(['oauth_clients.*', 'oauth_client_redirect_uris.*'])
+                  ->where('oauth_client_redirect_uris.redirect_uri', $redirectUri);
+        }
+
+        $result = $query->get();
+
+        if (count($result) === 1) {
+            $client = new ClientEntity($this->server);
+            $client->hydrate([
+                'id'    =>  $result[0]['id'],
+                'name'  =>  $result[0]['name']
+            ]);
+
+            return $client;
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBySession(SessionEntity $session)
+    {
+        $result = Capsule::table('oauth_clients')
+                            ->select(['oauth_clients.id', 'oauth_clients.name'])
+                            ->join('oauth_sessions', 'oauth_clients.id', '=', 'oauth_sessions.client_id')
+                            ->where('oauth_sessions.id', $session->getId())
+                            ->get();
+
+        if (count($result) === 1) {
+            $client = new ClientEntity($this->server);
+            $client->hydrate([
+                'id'    =>  $result[0]['id'],
+                'name'  =>  $result[0]['name']
+            ]);
+
+            return $client;
+        }
+
+        return null;
+    }
+}

examples/relational/Storage/RefreshTokenStorage.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace RelationalExample\Storage;
+
+use League\OAuth2\Server\Storage\RefreshTokenInterface;
+use League\OAuth2\Server\Storage\Adapter;
+use League\OAuth2\Server\Entity\RefreshTokenEntity;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+class RefreshTokenStorage extends Adapter implements RefreshTokenInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function get($token)
+    {
+        $result = Capsule::table('oauth_refresh_tokens')
+                            ->where('refresh_token', $token)
+                            ->get();
+
+        if (count($result) === 1) {
+            $token = (new RefreshTokenEntity($this->server))
+                        ->setId($result[0]['refresh_token'])
+                        ->setExpireTime($result[0]['expire_time'])
+                        ->setAccessTokenId($result[0]['access_token']);
+
+            return $token;
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create($token, $expireTime, $accessToken)
+    {
+        Capsule::table('oauth_refresh_tokens')
+                    ->insert([
+                        'refresh_token'     =>  $token,
+                        'access_token'    =>  $accessToken,
+                        'expire_time'   =>  $expireTime
+                    ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete(RefreshTokenEntity $token)
+    {
+        Capsule::table('oauth_refresh_tokens')
+                            ->where('refresh_token', $token->getId())
+                            ->delete();
+    }
+
+}

examples/relational/Storage/ScopeStorage.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace RelationalExample\Storage;
+
+use League\OAuth2\Server\Storage\ScopeInterface;
+use League\OAuth2\Server\Storage\Adapter;
+use League\OAuth2\Server\Entity\ScopeEntity;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+class ScopeStorage extends Adapter implements ScopeInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function get($scope, $grantType = null, $clientId = null)
+    {
+        $result = Capsule::table('oauth_scopes')
+                                ->where('id', $scope)
+                                ->get();
+
+        if (count($result) === 0) {
+            return null;
+        }
+
+        return (new ScopeEntity($this->server))->hydrate([
+            'id'            =>  $result[0]['id'],
+            'description'   =>  $result[0]['description']
+        ]);
+    }
+}

examples/relational/Storage/SessionStorage.php

@@ -0,0 +1,110 @@
+<?php
+
+namespace RelationalExample\Storage;
+
+use League\OAuth2\Server\Storage\SessionInterface;
+use League\OAuth2\Server\Storage\Adapter;
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\AuthCodeEntity;
+use League\OAuth2\Server\Entity\SessionEntity;
+use League\OAuth2\Server\Entity\ScopeEntity;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+class SessionStorage extends Adapter implements SessionInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getByAccessToken(AccessTokenEntity $accessToken)
+    {
+        $result = Capsule::table('oauth_sessions')
+                            ->select(['oauth_sessions.id', 'oauth_sessions.owner_type', 'oauth_sessions.owner_id', 'oauth_sessions.client_id', 'oauth_sessions.client_redirect_uri'])
+                            ->join('oauth_access_tokens', 'oauth_access_tokens.session_id', '=', 'oauth_sessions.id')
+                            ->where('oauth_access_tokens.access_token', $accessToken->getId())
+                            ->get();
+
+        if (count($result) === 1) {
+            $session = new SessionEntity($this->server);
+            $session->setId($result[0]['id']);
+            $session->setOwner($result[0]['owner_type'], $result[0]['owner_id']);
+
+            return $session;
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getByAuthCode(AuthCodeEntity $authCode)
+    {
+        $result = Capsule::table('oauth_sessions')
+                            ->select(['oauth_sessions.id', 'oauth_sessions.owner_type', 'oauth_sessions.owner_id', 'oauth_sessions.client_id', 'oauth_sessions.client_redirect_uri'])
+                            ->join('oauth_auth_codes', 'oauth_auth_codes.session_id', '=', 'oauth_sessions.id')
+                            ->where('oauth_auth_codes.auth_code', $authCode->getId())
+                            ->get();
+
+        if (count($result) === 1) {
+            $session = new SessionEntity($this->server);
+            $session->setId($result[0]['id']);
+            $session->setOwner($result[0]['owner_type'], $result[0]['owner_id']);
+
+            return $session;
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getScopes(SessionEntity $session)
+    {
+        $result = Capsule::table('oauth_sessions')
+                            ->select('oauth_scopes.*')
+                            ->join('oauth_session_scopes', 'oauth_sessions.id', '=', 'oauth_session_scopes.session_id')
+                            ->join('oauth_scopes', 'oauth_scopes.id', '=', 'oauth_session_scopes.scope')
+                            ->where('oauth_sessions.id', $session->getId())
+                            ->get();
+
+        $scopes = [];
+
+        foreach ($result as $scope) {
+            $scopes[] = (new ScopeEntity($this->server))->hydrate([
+                'id'            =>  $scope['id'],
+                'description'   =>  $scope['description']
+            ]);
+        }
+
+        return $scopes;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create($ownerType, $ownerId, $clientId, $clientRedirectUri = null)
+    {
+        $id = Capsule::table('oauth_sessions')
+                        ->insertGetId([
+                            'owner_type'  =>    $ownerType,
+                            'owner_id'    =>    $ownerId,
+                            'client_id'   =>    $clientId
+                        ]);
+
+        return $id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function associateScope(SessionEntity $session, ScopeEntity $scope)
+    {
+        Capsule::table('oauth_session_scopes')
+                            ->insert([
+                                'session_id'    =>  $session->getId(),
+                                'scope'         =>  $scope->getId()
+                            ]);
+    }
+}

examples/relational/api.php

@@ -0,0 +1,145 @@
+<?php
+use \Orno\Http\Request;
+use \Orno\Http\Response;
+use \Orno\Http\JsonResponse;
+use \Orno\Http\Exception\NotFoundException;
+use \League\OAuth2\Server\ResourceServer;
+use \RelationalExample\Storage;
+use \RelationalExample\Model;
+use Illuminate\Database\Capsule\Manager as Capsule;
+use \League\Event\Emitter;
+
+include __DIR__.'/vendor/autoload.php';
+
+// Routing setup
+$request = (new Request)->createFromGlobals();
+$router = new \Orno\Route\RouteCollection;
+$router->setStrategy(\Orno\Route\RouteStrategyInterface::RESTFUL_STRATEGY);
+
+// Set up the OAuth 2.0 resource server
+$sessionStorage = new Storage\SessionStorage();
+$accessTokenStorage = new Storage\AccessTokenStorage();
+$clientStorage = new Storage\ClientStorage();
+$scopeStorage = new Storage\ScopeStorage();
+
+$server = new ResourceServer(
+    $sessionStorage,
+    $accessTokenStorage,
+    $clientStorage,
+    $scopeStorage
+);
+
+// Routing setup
+$request = (new Request)->createFromGlobals();
+$router = new \Orno\Route\RouteCollection;
+
+// GET /tokeninfo
+$router->get('/tokeninfo', function (Request $request) use ($server) {
+
+    $token = [
+        'owner_id'  =>  $server->getOwnerId(),
+        'owner_type'  =>  $server->getOwnerType(),
+        'access_token'  =>  $server->getAccessToken(),
+        'client_id'  =>  $server->getClientId(),
+        'scopes'  =>  $server->getScopes()
+    ];
+
+    return new Response(json_encode($token));
+
+});
+
+// GET /users
+$router->get('/users', function (Request $request) use ($server) {
+
+    $results = (new Model\Users())->get();
+
+    $users = [];
+
+    foreach ($results as $result) {
+        $user = [
+            'username'  =>  $result['username'],
+            'name'      =>  $result['name']
+        ];
+
+        if ($server->hasScope('email')) {
+            $user['email'] = $result['email'];
+        }
+
+        if ($server->hasScope('photo')) {
+            $user['photo'] = $result['photo'];
+        }
+
+        $users[] = $user;
+    }
+
+    return new Response(json_encode($users));
+});
+
+// GET /users/{username}
+$router->get('/users/{username}', function (Request $request, $args) use ($server) {
+
+    $result = (new Model\Users())->get($args['username']);
+
+    if (count($result) === 0) {
+        throw new NotFoundException();
+    }
+
+    $user = [
+        'username'  =>  $result[0]['username'],
+        'name'      =>  $result[0]['name']
+    ];
+
+    if ($server->hasScope('email')) {
+        $user['email'] = $result[0]['email'];
+    }
+
+    if ($server->hasScope('photo')) {
+        $user['photo'] = $result[0]['photo'];
+    }
+
+    return new Response(json_encode($user));
+});
+
+$dispatcher = $router->getDispatcher();
+
+try {
+
+    // Check that access token is present
+    $server->isValidRequest(false);
+
+    // A successful response
+    $response = $dispatcher->dispatch(
+        $request->getMethod(),
+        $request->getPathInfo()
+    );
+
+} catch (\Orno\Http\Exception $e) {
+
+    // A failed response
+    $response = $e->getJsonResponse();
+    $response->setContent(json_encode(['status_code' => $e->getStatusCode(), 'message' => $e->getMessage()]));
+
+} catch (\League\OAuth2\Server\Exception\OAuthException $e) {
+
+    $response = new Response(json_encode([
+        'error'     =>  $e->errorType,
+        'message'   =>  $e->getMessage()
+    ]), $e->httpStatusCode);
+
+    foreach ($e->getHttpHeaders() as $header) {
+        $response->headers($header);
+    }
+
+} catch (\Exception $e) {
+
+    $response = new Orno\Http\Response;
+    $response->setStatusCode(500);
+    $response->setContent(json_encode(['status_code' => 500, 'message' => $e->getMessage()]));
+
+} finally {
+
+    // Return the response
+    $response->headers->set('Content-type', 'application/json');
+    $response->send();
+
+}

examples/relational/authcode_grant.php

@@ -0,0 +1,139 @@
+<?php
+use \Orno\Http\Request;
+use \Orno\Http\Response;
+use \Orno\Http\JsonResponse;
+use \Orno\Http\Exception\NotFoundException;
+use \League\OAuth2\Server\ResourceServer;
+use \RelationalExample\Storage;
+use \RelationalExample\Model;
+use Illuminate\Database\Capsule\Manager as Capsule;
+use \League\Event\Emitter;
+
+include __DIR__.'/vendor/autoload.php';
+
+// Routing setup
+$request = (new Request)->createFromGlobals();
+$router = new \Orno\Route\RouteCollection;
+$router->setStrategy(\Orno\Route\RouteStrategyInterface::RESTFUL_STRATEGY);
+
+// Set up the OAuth 2.0 authorization server
+$server = new \League\OAuth2\Server\AuthorizationServer;
+$server->setSessionStorage(new Storage\SessionStorage);
+$server->setAccessTokenStorage(new Storage\AccessTokenStorage);
+$server->setRefreshTokenStorage(new Storage\RefreshTokenStorage);
+$server->setClientStorage(new Storage\ClientStorage);
+$server->setScopeStorage(new Storage\ScopeStorage);
+$server->setAuthCodeStorage(new Storage\AuthCodeStorage);
+
+$authCodeGrant = new \League\OAuth2\Server\Grant\AuthCodeGrant();
+$server->addGrantType($authCodeGrant);
+
+$refrehTokenGrant = new \League\OAuth2\Server\Grant\RefreshTokenGrant();
+$server->addGrantType($refrehTokenGrant);
+
+// Routing setup
+$request = (new Request)->createFromGlobals();
+$router = new \Orno\Route\RouteCollection;
+
+$router->get('/authorize', function (Request $request) use ($server) {
+
+    // First ensure the parameters in the query string are correct
+
+    try {
+
+        $authParams = $server->getGrantType('authorization_code')->checkAuthorizeParams();
+
+    } catch (\Exception $e) {
+
+        return new Response(
+            json_encode([
+                'error'     =>  $e->errorType,
+                'message'   =>  $e->getMessage()
+            ]),
+            $e->httpStatusCode,
+            $e->getHttpHeaders()
+        );
+
+    }
+
+    // Normally at this point you would show the user a sign-in screen and ask them to authorize the requested scopes
+
+    // ...
+
+    // ...
+
+    // ...
+
+    // Create a new authorize request which will respond with a redirect URI that the user will be redirected to
+
+    $redirectUri = $server->getGrantType('authorization_code')->newAuthorizeRequest('user', 1, $authParams);
+
+    $response = new Response('', 200, [
+        'Location'  =>  $redirectUri
+    ]);
+
+    return $response;
+});
+
+$router->post('/access_token', function (Request $request) use ($server) {
+
+    try {
+
+        $response = $server->issueAccessToken();
+        return new Response(json_encode($response), 200);
+
+    } catch (\Exception $e) {
+
+        return new Response(
+            json_encode([
+                'error'     =>  $e->errorType,
+                'message'   =>  $e->getMessage()
+            ]),
+            $e->httpStatusCode,
+            $e->getHttpHeaders()
+        );
+
+    }
+
+});
+
+$dispatcher = $router->getDispatcher();
+
+try {
+
+    // A successful response
+    $response = $dispatcher->dispatch(
+        $request->getMethod(),
+        $request->getPathInfo()
+    );
+
+} catch (\Orno\Http\Exception $e) {
+
+    // A failed response
+    $response = $e->getJsonResponse();
+    $response->setContent(json_encode(['status_code' => $e->getStatusCode(), 'message' => $e->getMessage()]));
+
+} catch (\League\OAuth2\Server\Exception\OAuthException $e) {
+
+    $response = new Response(json_encode([
+        'error'     =>  $e->errorType,
+        'message'   =>  $e->getMessage()
+    ]), $e->httpStatusCode);
+
+    foreach ($e->getHttpHeaders() as $header) {
+        $response->headers($header);
+    }
+
+} catch (\Exception $e) {
+
+    $response = new Orno\Http\Response;
+    $response->setStatusCode(500);
+    $response->setContent(json_encode(['status_code' => 500, 'message' => $e->getMessage()]));
+
+} finally {
+
+    // Return the response
+    $response->headers->set('Content-type', 'application/json');
+    $response->send();
+
+}

examples/relational/composer.json

@@ -0,0 +1,17 @@
+{
+    "require": {
+        "illuminate/database": "4.1.*",
+        "orno/route": "1.*",
+        "ircmaxell/password-compat": "1.0.2",
+        "league/event": "0.2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "League\\OAuth2\\Server\\": "../../src/",
+            "RelationalExample\\": "."
+        },
+        "files": [
+            "config/db.php"
+        ]
+    }
+}

examples/relational/config/db.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace RelationalExample\Config;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+include __DIR__.'/../vendor/autoload.php';
+
+$capsule = new Capsule;
+
+$capsule->addConnection([
+    'driver'    => 'sqlite',
+    'database'  => __DIR__.'/oauth2.sqlite3',
+    'charset'   => 'utf8',
+    'collation' => 'utf8_unicode_ci'
+]);
+
+$capsule->setAsGlobal();

examples/relational/config/init.php

@@ -0,0 +1,249 @@
+<?php
+
+namespace RelationalExample\Config;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+include __DIR__.'/../vendor/autoload.php';
+
+@unlink(__DIR__.'/oauth2.sqlite3');
+touch(__DIR__.'/oauth2.sqlite3');
+
+Capsule::statement('PRAGMA foreign_keys = ON');
+
+/******************************************************************************/
+
+print 'Creating users table'.PHP_EOL;
+
+Capsule::schema()->create('users', function ($table) {
+    $table->increments('id');
+    $table->string('username');
+    $table->string('password');
+    $table->string('name');
+    $table->string('email');
+    $table->string('photo');
+});
+
+Capsule::table('users')->insert([
+    'username'  =>  'alexbilbie',
+    'password'  =>  password_hash('whisky', PASSWORD_DEFAULT),
+    'name'      =>  'Alex Bilbie',
+    'email'     =>  'hello@alexbilbie.com',
+    'photo'     =>  'https://s.gravatar.com/avatar/14902eb1dac66b8458ebbb481d80f0a3'
+]);
+
+Capsule::table('users')->insert([
+    'username'  =>  'philsturgeon',
+    'password'  =>  password_hash('cider', PASSWORD_DEFAULT),
+    'name'      =>  'Phil Sturgeon',
+    'email'     =>  'email@philsturgeon.co.uk',
+    'photo'     =>  'https://s.gravatar.com/avatar/14df293d6c5cd6f05996dfc606a6a951'
+]);
+
+/******************************************************************************/
+
+print 'Creating clients table'.PHP_EOL;
+
+Capsule::schema()->create('oauth_clients', function ($table) {
+    $table->string('id');
+    $table->string('secret');
+    $table->string('name');
+    $table->primary('id');
+});
+
+Capsule::table('oauth_clients')->insert([
+    'id'        =>  'testclient',
+    'secret'    =>  'secret',
+    'name'      =>  'Test Client'
+]);
+
+/******************************************************************************/
+
+print 'Creating client redirect uris table'.PHP_EOL;
+
+Capsule::schema()->create('oauth_client_redirect_uris', function ($table) {
+    $table->increments('id');
+    $table->string('client_id');
+    $table->string('redirect_uri');
+});
+
+Capsule::table('oauth_client_redirect_uris')->insert([
+    'client_id'     =>  'testclient',
+    'redirect_uri'  =>  'http://example.com/redirect'
+]);
+
+/******************************************************************************/
+
+print 'Creating scopes table'.PHP_EOL;
+
+Capsule::schema()->create('oauth_scopes', function ($table) {
+    $table->string('id');
+    $table->string('description');
+    $table->primary('id');
+});
+
+Capsule::table('oauth_scopes')->insert([
+    'id'            =>  'basic',
+    'description'   =>  'Basic details about your account'
+]);
+
+Capsule::table('oauth_scopes')->insert([
+    'id'            =>  'email',
+    'description'   =>  'Your email address'
+]);
+
+Capsule::table('oauth_scopes')->insert([
+    'id'            =>  'photo',
+    'description'   =>  'Your photo'
+]);
+
+/******************************************************************************/
+
+print 'Creating sessions table'.PHP_EOL;
+
+Capsule::schema()->create('oauth_sessions', function ($table) {
+    $table->increments('id');
+    $table->string('owner_type');
+    $table->string('owner_id');
+    $table->string('client_id');
+    $table->string('client_redirect_uri')->nullable();
+
+    $table->foreign('client_id')->references('id')->on('oauth_clients')->onDelete('cascade');
+});
+
+Capsule::table('oauth_sessions')->insert([
+    'owner_type'    =>  'client',
+    'owner_id'      =>  'testclient',
+    'client_id'     =>  'testclient'
+]);
+
+Capsule::table('oauth_sessions')->insert([
+    'owner_type'    =>  'user',
+    'owner_id'      =>  '1',
+    'client_id'     =>  'testclient'
+]);
+
+Capsule::table('oauth_sessions')->insert([
+    'owner_type'    =>  'user',
+    'owner_id'      =>  '2',
+    'client_id'     =>  'testclient'
+]);
+
+/******************************************************************************/
+
+print 'Creating access tokens table'.PHP_EOL;
+
+Capsule::schema()->create('oauth_access_tokens', function ($table) {
+    $table->string('access_token')->primary();
+    $table->integer('session_id');
+    $table->integer('expire_time');
+
+    $table->foreign('session_id')->references('id')->on('oauth_sessions')->onDelete('cascade');
+});
+
+Capsule::table('oauth_access_tokens')->insert([
+    'access_token'  =>  'iamgod',
+    'session_id'    =>  '1',
+    'expire_time'   =>  time() + 86400
+]);
+
+Capsule::table('oauth_access_tokens')->insert([
+    'access_token'  =>  'iamalex',
+    'session_id'    =>  '2',
+    'expire_time'   =>  time() + 86400
+]);
+
+Capsule::table('oauth_access_tokens')->insert([
+    'access_token'  =>  'iamphil',
+    'session_id'    =>  '3',
+    'expire_time'   =>  time() + 86400
+]);
+
+/******************************************************************************/
+
+print 'Creating refresh tokens table'.PHP_EOL;
+
+Capsule::schema()->create('oauth_refresh_tokens', function ($table) {
+    $table->string('refresh_token')->primary();
+    $table->integer('expire_time');
+    $table->string('access_token');
+
+    $table->foreign('access_token')->references('id')->on('oauth_access_tokens')->onDelete('cascade');
+});
+
+/******************************************************************************/
+
+print 'Creating auth codes table'.PHP_EOL;
+
+Capsule::schema()->create('oauth_auth_codes', function ($table) {
+    $table->string('auth_code')->primary();
+    $table->integer('session_id');
+    $table->integer('expire_time');
+    $table->string('client_redirect_uri');
+
+    $table->foreign('session_id')->references('id')->on('oauth_sessions')->onDelete('cascade');
+});
+
+/******************************************************************************/
+
+print 'Creating oauth access token scopes table'.PHP_EOL;
+
+Capsule::schema()->create('oauth_access_token_scopes', function ($table) {
+    $table->increments('id');
+    $table->string('access_token');
+    $table->string('scope');
+
+    $table->foreign('access_token')->references('access_token')->on('oauth_access_tokens')->onDelete('cascade');
+    $table->foreign('scope')->references('id')->on('oauth_scopes')->onDelete('cascade');
+});
+
+Capsule::table('oauth_access_token_scopes')->insert([
+    'access_token'  =>  'iamgod',
+    'scope'         =>  'basic'
+]);
+
+Capsule::table('oauth_access_token_scopes')->insert([
+    'access_token'  =>  'iamgod',
+    'scope'         =>  'email'
+]);
+
+Capsule::table('oauth_access_token_scopes')->insert([
+    'access_token'  =>  'iamgod',
+    'scope'         =>  'photo'
+]);
+
+Capsule::table('oauth_access_token_scopes')->insert([
+    'access_token'  =>  'iamphil',
+    'scope'         =>  'email'
+]);
+
+Capsule::table('oauth_access_token_scopes')->insert([
+    'access_token'  =>  'iamalex',
+    'scope'         =>  'photo'
+]);
+
+/******************************************************************************/
+
+print 'Creating oauth auth code scopes table'.PHP_EOL;
+
+Capsule::schema()->create('oauth_auth_code_scopes', function ($table) {
+    $table->increments('id');
+    $table->string('auth_code');
+    $table->string('scope');
+
+    $table->foreign('auth_code')->references('auth_code')->on('oauth_auth_codes')->onDelete('cascade');
+    $table->foreign('scope')->references('id')->on('oauth_scopes')->onDelete('cascade');
+});
+
+/******************************************************************************/
+
+print 'Creating oauth session scopes table'.PHP_EOL;
+
+Capsule::schema()->create('oauth_session_scopes', function ($table) {
+    $table->increments('id');
+    $table->string('session_id');
+    $table->string('scope');
+
+    $table->foreign('session_id')->references('id')->on('oauth_sessions')->onDelete('cascade');
+    $table->foreign('scope')->references('id')->on('oauth_scopes')->onDelete('cascade');
+});

examples/relational/other_grants.php

@@ -0,0 +1,114 @@
+<?php
+use \Orno\Http\Request;
+use \Orno\Http\Response;
+use \Orno\Http\JsonResponse;
+use \Orno\Http\Exception\NotFoundException;
+use \League\OAuth2\Server\ResourceServer;
+use \RelationalExample\Storage;
+use \RelationalExample\Model;
+use Illuminate\Database\Capsule\Manager as Capsule;
+use \League\Event\Emitter;
+
+include __DIR__.'/vendor/autoload.php';
+
+// Routing setup
+$request = (new Request)->createFromGlobals();
+$router = new \Orno\Route\RouteCollection;
+$router->setStrategy(\Orno\Route\RouteStrategyInterface::RESTFUL_STRATEGY);
+
+// Set up the OAuth 2.0 authorization server
+$server = new \League\OAuth2\Server\AuthorizationServer;
+$server->setSessionStorage(new Storage\SessionStorage);
+$server->setAccessTokenStorage(new Storage\AccessTokenStorage);
+$server->setRefreshTokenStorage(new Storage\RefreshTokenStorage);
+$server->setClientStorage(new Storage\ClientStorage);
+$server->setScopeStorage(new Storage\ScopeStorage);
+$server->setAuthCodeStorage(new Storage\AuthCodeStorage);
+
+$clientCredentials = new \League\OAuth2\Server\Grant\ClientCredentialsGrant();
+$server->addGrantType($clientCredentials);
+
+$passwordGrant = new \League\OAuth2\Server\Grant\PasswordGrant();
+$passwordGrant->setVerifyCredentialsCallback(function ($username, $password) {
+    $result = (new Model\Users())->get($username);
+    if (count($result) !== 1) {
+        return false;
+    }
+
+    if (password_verify($password, $result[0]['password'])) {
+        return $username;
+    }
+
+    return false;
+});
+$server->addGrantType($passwordGrant);
+
+$refrehTokenGrant = new \League\OAuth2\Server\Grant\RefreshTokenGrant();
+$server->addGrantType($refrehTokenGrant);
+
+// Routing setup
+$request = (new Request)->createFromGlobals();
+$router = new \Orno\Route\RouteCollection;
+
+$router->post('/access_token', function (Request $request) use ($server) {
+
+    try {
+
+        $response = $server->issueAccessToken();
+        return new Response(json_encode($response), 200);
+
+    } catch (\Exception $e) {
+
+        return new Response(
+            json_encode([
+                'error'     =>  $e->errorType,
+                'message'   =>  $e->getMessage()
+            ]),
+            $e->httpStatusCode,
+            $e->getHttpHeaders()
+        );
+
+    }
+
+});
+
+$dispatcher = $router->getDispatcher();
+
+try {
+
+    // A successful response
+    $response = $dispatcher->dispatch(
+        $request->getMethod(),
+        $request->getPathInfo()
+    );
+
+} catch (\Orno\Http\Exception $e) {
+
+    // A failed response
+    $response = $e->getJsonResponse();
+    $response->setContent(json_encode(['status_code' => $e->getStatusCode(), 'message' => $e->getMessage()]));
+
+} catch (\League\OAuth2\Server\Exception\OAuthException $e) {
+
+    $response = new Response(json_encode([
+        'error'     =>  $e->errorType,
+        'message'   =>  $e->getMessage()
+    ]), $e->httpStatusCode);
+
+    foreach ($e->getHttpHeaders() as $header) {
+        $response->headers($header);
+    }
+
+} catch (\Exception $e) {
+
+    $response = new Orno\Http\Response;
+    $response->setStatusCode(500);
+    $response->setContent(json_encode(['status_code' => 500, 'message' => $e->getMessage()]));
+
+} finally {
+
+    // Return the response
+    $response->headers->set('Content-type', 'application/json');
+    $response->send();
+
+}

license.txt

@@ -1,20 +1,20 @@
 MIT License
 
-Copyright (C) 2012 University of Lincoln
+Copyright (C) Alex Bilbie
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 the Software, and to permit persons to whom the Software is furnished to do so,
 subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all 
+The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

phpunit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="true" stopOnFailure="true" stopOnIncomplete="false" stopOnSkipped="false" bootstrap="tests/unit/Bootstrap.php">
+	<testsuites>
+		<testsuite name="Tests">
+		   <directory>./tests/unit/</directory>
+	   </testsuite>
+	</testsuites>
+	<filter>
+		<whitelist addUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">src</directory>
+		</whitelist>
+	</filter>
+	<logging>
+		<!-- <log type="coverage-text" target="php://stdout" title="thephpleague/oauth2-server" charset="UTF-8" yui="true" highlight="true" lowUpperBound="60" highLowerBound="90"/> -->
+		<log type="coverage-html" target="build/coverage" title="thephpleague/oauth2-server" charset="UTF-8" yui="true" highlight="true" lowUpperBound="60" highLowerBound="90"/>
+	</logging>
+</phpunit>

sql/mysql.sql

@@ -1,53 +0,0 @@
-CREATE TABLE `oauth_clients` (
-  `id` varchar(40) NOT NULL DEFAULT '',
-  `secret` varchar(40) NOT NULL DEFAULT '',
-  `name` varchar(255) NOT NULL DEFAULT '',
-  `auto_approve` tinyint(1) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `oauth_client_endpoints` (
-  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `client_id` varchar(40) NOT NULL DEFAULT '',
-  `redirect_uri` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `client_id` (`client_id`),
-  CONSTRAINT `oauth_client_endpoints_ibfk_1` FOREIGN KEY (`client_id`) REFERENCES `oauth_clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `oauth_sessions` (
-  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `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 '',
-  `auth_code` varchar(40) DEFAULT '',
-  `access_token` varchar(40) DEFAULT '',
-  `refresh_token` varchar(40) DEFAULT '',
-  `access_token_expires` int(10) DEFAULT NULL,
-  `stage` enum('requested','granted') NOT NULL DEFAULT 'requested',
-  `first_requested` int(10) unsigned NOT NULL,
-  `last_updated` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `client_id` (`client_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `oauth_scopes` (
-  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `scope` varchar(255) NOT NULL DEFAULT '',
-  `name` varchar(255) NOT NULL DEFAULT '',
-  `description` varchar(255) DEFAULT '',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `scope` (`scope`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `oauth_session_scopes` (
-  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `session_id` int(11) unsigned NOT NULL,
-  `scope_id` int(11) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `session_id` (`session_id`),
-  KEY `scope_id` (`scope_id`),
-  CONSTRAINT `oauth_session_scopes_ibfk_5` FOREIGN KEY (`scope_id`) REFERENCES `oauth_scopes` (`id`) ON DELETE CASCADE,
-  CONSTRAINT `oauth_session_scopes_ibfk_4` FOREIGN KEY (`session_id`) REFERENCES `oauth_sessions` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;

src/AbstractServer.php

@@ -0,0 +1,302 @@
+<?php
+/**
+ * OAuth 2.0 Abstract Server
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server;
+
+use League\OAuth2\Server\Exception;
+use League\OAuth2\Server\TokenType\TokenTypeInterface;
+use League\OAuth2\Server\Storage\SessionInterface;
+use League\OAuth2\Server\Storage\AccessTokenInterface;
+use League\OAuth2\Server\Storage\RefreshTokenInterface;
+use League\OAuth2\Server\Storage\AuthCodeInterface;
+use League\OAuth2\Server\Storage\ScopeInterface;
+use League\OAuth2\Server\Storage\ClientInterface;
+use Symfony\Component\HttpFoundation\Request;
+use League\Event\Emitter;
+
+/**
+ * OAuth 2.0 Resource Server
+ */
+
+abstract class AbstractServer
+{
+    /**
+     * The request object
+     *
+     * @var \Symfony\Component\HttpFoundation\Request
+     */
+    protected $request;
+
+    /**
+     * Session storage
+     * @var \League\OAuth2\Server\Storage\SessionInterface
+     */
+    protected $sessionStorage;
+
+    /**
+     * Access token storage
+     * @var \League\OAuth2\Server\Storage\AccessTokenInterface
+     */
+    protected $accessTokenStorage;
+
+    /**
+     * Refresh token storage
+     * @var \League\OAuth2\Server\Storage\RefreshTokenInterface
+     */
+    protected $refreshTokenStorage;
+
+    /**
+     * Auth code storage
+     * @var \League\OAuth2\Server\Storage\AuthCodeInterface
+     */
+    protected $authCodeStorage;
+
+    /**
+     * Scope storage
+     * @var \League\OAuth2\Server\Storage\ScopeInterface
+     */
+    protected $scopeStorage;
+
+    /**
+     * Client storage
+     * @var \League\OAuth2\Server\Storage\ClientInterface
+     */
+    protected $clientStorage;
+
+    /**
+     * Token type
+     * @var \League\OAuth2\Server\TokenType\TokenTypeInterface
+     */
+    protected $tokenType;
+
+    /**
+     * Event emitter
+     * @var \League\Event\Emitter
+     */
+    protected $eventEmitter;
+
+    /**
+     * Abstract server constructor
+     */
+    public function __construct()
+    {
+        $this->setEventEmitter();
+    }
+
+    /**
+     * Set an event emitter
+     * @param object $emitter Event emitter object
+     */
+    public function setEventEmitter($emitter = null)
+    {
+        if ($emitter === null) {
+            $this->eventEmitter = new Emitter;
+        } else {
+            $this->eventEmitter = $emitter;
+        }
+    }
+
+    /**
+     * Add an event listener to the event emitter
+     * @param string   $eventName Event name
+     * @param callable $listener  Callable function or method
+     */
+    public function addEventListener($eventName, callable $listener)
+    {
+        $this->eventEmitter->addListener($eventName, $listener);
+    }
+
+    /**
+     * Returns the event emitter
+     * @return \League\Event\Emitter
+     */
+    public function getEventEmitter()
+    {
+        return $this->eventEmitter;
+    }
+
+    /**
+     * Sets the Request Object
+     * @param \Symfony\Component\HttpFoundation\Request The Request Object
+     * @return self
+     */
+    public function setRequest($request)
+    {
+        $this->request = $request;
+
+        return $this;
+    }
+
+    /**
+     * Gets the Request object. It will create one from the globals if one is not set.
+     * @return \Symfony\Component\HttpFoundation\Request
+     */
+    public function getRequest()
+    {
+        if ($this->request === null) {
+            $this->request = Request::createFromGlobals();
+        }
+
+        return $this->request;
+    }
+
+    /**
+     * Set the client storage
+     * @param  \League\OAuth2\Server\Storage\ClientInterface $storage
+     * @return self
+     */
+    public function setClientStorage(ClientInterface $storage)
+    {
+        $storage->setServer($this);
+        $this->clientStorage = $storage;
+
+        return $this;
+    }
+
+    /**
+     * Set the session storage
+     * @param  \League\OAuth2\Server\Storage\SessionInterface $storage
+     * @return self
+     */
+    public function setSessionStorage(SessionInterface $storage)
+    {
+        $storage->setServer($this);
+        $this->sessionStorage = $storage;
+
+        return $this;
+    }
+
+    /**
+     * Set the access token storage
+     * @param  \League\OAuth2\Server\Storage\AccessTokenInterface $storage
+     * @return self
+     */
+    public function setAccessTokenStorage(AccessTokenInterface $storage)
+    {
+        $storage->setServer($this);
+        $this->accessTokenStorage = $storage;
+
+        return $this;
+    }
+
+    /**
+     * Set the refresh token storage
+     * @param  \League\OAuth2\Server\Storage\RefreshTokenInteface $storage
+     * @return self
+     */
+    public function setRefreshTokenStorage(RefreshTokenInterface $storage)
+    {
+        $storage->setServer($this);
+        $this->refreshTokenStorage = $storage;
+
+        return $this;
+    }
+
+    /**
+     * Set the auth code storage
+     * @param  \League\OAuth2\Server\Storage\AuthCodeInterface $authCode
+     * @return self
+     */
+    public function setAuthCodeStorage(AuthCodeInterface $storage)
+    {
+        $storage->setServer($this);
+        $this->authCodeStorage = $storage;
+
+        return $this;
+    }
+
+    /**
+     * Set the scope storage
+     * @param  \League\OAuth2\Server\Storage\ScopeInterface $storage
+     * @return self
+     */
+    public function setScopeStorage(ScopeInterface $storage)
+    {
+        $storage->setServer($this);
+        $this->scopeStorage = $storage;
+
+        return $this;
+    }
+
+    /**
+     * Return the client storage
+     * @return \League\OAuth2\Server\Storage\ClientInterface
+     */
+    public function getClientStorage()
+    {
+        return $this->clientStorage;
+    }
+
+    /**
+     * Return the scope storage
+     * @return \League\OAuth2\Server\Storage\ScopeInterface
+     */
+    public function getScopeStorage()
+    {
+        return $this->scopeStorage;
+    }
+
+    /**
+     * Return the session storage
+     * @return \League\OAuth2\Server\Storage\SessionInterface
+     */
+    public function getSessionStorage()
+    {
+        return $this->sessionStorage;
+    }
+
+    /**
+     * Return the refresh token storage
+     * @return \League\OAuth2\Server\Storage\RefreshTokenInterface
+     */
+    public function getRefreshTokenStorage()
+    {
+        return $this->refreshTokenStorage;
+    }
+
+    /**
+     * Return the access token storage
+     * @return \League\OAuth2\Server\Storage\AccessTokenInterface
+     */
+    public function getAccessTokenStorage()
+    {
+        return $this->accessTokenStorage;
+    }
+
+    /**
+     * Return the auth code storage
+     * @return \League\OAuth2\Server\Storage\AuthCodeInterface
+     */
+    public function getAuthCodeStorage()
+    {
+        return $this->authCodeStorage;
+    }
+
+    /**
+     * Set the access token type
+     * @param  TokenTypeInterface $tokenType The token type
+     * @return void
+     */
+    public function setTokenType(TokenTypeInterface $tokenType)
+    {
+        $tokenType->setServer($this);
+        $this->tokenType = $tokenType;
+    }
+
+    /**
+     * Get the access token type
+     * @return TokenTypeInterface
+     */
+    public function getTokenType()
+    {
+        return $this->tokenType;
+    }
+}

src/AuthorizationServer.php

@@ -0,0 +1,266 @@
+<?php
+/**
+ * OAuth 2.0 Authorization Server
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server;
+
+use League\OAuth2\Server\Grant\GrantTypeInterface;
+use League\OAuth2\Server\Storage\ClientInterface;
+use League\OAuth2\Server\Storage\AccessTokenInterface;
+use League\OAuth2\Server\Storage\AuthCodeInterface;
+use League\OAuth2\Server\Storage\RefreshTokenInterface;
+use League\OAuth2\Server\Storage\SessionInterface;
+use League\OAuth2\Server\Storage\ScopeInterface;
+use League\OAuth2\Server\TokenType\Bearer;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * OAuth 2.0 authorization server class
+ */
+class AuthorizationServer extends AbstractServer
+{
+    /**
+     * The delimeter between scopes specified in the scope query string parameter
+     * The OAuth 2 specification states it should be a space but most use a comma
+     * @var string
+     */
+    protected $scopeDelimeter = ' ';
+
+    /**
+     * The TTL (time to live) of an access token in seconds (default: 3600)
+     * @var integer
+     */
+    protected $accessTokenTTL = 3600;
+
+    /**
+     * The registered grant response types
+     * @var array
+     */
+    protected $responseTypes = [];
+
+    /**
+     * The registered grant types
+     * @var array
+     */
+    protected $grantTypes = [];
+
+    /**
+     * Require the "scope" parameter to be in checkAuthoriseParams()
+     * @var boolean
+     */
+    protected $requireScopeParam = false;
+
+    /**
+     * Default scope(s) to be used if none is provided
+     * @var string|array
+     */
+    protected $defaultScope;
+
+    /**
+     * Require the "state" parameter to be in checkAuthoriseParams()
+     * @var boolean
+     */
+    protected $requireStateParam = false;
+
+    /**
+     * Create a new OAuth2 authorization server
+     * @return self
+     */
+    public function __construct()
+    {
+        // Set Bearer as the default token type
+        $this->setTokenType(new Bearer);
+
+        parent::__construct();
+
+        return $this;
+    }
+
+    /**
+     * Enable support for a grant
+     * @param  GrantTypeInterface $grantType  A grant class which conforms to Interface/GrantTypeInterface
+     * @param  null|string        $identifier An identifier for the grant (autodetected if not passed)
+     * @return self
+     */
+    public function addGrantType(GrantTypeInterface $grantType, $identifier = null)
+    {
+        if (is_null($identifier)) {
+            $identifier = $grantType->getIdentifier();
+        }
+
+        // Inject server into grant
+        $grantType->setAuthorizationServer($this);
+
+        $this->grantTypes[$identifier] = $grantType;
+
+        if (!is_null($grantType->getResponseType())) {
+            $this->responseTypes[] = $grantType->getResponseType();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Check if a grant type has been enabled
+     * @param  string  $identifier The grant type identifier
+     * @return boolean Returns "true" if enabled, "false" if not
+     */
+    public function hasGrantType($identifier)
+    {
+        return (array_key_exists($identifier, $this->grantTypes));
+    }
+
+    /**
+     * Returns response types
+     * @return array
+     */
+    public function getResponseTypes()
+    {
+        return $this->responseTypes;
+    }
+
+    /**
+     * Require the "scope" paremter in checkAuthoriseParams()
+     * @param  boolean $require
+     * @return self
+     */
+    public function requireScopeParam($require = true)
+    {
+        $this->requireScopeParam = $require;
+
+        return $this;
+    }
+
+    /**
+     * Is the scope parameter required?
+     * @return bool
+     */
+    public function scopeParamRequired()
+    {
+        return $this->requireScopeParam;
+    }
+
+    /**
+     * Default scope to be used if none is provided and requireScopeParam() is false
+     * @param string $default Name of the default scope
+     * @param self
+     */
+    public function setDefaultScope($default = null)
+    {
+        $this->defaultScope = $default;
+
+        return $this;
+    }
+
+    /**
+     * Default scope to be used if none is provided and requireScopeParam is false
+     * @return string|null
+     */
+    public function getDefaultScope()
+    {
+        return $this->defaultScope;
+    }
+
+    /**
+     * Require the "state" paremter in checkAuthoriseParams()
+     * @param  boolean $require
+     * @return void
+     */
+    public function stateParamRequired()
+    {
+        return $this->requireStateParam;
+    }
+
+    /**
+     * Require the "state" paremter in checkAuthoriseParams()
+     * @param  boolean $require
+     * @return void
+     */
+    public function requireStateParam($require = true)
+    {
+        $this->requireStateParam = $require;
+
+        return $this;
+    }
+
+    /**
+     * Get the scope delimeter
+     * @return string The scope delimiter (default: ",")
+     */
+    public function getScopeDelimeter()
+    {
+        return $this->scopeDelimeter;
+    }
+
+    /**
+     * Set the scope delimiter
+     * @param string $scopeDelimeter
+     */
+    public function setScopeDelimeter($scopeDelimeter = ' ')
+    {
+        $this->scopeDelimeter = $scopeDelimeter;
+
+        return $this;
+    }
+
+    /**
+     * Get the TTL for an access token
+     * @return int The TTL
+     */
+    public function getAccessTokenTTL()
+    {
+        return $this->accessTokenTTL;
+    }
+
+    /**
+     * Set the TTL for an access token
+     * @param int $accessTokenTTL The new TTL
+     */
+    public function setAccessTokenTTL($accessTokenTTL = 3600)
+    {
+        $this->accessTokenTTL = $accessTokenTTL;
+
+        return $this;
+    }
+
+    /**
+     * Issue an access token
+     * @return array Authorise request parameters
+     */
+    public function issueAccessToken()
+    {
+        $grantType = $this->getRequest()->request->get('grant_type');
+        if (is_null($grantType)) {
+            throw new Exception\InvalidRequestException('grant_type');
+        }
+
+        // Ensure grant type is one that is recognised and is enabled
+        if (!in_array($grantType, array_keys($this->grantTypes))) {
+            throw new Exception\UnsupportedGrantTypeException($grantType);
+        }
+
+        // Complete the flow
+        return $this->getGrantType($grantType)->completeFlow();
+    }
+
+    /**
+     * Return a grant type class
+     * @param  string                   $grantType The grant type identifer
+     * @return Grant\GrantTypeInterface
+     */
+    public function getGrantType($grantType)
+    {
+        if (isset($this->grantTypes[$grantType])) {
+            return $this->grantTypes[$grantType];
+        }
+
+        throw new Exception\InvalidGrantException($grantType);
+    }
+}

src/Entity/AbstractTokenEntity.php

@@ -0,0 +1,187 @@
+<?php
+/**
+ * OAuth 2.0 Abstract token
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Entity;
+
+use League\OAuth2\Server\Util\SecureKey;
+use League\OAuth2\Server\AbstractServer;
+use Symfony\Component\HttpFoundation\ParameterBag;
+use League\OAuth2\Server\Entity\SessionEntity;
+
+/**
+ * Abstract token class
+ */
+abstract class AbstractTokenEntity
+{
+    /**
+     * Token identifier
+     * @var string
+     */
+    protected $id;
+
+    /**
+     * Associated session
+     * @var \League\OAuth2\Server\Entity\SessionEntity
+     */
+    protected $session;
+
+    /**
+     * Session scopes
+     * @var \League\OAuth2\Server\Entity\ScopeEntity[]
+     */
+    protected $scopes;
+
+    /**
+     * Token expire time
+     * @var int
+     */
+    protected $expireTime = 0;
+
+    /**
+     * Authorization or resource server
+     * @var \League\OAuth2\Server\AbstractServer
+     */
+    protected $server;
+
+    /**
+     * __construct
+     * @param  \League\OAuth2\Server\AbstractServer $server
+     * @return self
+     */
+    public function __construct(AbstractServer $server)
+    {
+        $this->server = $server;
+
+        return $this;
+    }
+
+    /**
+     * Set session
+     * @param  \League\OAuth2\Server\Entity\SessionEntity $session
+     * @return self
+     */
+    public function setSession(SessionEntity $session)
+    {
+        $this->session = $session;
+
+        return $this;
+    }
+
+    /**
+     * Set the expire time of the token
+     * @param  integer $expireTime Unix time stamp
+     * @return self
+     */
+    public function setExpireTime($expireTime)
+    {
+        $this->expireTime = $expireTime;
+
+        return $this;
+    }
+
+    /**
+     * Return token expire time
+     * @return int
+     */
+    public function getExpireTime()
+    {
+        return $this->expireTime;
+    }
+
+    /**
+     * Is the token expired?
+     * @return bool
+     */
+    public function isExpired()
+    {
+        return ((time() - $this->expireTime) > 0);
+    }
+
+    /**
+     * Set token ID
+     * @param  string $token Token ID
+     * @return self
+     */
+    public function setId($id = null)
+    {
+        $this->id = ($id !== null) ? $id : SecureKey::generate();
+
+        return $this;
+    }
+
+    /**
+     * Get the token ID
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Associate a scope
+     * @param  \League\OAuth2\Server\Entity\ScopeEntity $scope
+     * @return self
+     */
+    public function associateScope(ScopeEntity $scope)
+    {
+        if (!isset($this->scopes[$scope->getId()])) {
+            $this->scopes[$scope->getId()] = $scope;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Format the local scopes array
+     * @param  \League\OAuth2\Server\Entity\ScopeEntity[]
+     * @return array
+     */
+    protected function formatScopes($unformatted = [])
+    {
+        if (is_null($unformatted)) {
+            return [];
+        }
+
+        $scopes = [];
+        foreach ($unformatted as $scope) {
+            if ($scope instanceof ScopeEntity) {
+                $scopes[$scope->getId()] = $scope;
+            }
+        }
+
+        return $scopes;
+    }
+
+    /**
+     * Returns the token as a string if the object is cast as a string
+     * @return string
+     */
+    public function __toString()
+    {
+        if ($this->id === null) {
+            return '';
+        }
+        return $this->id;
+    }
+
+    /**
+     * Expire the token
+     * @return void
+     */
+    abstract public function expire();
+
+    /**
+     * Save the token
+     * @return void
+     */
+    abstract public function save();
+}

src/Entity/AccessTokenEntity.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * OAuth 2.0 Access token entity
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Entity;
+
+/**
+ * Access token entity class
+ */
+class AccessTokenEntity extends AbstractTokenEntity
+{
+    /**
+     * Get session
+     * @return \League\OAuth2\Server\Entity\SessionEntity
+     */
+    public function getSession()
+    {
+        if ($this->session instanceof SessionEntity) {
+            return $this->session;
+        }
+
+        $this->session = $this->server->getSessionStorage()->getByAccessToken($this);
+
+        return $this->session;
+    }
+
+    /**
+     * Check if access token has an associated scope
+     * @param  string $scope Scope to check
+     * @return bool
+     */
+    public function hasScope($scope)
+    {
+        if ($this->scopes === null) {
+            $this->getScopes();
+        }
+
+        return isset($this->scopes[$scope]);
+    }
+
+    /**
+     * Return all scopes associated with the access token
+     * @return \League\OAuth2\Server\Entity\Scope[]
+     */
+    public function getScopes()
+    {
+        if ($this->scopes === null) {
+            $this->scopes = $this->formatScopes(
+                $this->server->getAccessTokenStorage()->getScopes($this)
+            );
+        }
+
+        return $this->scopes;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function save()
+    {
+        $this->server->getAccessTokenStorage()->create(
+            $this->getId(),
+            $this->getExpireTime(),
+            $this->getSession()->getId()
+        );
+
+        // Associate the scope with the token
+        foreach ($this->getScopes() as $scope) {
+            $this->server->getAccessTokenStorage()->associateScope($this, $scope);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function expire()
+    {
+        $this->server->getAccessTokenStorage()->delete($this);
+    }
+}

src/Entity/AuthCodeEntity.php

@@ -0,0 +1,120 @@
+<?php
+/**
+ * OAuth 2.0 Auth code entity
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Entity;
+
+/**
+ * Access token entity class
+ */
+class AuthCodeEntity extends AbstractTokenEntity
+{
+    /**
+     * Redirect URI
+     * @var string
+     */
+    protected $redirectUri = '';
+
+    /**
+     * Set the redirect URI for the authorization request
+     * @param  string $redirectUri
+     * @return self
+     */
+    public function setRedirectUri($redirectUri)
+    {
+        $this->redirectUri = $redirectUri;
+
+        return $this;
+    }
+
+    /**
+     * Get the redirect URI
+     * @return string
+     */
+    public function getRedirectUri()
+    {
+        return $this->redirectUri;
+    }
+
+    /**
+     * Generate a redirect URI
+     * @param  string $state          The state parameter if set by the client
+     * @param  string $queryDelimeter The query delimiter ('?' for auth code grant, '#' for implicit grant)
+     * @return string
+     */
+    public function generateRedirectUri($state = null, $queryDelimeter = '?')
+    {
+        $uri = $this->getRedirectUri();
+        $uri .= (strstr($this->getRedirectUri(), $queryDelimeter) === false) ? $queryDelimeter : '&';
+
+        return $uri.http_build_query([
+            'code'  =>  $this->getId(),
+            'state' =>  $state
+        ]);
+    }
+
+    /**
+     * Get session
+     * @return \League\OAuth2\Server\Entity\SessionEntity
+     */
+    public function getSession()
+    {
+        if ($this->session instanceof SessionEntity) {
+            return $this->session;
+        }
+
+        $this->session = $this->server->getSessionStorage()->getByAuthCode($this);
+
+        return $this->session;
+    }
+
+    /**
+     * Return all scopes associated with the session
+     * @return \League\OAuth2\Server\Entity\Scope[]
+     */
+    public function getScopes()
+    {
+        if ($this->scopes === null) {
+            $this->scopes = $this->formatScopes(
+                $this->server->getAuthCodeStorage()->getScopes($this)
+            );
+        }
+
+        return $this->scopes;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function save()
+    {
+        $this->server->getAuthCodeStorage()->create(
+            $this->getId(),
+            $this->getExpireTime(),
+            $this->getSession()->getId(),
+            $this->getRedirectUri()
+        );
+
+        // Associate the scope with the token
+        foreach ($this->getScopes() as $scope) {
+            $this->server->getAuthCodeStorage()->associateScope($this, $scope);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function expire()
+    {
+        $this->server->getAuthCodeStorage()->delete($this);
+    }
+}

src/Entity/ClientEntity.php

@@ -0,0 +1,100 @@
+<?php
+/**
+ * OAuth 2.0 Client entity
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Entity;
+
+use League\OAuth2\Server\AbstractServer;
+
+/**
+ * Client entity class
+ */
+class ClientEntity
+{
+    use EntityTrait;
+
+    /**
+     * Client identifier
+     * @var string
+     */
+    protected $id = null;
+
+    /**
+     * Client secret
+     * @var string
+     */
+    protected $secret = null;
+
+    /**
+     * Client name
+     * @var string
+     */
+    protected $name = null;
+
+    /**
+     * Client redirect URI
+     * @var string
+     */
+    protected $redirectUri = null;
+
+    /**
+     * Authorization or resource server
+     * @var \League\OAuth2\Server\AbstractServer
+     */
+    protected $server;
+
+    /**
+     * __construct
+     * @param  \League\OAuth2\Server\AbstractServer $server
+     * @return self
+     */
+    public function __construct(AbstractServer $server)
+    {
+        $this->server = $server;
+
+        return $this;
+    }
+
+    /**
+     * Return the client identifier
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Return the client secret
+     * @return string
+     */
+    public function getSecret()
+    {
+        return $this->secret;
+    }
+
+    /**
+     * Get the client name
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Returnt the client redirect URI
+     * @return string
+     */
+    public function getRedirectUri()
+    {
+        return $this->redirectUri;
+    }
+}

src/Entity/EntityTrait.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * OAuth 2.0 Entity trait
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Entity;
+
+trait EntityTrait
+{
+    /**
+     * Hydrate an entity with properites
+     * @param  array  $properties
+     */
+    public function hydrate(array $properties)
+    {
+        foreach ($properties as $prop => $val) {
+            if (property_exists($this, $prop)) {
+                $this->{$prop} = $val;
+            }
+        }
+
+        return $this;
+    }
+}

src/Entity/RefreshTokenEntity.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * OAuth 2.0 Refresh token entity
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Entity;
+
+/**
+ * Refresh token entity class
+ */
+class RefreshTokenEntity extends AbstractTokenEntity
+{
+    /**
+     * Access token associated to refresh token
+     * @var \League\OAuth2\Server\Entity\AccessTokenEntity
+     */
+    protected $accessTokenEntity;
+
+    /**
+     * Id of the access token
+     * @var string
+     */
+    protected $accessTokenId;
+
+    /**
+     * Set the ID of the associated access token
+     * @param  string $accessToken
+     * @return self
+     */
+    public function setAccessTokenId($accessTokenId)
+    {
+        $this->accessTokenId = $accessTokenId;
+
+        return $this;
+    }
+
+    /**
+     * Associate an access token
+     * @param  \League\OAuth2\Server\Entity\AccessTokenEntity $accessToken
+     * @return self
+     */
+    public function setAccessToken(AccessTokenEntity $accessTokenEntity)
+    {
+        $this->accessTokenEntity = $accessTokenEntity;
+
+        return $this;
+    }
+
+    /**
+     * Return access token
+     * @return AccessToken
+     */
+    public function getAccessToken()
+    {
+        if (! $this->accessTokenEntity instanceof AccessTokenEntity) {
+            $this->accessTokenEntity = $this->server->getAccessTokenStorage()->get($this->accessTokenId);
+        }
+
+        return $this->accessTokenEntity;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function save()
+    {
+        $this->server->getRefreshTokenStorage()->create(
+            $this->getId(),
+            $this->getExpireTime(),
+            $this->getAccessToken()->getId()
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function expire()
+    {
+        $this->server->getRefreshTokenStorage()->delete($this);
+    }
+}

src/Entity/ScopeEntity.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * OAuth 2.0 scope entity
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Entity;
+
+use League\OAuth2\Server\AbstractServer;
+
+/**
+ * Scope entity class
+ */
+class ScopeEntity implements \JsonSerializable
+{
+    use EntityTrait;
+
+    /**
+     * Scope identifier
+     * @var string
+     */
+    protected $id;
+
+    /**
+     * Scope description
+     * @var string
+     */
+    protected $description;
+
+    /**
+     * Authorization or resource server
+     * @var \League\OAuth2\Server\AbstractServer
+     */
+    protected $server;
+
+    /**
+     * __construct
+     * @param  \League\OAuth2\Server\AbstractServer $server
+     * @return self
+     */
+    public function __construct(AbstractServer $server)
+    {
+        $this->server = $server;
+
+        return $this;
+    }
+
+    /**
+     * Return the scope identifer
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Return the scope's description
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Returns a JSON object when entity is passed into json_encode
+     * @return array
+     */
+    public function jsonSerialize()
+    {
+        return [
+            'id'    =>  $this->getId(),
+            'description'   =>  $this->getDescription()
+        ];
+    }
+}

src/Entity/SessionEntity.php

@@ -0,0 +1,276 @@
+<?php
+/**
+ * OAuth 2.0 session entity
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Entity;
+
+use League\OAuth2\Server\AbstractServer;
+use League\OAuth2\Server\Event;
+use Symfony\Component\HttpFoundation\ParameterBag;
+
+/**
+ * Session entity grant
+ */
+class SessionEntity
+{
+    /**
+     * Session identifier
+     * @var string
+     */
+    protected $id;
+
+    /**
+     * Client identifier
+     * @var \League\OAuth2\Server\Entity\ClientEntity
+     */
+    protected $client;
+
+    /**
+     * Session owner identifier
+     * @var string
+     */
+    protected $ownerId;
+
+    /**
+     * Session owner type (e.g. "user")
+     * @var string
+     */
+    protected $ownerType;
+
+    /**
+     * Auth code
+     * @var \League\OAuth2\Server\Entity\AuthCodeEntity
+     */
+    protected $authCode;
+
+    /**
+     * Access token
+     * @var \League\OAuth2\Server\Entity\AccessTokenEntity
+     */
+    protected $accessToken;
+
+    /**
+     * Refresh token
+     * @var \League\OAuth2\Server\Entity\RefreshTokenEntity
+     */
+    protected $refreshToken;
+
+    /**
+     * Session scopes
+     * @var \Symfony\Component\HttpFoundation\ParameterBag
+     */
+    protected $scopes;
+
+    /**
+     * Authorization or resource server
+     * @var \League\OAuth2\Server\AuthorizationServer|\League\OAuth2\Server\ResourceServer
+     */
+    protected $server;
+
+    /**
+     * __construct
+     * @param  \League\OAuth2\Server\AbstractServer $server
+     * @return self
+     */
+    public function __construct(AbstractServer $server)
+    {
+        $this->server = $server;
+
+        return $this;
+    }
+
+    /**
+     * Set the session identifier
+     * @param  string $id
+     * @return self
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    /**
+     * Return the session identifier
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Associate a scope
+     * @param  \League\OAuth2\Server\Entity\ScopeEntity $scope
+     * @return self
+     */
+    public function associateScope(ScopeEntity $scope)
+    {
+        if (!isset($this->scopes[$scope->getId()])) {
+            $this->scopes[$scope->getId()] = $scope;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Check if access token has an associated scope
+     * @param  string $scope Scope to check
+     * @return bool
+     */
+    public function hasScope($scope)
+    {
+        if ($this->scopes === null) {
+            $this->getScopes();
+        }
+
+        return isset($this->scopes[$scope]);
+    }
+
+    /**
+     * Return all scopes associated with the session
+     * @return \League\OAuth2\Server\Entity\Scope[]
+     */
+    public function getScopes()
+    {
+        if ($this->scopes === null) {
+            $this->scopes = $this->formatScopes($this->server->getSessionStorage()->getScopes($this));
+        }
+
+        return $this->scopes;
+    }
+
+    /**
+     * Format the local scopes array
+     * @param  \League\OAuth2\Server\Entity\Scope[]
+     * @return array
+     */
+    private function formatScopes($unformated = [])
+    {
+        $scopes = [];
+        if (is_array($unformated)) {
+            foreach ($unformated as $scope) {
+                if ($scope instanceof ScopeEntity) {
+                    $scopes[$scope->getId()] = $scope;
+                }
+            }
+        }
+
+        return $scopes;
+    }
+
+    /**
+     * Associate an access token with the session
+     * @param  \League\OAuth2\Server\Entity\AccessTokenEntity $accessToken
+     * @return self
+     */
+    public function associateAccessToken(AccessTokenEntity $accessToken)
+    {
+        $this->accessToken = $accessToken;
+
+        return $this;
+    }
+
+    /**
+     * Associate a refresh token with the session
+     * @param  \League\OAuth2\Server\Entity\RefreshTokenEntity $refreshToken
+     * @return self
+     */
+    public function associateRefreshToken(RefreshTokenEntity $refreshToken)
+    {
+        $this->refreshToken = $refreshToken;
+
+        return $this;
+    }
+
+    /**
+     * Associate a client with the session
+     * @param  \League\OAuth2\Server\Entity\ClientEntity $client The client
+     * @return self
+     */
+    public function associateClient(ClientEntity $client)
+    {
+        $this->client = $client;
+
+        return $this;
+    }
+
+    /**
+     * Return the session client
+     * @return \League\OAuth2\Server\Entity\ClientEntity
+     */
+    public function getClient()
+    {
+        if ($this->client instanceof ClientEntity) {
+            return $this->client;
+        }
+
+        $this->client = $this->server->getClientStorage()->getBySession($this);
+
+        return $this->client;
+    }
+
+    /**
+     * Set the session owner
+     * @param  string $type The type of the owner (e.g. user, app)
+     * @param  string $id   The identifier of the owner
+     * @return self
+     */
+    public function setOwner($type, $id)
+    {
+        $this->ownerType = $type;
+        $this->ownerId = $id;
+
+        $this->server->getEventEmitter()->emit(new Event\SessionOwnerEvent($this));
+
+        return $this;
+    }
+
+    /**
+     * Return session owner identifier
+     * @return string
+     */
+    public function getOwnerId()
+    {
+        return $this->ownerId;
+    }
+
+    /**
+     * Return session owner type
+     * @return string
+     */
+    public function getOwnerType()
+    {
+        return $this->ownerType;
+    }
+
+    /**
+     * Save the session
+     * @return void
+     */
+    public function save()
+    {
+        // Save the session and get an identifier
+        $id = $this->server->getSessionStorage()->create(
+            $this->getOwnerType(),
+            $this->getOwnerId(),
+            $this->getClient()->getId(),
+            $this->getClient()->getRedirectUri()
+        );
+
+        $this->setId($id);
+
+        // Associate the scope with the session
+        foreach ($this->getScopes() as $scope) {
+            $this->server->getSessionStorage()->associateScope($this, $scope);
+        }
+    }
+}

src/Event/ClientAuthenticationFailedEvent.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * OAuth 2.0 client authentication failed event
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Event;
+
+use League\Event\AbstractEvent;
+use Symfony\Component\HttpFoundation\Request;
+
+class ClientAuthenticationFailedEvent extends AbstractEvent
+{
+    /**
+     * Request
+     * @var \Symfony\Component\HttpFoundation\Request
+     */
+    private $request;
+
+    /**
+     * Init the event with a request
+     * @param \Symfony\Component\HttpFoundation\Requesty $request
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * The name of the event
+     * @return string
+     */
+    public function getName()
+    {
+        return 'error.auth.client';
+    }
+
+    /**
+     * Return request
+     * @return \Symfony\Component\HttpFoundation\Request
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+}

src/Event/SessionOwnerEvent.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * OAuth 2.0 session owner event
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Event;
+
+use League\Event\AbstractEvent;
+use League\OAuth2\Server\Entity\SessionEntity;
+
+class SessionOwnerEvent extends AbstractEvent
+{
+    /**
+     * Session entity
+     * @var \League\OAuth2\Server\Entity\SessionEntity
+     */
+    private $session;
+
+    /**
+     * Init the event with a session
+     * @param \League\OAuth2\Server\Entity\SessionEntity $session
+     */
+    public function __construct(SessionEntity $session)
+    {
+        $this->session = $session;
+    }
+
+    /**
+     * The name of the event
+     * @return string
+     */
+    public function getName()
+    {
+        return 'session.owner';
+    }
+
+    /**
+     * Return session
+     * @return \League\OAuth2\Server\Entity\SessionEntity
+     */
+    public function getSession()
+    {
+        return $this->session;
+    }
+}

src/Event/UserAuthenticationFailedEvent.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * OAuth 2.0 user authentication failed event
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Event;
+
+use League\Event\AbstractEvent;
+use Symfony\Component\HttpFoundation\Request;
+
+class UserAuthenticationFailedEvent extends AbstractEvent
+{
+    /**
+     * Request
+     * @var \Symfony\Component\HttpFoundation\Request
+     */
+    private $request;
+
+    /**
+     * Init the event with a request
+     * @param \Symfony\Component\HttpFoundation\Requesty $request
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * The name of the event
+     * @return string
+     */
+    public function getName()
+    {
+        return 'error.auth.user';
+    }
+
+    /**
+     * Return request
+     * @return \Symfony\Component\HttpFoundation\Request
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+}

src/Exception/AccessDeniedException.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * OAuth 2.0 Access Denied Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+/**
+ * Exception class
+ */
+class AccessDeniedException extends OAuthException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $httpStatusCode = 401;
+
+    /**
+     * {@inheritdoc}
+     */
+    public $errorType = 'access_denied';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        parent::__construct('The resource owner or authorization server denied the request.');
+    }
+}

src/Exception/InvalidClientException.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * OAuth 2.0 Invalid Client Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+/**
+ * Exception class
+ */
+class InvalidClientException extends OAuthException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $httpStatusCode = 401;
+
+    /**
+     * {@inheritdoc}
+     */
+    public $errorType = 'invalid_client';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        parent::__construct('Client authentication failed.');
+    }
+}

src/Exception/InvalidCredentialsException.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * OAuth 2.0 Invalid Credentials Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+/**
+ * Exception class
+ */
+class InvalidCredentialsException extends OAuthException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $httpStatusCode = 401;
+
+    /**
+     * {@inheritdoc}
+     */
+    public $errorType = 'invalid_credentials';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        parent::__construct('The user credentials were incorrect.');
+    }
+}

src/Exception/InvalidGrantException.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * OAuth 2.0 Invalid Grant Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+/**
+ * Exception class
+ */
+class InvalidGrantException extends OAuthException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $httpStatusCode = 400;
+
+    /**
+     * {@inheritdoc}
+     */
+    public $errorType = 'invalid_grant';
+
+    /**
+     * {@inheritdoc}
+     */
+
+    public function __construct($parameter)
+    {
+        parent::__construct(
+            sprintf(
+                '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.',
+                $parameter
+            )
+        );
+    }
+}

src/Exception/InvalidRefreshException.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * OAuth 2.0 Invalid Refresh Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+/**
+ * Exception class
+ */
+class InvalidRefreshException extends OAuthException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $httpStatusCode = 400;
+
+    /**
+     * {@inheritdoc}
+     */
+    public $errorType = 'invalid_request';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        parent::__construct('The refresh token is invalid.');
+    }
+}

src/Exception/InvalidRequestException.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * OAuth 2.0 Invalid Request Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+/**
+ * Exception class
+ */
+class InvalidRequestException extends OAuthException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $httpStatusCode = 400;
+
+    /**
+     * {@inheritdoc}
+     */
+    public $errorType = 'invalid_request';
+
+    /**
+     * {@inheritdoc}
+     */
+
+    public function __construct($parameter, $redirectUri = null)
+    {
+        parent::__construct(
+            sprintf(
+                '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.',
+                $parameter
+            )
+        );
+
+        $this->redirectUri = $redirectUri;
+    }
+}

src/Exception/InvalidScopeException.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * OAuth 2.0 Invalid Scope Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+/**
+ * Exception class
+ */
+class InvalidScopeException extends OAuthException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $httpStatusCode = 400;
+
+    /**
+     * {@inheritdoc}
+     */
+    public $errorType = 'invalid_scope';
+
+    /**
+     * {@inheritdoc}
+     */
+
+    public function __construct($parameter, $redirectUri = null)
+    {
+        parent::__construct(
+            sprintf(
+                'The requested scope is invalid, unknown, or malformed. Check the "%s" scope.',
+                $parameter
+            )
+        );
+
+        $this->redirectUri = $redirectUri;
+    }
+}

src/Exception/OAuthException.php

@@ -0,0 +1,123 @@
+<?php
+/**
+ * OAuth 2.0 Base Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Exception class
+ */
+class OAuthException extends \Exception
+{
+    /**
+     * The HTTP status code for this exception that should be sent in the response
+     */
+    public $httpStatusCode = 400;
+
+    /**
+     * Redirect URI if the server should redirect back to the client
+     * @var string|null
+     */
+    public $redirectUri = null;
+
+    /**
+     * The exception type
+     */
+    public $errorType = '';
+
+    /**
+     * Throw a new exception
+     */
+    public function __construct($msg = 'An error occured')
+    {
+        parent::__construct($msg);
+    }
+
+    /**
+     * Should the server redirect back to the client?
+     * @return bool
+     */
+    public function shouldRedirect()
+    {
+        return is_null($this->redirectUri) ? false : true;
+    }
+
+    /**
+     * Return redirect URI if set
+     * @return string|null
+     */
+    public function getRedirectUri()
+    {
+        return \League\OAuth2\Server\Util\RedirectUri::make(
+            $this->redirectUri,
+            [
+                'error' =>  $this->errorType,
+                'message' =>  $this->getMessage(),
+            ]
+        );
+    }
+
+    /**
+     * Get all headers that have to be send with the error response
+     * @return array Array with header values
+     */
+    public function getHttpHeaders()
+    {
+        $headers = [];
+        switch ($this->httpStatusCode) {
+            case 401:
+                $headers[] = 'HTTP/1.1 401 Unauthorized';
+                break;
+            case 500:
+                $headers[] = 'HTTP/1.1 500 Internal Server Error';
+                break;
+            case 501:
+                $headers[] = 'HTTP/1.1 501 Not Implemented';
+                break;
+            case 400:
+            default:
+                $headers[] = 'HTTP/1.1 400 Bad Request';
+                break;
+        }
+
+        // Add "WWW-Authenticate" header
+        //
+        // RFC 6749, section 5.2.:
+        // "If the client attempted to authenticate via the 'Authorization'
+        // request header field, the authorization server MUST
+        // respond with an HTTP 401 (Unauthorized) status code and
+        // include the "WWW-Authenticate" response header field
+        // matching the authentication scheme used by the client.
+        // @codeCoverageIgnoreStart
+        if ($this->errorType === 'invalid_client') {
+            $authScheme = null;
+            $request = new Request();
+            if ($request->getUser() !== null) {
+                $authScheme = 'Basic';
+            } else {
+                $authHeader = $request->headers->get('Authorization');
+                if ($authHeader !== null) {
+                    if (strpos($authHeader, 'Bearer') === 0) {
+                        $authScheme = 'Bearer';
+                    } elseif (strpos($authHeader, 'Basic') === 0) {
+                        $authScheme = 'Basic';
+                    }
+                }
+            }
+            if ($authScheme !== null) {
+                $headers[] = 'WWW-Authenticate: '.$authScheme.' realm=""';
+            }
+        }
+        // @codeCoverageIgnoreEnd
+        return $headers;
+    }
+}

src/Exception/ServerErrorException.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * OAuth 2.0 Server Error Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+/**
+ * Exception class
+ */
+class ServerErrorException extends OAuthException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $httpStatusCode = 500;
+
+    /**
+     * {@inheritdoc}
+     */
+    public $errorType = 'server_error';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($parameter = null)
+    {
+        $parameter = is_null($parameter) ? 'The authorization server encountered an unexpected condition which prevented it from fulfilling the request.' : $parameter;
+        parent::__construct($parameter);
+    }
+}

src/Exception/UnauthorizedClientException.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * OAuth 2.0 Unauthorized Client Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+/**
+ * Exception class
+ */
+class UnauthorizedClientException extends OAuthException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $httpStatusCode = 400;
+
+    /**
+     * {@inheritdoc}
+     */
+    public $errorType = 'unauthorized_client';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        parent::__construct('The client is not authorized to request an access token using this method.');
+    }
+}

src/Exception/UnsupportedGrantTypeException.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * OAuth 2.0 Invalid Request Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+/**
+ * Exception class
+ */
+class UnsupportedGrantTypeException extends OAuthException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $httpStatusCode = 400;
+
+    /**
+     * {@inheritdoc}
+     */
+    public $errorType = 'unsupported_grant_type';
+
+    /**
+     * {@inheritdoc}
+     */
+
+    public function __construct($parameter)
+    {
+        parent::__construct(
+            sprintf(
+                'The authorization grant type "%s" is not supported by the authorization server.',
+                $parameter
+            )
+        );
+    }
+}

src/Exception/UnsupportedResponseTypeException.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * OAuth 2.0 Unsupported Response Type Exception
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Exception;
+
+/**
+ * Exception class
+ */
+class UnsupportedResponseTypeException extends OAuthException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $httpStatusCode = 400;
+
+    /**
+     * {@inheritdoc}
+     */
+    public $errorType = 'unsupported_response_type';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($parameter, $redirectUri = null)
+    {
+        parent::__construct('The authorization server does not support obtaining an access token using this method.');
+        $this->redirectUri = $redirectUri;
+    }
+}

src/Grant/AbstractGrant.php

@@ -0,0 +1,189 @@
+<?php
+/**
+ * OAuth 2.0 Abstract grant
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Grant;
+
+use League\OAuth2\Server\AuthorizationServer;
+use League\OAuth2\Server\Entity\ScopeEntity;
+use League\OAuth2\Server\Entity\ClientEntity;
+use League\OAuth2\Server\Exception;
+
+/**
+ * Abstract grant class
+ */
+abstract class AbstractGrant implements GrantTypeInterface
+{
+    /**
+     * Grant identifier
+     * @var string
+     */
+    protected $identifier = '';
+
+    /**
+     * Response type
+     * @var string
+     */
+    protected $responseType;
+
+    /**
+     * Callback to authenticate a user's name and password
+     * @var function
+     */
+    protected $callback;
+
+    /**
+     * AuthServer instance
+     * @var \League\OAuth2\Server\AuthorizationServer
+     */
+    protected $server;
+
+    /**
+     * Access token expires in override
+     * @var int
+     */
+    protected $accessTokenTTL;
+
+    /**
+     * Return the identifier
+     * @return string
+     */
+    public function getIdentifier()
+    {
+        return $this->identifier;
+    }
+
+    /**
+     * Return the identifier
+     * @param  string $identifier
+     * @return self
+     */
+    public function setIdentifier($identifier)
+    {
+        $this->identifier = $identifier;
+
+        return $this;
+    }
+
+    /**
+     * Return the response type
+     * @return string
+     */
+    public function getResponseType()
+    {
+        return $this->responseType;
+    }
+
+    /**
+     * Get the TTL for an access token
+     * @return int The TTL
+     */
+    public function getAccessTokenTTL()
+    {
+        if ($this->accessTokenTTL) {
+            return $this->accessTokenTTL;
+        }
+
+        return $this->server->getAccessTokenTTL();
+    }
+
+    /**
+     * Override the default access token expire time
+     * @param  int  $accessTokenTTL
+     * @return self
+     */
+    public function setAccessTokenTTL($accessTokenTTL)
+    {
+        $this->accessTokenTTL = $accessTokenTTL;
+
+        return $this;
+    }
+
+    /**
+     * Inject the authorization server into the grant
+     * @param  \League\OAuth2\Server\AuthorizationServer   $server The authorization server instance
+     * @return self
+     */
+    public function setAuthorizationServer(AuthorizationServer $server)
+    {
+        $this->server = $server;
+
+        return $this;
+    }
+
+    /**
+     * Given a list of scopes, validate them and return an array of Scope entities
+     * @param  string                                       $scopeParam  A string of scopes (e.g. "profile email birthday")
+     * @param  \League\OAuth2\Server\Entity\ClientEntity    $client      Client entity
+     * @param  string|null                                  $redirectUri The redirect URI to return the user to
+     * @return \League\OAuth2\Server\Entity\ScopeEntity[]
+     * @throws \League\OAuth2\Server\Exception\InvalidScopeException     If scope is invalid, or no scopes passed when required
+     */
+    public function validateScopes($scopeParam = '', ClientEntity $client, $redirectUri = null)
+    {
+        $scopesList = explode($this->server->getScopeDelimeter(), $scopeParam);
+
+        for ($i = 0; $i < count($scopesList); $i++) {
+            $scopesList[$i] = trim($scopesList[$i]);
+            if ($scopesList[$i] === '') {
+                unset($scopesList[$i]); // Remove any junk scopes
+            }
+        }
+
+        if (
+            $this->server->scopeParamRequired() === true
+            && $this->server->getDefaultScope() === null
+            && count($scopesList) === 0
+        ) {
+            throw new Exception\InvalidRequestException('scope');
+        } elseif (count($scopesList) === 0 && $this->server->getDefaultScope() !== null) {
+            if (is_array($this->server->getDefaultScope())) {
+                $scopesList = $this->server->getDefaultScope();
+            } else {
+                $scopesList = [0 => $this->server->getDefaultScope()];
+            }
+        }
+
+        $scopes = [];
+
+        foreach ($scopesList as $scopeItem) {
+            $scope = $this->server->getScopeStorage()->get(
+                $scopeItem,
+                $this->getIdentifier(),
+                $client->getId()
+            );
+
+            if (($scope instanceof ScopeEntity) === false) {
+                throw new Exception\InvalidScopeException($scopeItem, $redirectUri);
+            }
+
+            $scopes[$scope->getId()] = $scope;
+        }
+
+        return $scopes;
+    }
+
+    /**
+     * Format the local scopes array
+     * @param  \League\OAuth2\Server\Entity\ScopeEntity[]
+     * @return array
+     */
+    protected function formatScopes($unformated = [])
+    {
+        $scopes = [];
+        foreach ($unformated as $scope) {
+            if ($scope instanceof ScopeEntity) {
+                $scopes[$scope->getId()] = $scope;
+            }
+        }
+
+        return $scopes;
+    }
+}

src/Grant/AuthCodeGrant.php

@@ -0,0 +1,267 @@
+<?php
+/**
+ * OAuth 2.0 Auth code grant
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Grant;
+
+use League\OAuth2\Server\Request;
+use League\OAuth2\Server\Exception;
+use League\OAuth2\Server\Entity\ClientEntity;
+use League\OAuth2\Server\Entity\RefreshTokenEntity;
+use League\OAuth2\Server\Entity\SessionEntity;
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\AuthCodeEntity;
+use League\OAuth2\Server\Util\SecureKey;
+use League\OAuth2\Server\Event;
+
+/**
+ * Auth code grant class
+ */
+class AuthCodeGrant extends AbstractGrant
+{
+    /**
+     * Grant identifier
+     * @var string
+     */
+    protected $identifier = 'authorization_code';
+
+    /**
+     * Response type
+     * @var string
+     */
+    protected $responseType = 'code';
+
+    /**
+     * AuthServer instance
+     * @var AuthServer
+     */
+    protected $server = null;
+
+    /**
+     * Access token expires in override
+     * @var int
+     */
+    protected $accessTokenTTL = null;
+
+    /**
+     * The TTL of the auth token
+     * @var integer
+     */
+    protected $authTokenTTL = 600;
+
+    /**
+     * Override the default access token expire time
+     * @param  int  $authTokenTTL
+     * @return void
+     */
+    public function setAuthTokenTTL($authTokenTTL)
+    {
+        $this->authTokenTTL = $authTokenTTL;
+    }
+
+    /**
+     * Check authorize parameters
+     *
+     * @return array Authorize request parameters
+     */
+    public function checkAuthorizeParams()
+    {
+        // Get required params
+        $clientId = $this->server->getRequest()->query->get('client_id', null);
+        if (is_null($clientId)) {
+            throw new Exception\InvalidRequestException('client_id');
+        }
+
+        $redirectUri = $this->server->getRequest()->query->get('redirect_uri', null);
+        if (is_null($redirectUri)) {
+            throw new Exception\InvalidRequestException('redirect_uri');
+        }
+
+        // Validate client ID and redirect URI
+        $client = $this->server->getClientStorage()->get(
+            $clientId,
+            null,
+            $redirectUri,
+            $this->getIdentifier()
+        );
+
+        if (($client instanceof ClientEntity) === false) {
+            $this->server->getEventEmitter()->emit(new Event\ClientAuthenticationFailedEvent($this->server->getRequest()));
+            throw new Exception\InvalidClientException();
+        }
+
+        $state = $this->server->getRequest()->query->get('state', null);
+        if ($this->server->stateParamRequired() === true && is_null($state)) {
+            throw new Exception\InvalidRequestException('state', $redirectUri);
+        }
+
+        $responseType = $this->server->getRequest()->query->get('response_type', null);
+        if (is_null($responseType)) {
+            throw new Exception\InvalidRequestException('response_type', $redirectUri);
+        }
+
+        // Ensure response type is one that is recognised
+        if (!in_array($responseType, $this->server->getResponseTypes())) {
+            throw new Exception\UnsupportedResponseTypeException($responseType, $redirectUri);
+        }
+
+        // Validate any scopes that are in the request
+        $scopeParam = $this->server->getRequest()->query->get('scope', '');
+        $scopes = $this->validateScopes($scopeParam, $client, $redirectUri);
+
+        return [
+            'client'        =>  $client,
+            'redirect_uri'  =>  $redirectUri,
+            'state'         =>  $state,
+            'response_type' =>  $responseType,
+            'scopes'        =>  $scopes
+        ];
+    }
+
+    /**
+     * Parse a new authorize request
+     *
+     * @param  string $type       The session owner's type
+     * @param  string $typeId     The session owner's ID
+     * @param  array  $authParams The authorize request $_GET parameters
+     * @return string An authorisation code
+     */
+    public function newAuthorizeRequest($type, $typeId, $authParams = [])
+    {
+        // Create a new session
+        $session = new SessionEntity($this->server);
+        $session->setOwner($type, $typeId);
+        $session->associateClient($authParams['client']);
+        $session->save();
+
+        // Create a new auth code
+        $authCode = new AuthCodeEntity($this->server);
+        $authCode->setId(SecureKey::generate());
+        $authCode->setRedirectUri($authParams['redirect_uri']);
+        $authCode->setExpireTime(time() + $this->authTokenTTL);
+
+        foreach ($authParams['scopes'] as $scope) {
+            $authCode->associateScope($scope);
+        }
+
+        $authCode->setSession($session);
+        $authCode->save();
+
+        return $authCode->generateRedirectUri($authParams['state']);
+    }
+
+    /**
+     * Complete the auth code grant
+     * @return array
+     */
+    public function completeFlow()
+    {
+        // Get the required params
+        $clientId = $this->server->getRequest()->request->get('client_id', null);
+        if (is_null($clientId)) {
+            $clientId = $this->server->getRequest()->getUser();
+            if (is_null($clientId)) {
+                throw new Exception\InvalidRequestException('client_id');
+            }
+        }
+
+        $clientSecret = $this->server->getRequest()->request->get('client_secret', null);
+        if (is_null($clientSecret)) {
+            $clientSecret = $this->server->getRequest()->getPassword();
+            if (is_null($clientSecret)) {
+                throw new Exception\InvalidRequestException('client_secret');
+            }
+        }
+
+        $redirectUri = $this->server->getRequest()->request->get('redirect_uri', null);
+        if (is_null($redirectUri)) {
+            throw new Exception\InvalidRequestException('redirect_uri');
+        }
+
+        // Validate client ID and client secret
+        $client = $this->server->getClientStorage()->get(
+            $clientId,
+            $clientSecret,
+            $redirectUri,
+            $this->getIdentifier()
+        );
+
+        if (($client instanceof ClientEntity) === false) {
+            $this->server->getEventEmitter()->emit(new Event\ClientAuthenticationFailedEvent($this->server->getRequest()));
+            throw new Exception\InvalidClientException();
+        }
+
+        // Validate the auth code
+        $authCode = $this->server->getRequest()->request->get('code', null);
+        if (is_null($authCode)) {
+            throw new Exception\InvalidRequestException('code');
+        }
+
+        $code = $this->server->getAuthCodeStorage()->get($authCode);
+        if (($code instanceof AuthCodeEntity) === false) {
+            throw new Exception\InvalidRequestException('code');
+        }
+
+        // Ensure the auth code hasn't expired
+        if ($code->isExpired() === true) {
+            throw new Exception\InvalidRequestException('code');
+        }
+
+        // Check redirect URI presented matches redirect URI originally used in authorize request
+        if ($code->getRedirectUri() !== $redirectUri) {
+            throw new Exception\InvalidRequestException('redirect_uri');
+        }
+
+        $session = $code->getSession();
+        $session->associateClient($client);
+
+        $authCodeScopes = $code->getScopes();
+
+        // Generate the access token
+        $accessToken = new AccessTokenEntity($this->server);
+        $accessToken->setId(SecureKey::generate());
+        $accessToken->setExpireTime($this->getAccessTokenTTL() + time());
+
+        foreach ($authCodeScopes as $authCodeScope) {
+            $session->associateScope($authCodeScope);
+        }
+
+        foreach ($session->getScopes() as $scope) {
+           $accessToken->associateScope($scope);
+        }
+
+        $this->server->getTokenType()->setSession($session);
+        $this->server->getTokenType()->setParam('access_token', $accessToken->getId());
+        $this->server->getTokenType()->setParam('expires_in', $this->getAccessTokenTTL());
+
+        // Associate a refresh token if set
+        if ($this->server->hasGrantType('refresh_token')) {
+            $refreshToken = new RefreshTokenEntity($this->server);
+            $refreshToken->setId(SecureKey::generate());
+            $refreshToken->setExpireTime($this->server->getGrantType('refresh_token')->getRefreshTokenTTL() + time());
+            $this->server->getTokenType()->setParam('refresh_token', $refreshToken->getId());
+        }
+
+        // Expire the auth code
+        $code->expire();
+
+        // Save all the things
+        $session->save();
+        $accessToken->setSession($session);
+        $accessToken->save();
+
+        if ($this->server->hasGrantType('refresh_token')) {
+            $refreshToken->setAccessToken($accessToken);
+            $refreshToken->save();
+        }
+
+        return $this->server->getTokenType()->generateResponse();
+    }
+}

src/Grant/ClientCredentialsGrant.php

@@ -0,0 +1,120 @@
+<?php
+/**
+ * OAuth 2.0 Client credentials grant
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Grant;
+
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\ClientEntity;
+use League\OAuth2\Server\Entity\SessionEntity;
+use League\OAuth2\Server\Exception;
+use League\OAuth2\Server\Util\SecureKey;
+use League\OAuth2\Server\Event;
+
+/**
+ * Client credentials grant class
+ */
+class ClientCredentialsGrant extends AbstractGrant
+{
+    /**
+     * Grant identifier
+     * @var string
+     */
+    protected $identifier = 'client_credentials';
+
+    /**
+     * Response type
+     * @var string
+     */
+    protected $responseType = null;
+
+    /**
+     * AuthServer instance
+     * @var AuthServer
+     */
+    protected $server = null;
+
+    /**
+     * Access token expires in override
+     * @var int
+     */
+    protected $accessTokenTTL = null;
+
+    /**
+     * Complete the client credentials grant
+     * @return array
+     */
+    public function completeFlow()
+    {
+         // Get the required params
+        $clientId = $this->server->getRequest()->request->get('client_id', null);
+        if (is_null($clientId)) {
+            $clientId = $this->server->getRequest()->getUser();
+            if (is_null($clientId)) {
+                throw new Exception\InvalidRequestException('client_id');
+            }
+        }
+
+        $clientSecret = $this->server->getRequest()->request->get('client_secret', null);
+        if (is_null($clientSecret)) {
+            $clientSecret = $this->server->getRequest()->getPassword();
+            if (is_null($clientSecret)) {
+                throw new Exception\InvalidRequestException('client_secret');
+            }
+        }
+
+        // Validate client ID and client secret
+        $client = $this->server->getClientStorage()->get(
+            $clientId,
+            $clientSecret,
+            null,
+            $this->getIdentifier()
+        );
+
+        if (($client instanceof ClientEntity) === false) {
+            $this->server->getEventEmitter()->emit(new Event\ClientAuthenticationFailedEvent($this->server->getRequest()));
+            throw new Exception\InvalidClientException();
+        }
+
+        // Validate any scopes that are in the request
+        $scopeParam = $this->server->getRequest()->request->get('scope', '');
+        $scopes = $this->validateScopes($scopeParam, $client);
+
+        // Create a new session
+        $session = new SessionEntity($this->server);
+        $session->setOwner('client', $client->getId());
+        $session->associateClient($client);
+
+        // Generate an access token
+        $accessToken = new AccessTokenEntity($this->server);
+        $accessToken->setId(SecureKey::generate());
+        $accessToken->setExpireTime($this->getAccessTokenTTL() + time());
+
+        // Associate scopes with the session and access token
+        foreach ($scopes as $scope) {
+           $session->associateScope($scope);
+        }
+
+        foreach ($session->getScopes() as $scope) {
+           $accessToken->associateScope($scope);
+        }
+
+        // Save everything
+        $session->save();
+        $accessToken->setSession($session);
+        $accessToken->save();
+
+        $this->server->getTokenType()->setSession($session);
+        $this->server->getTokenType()->setParam('access_token', $accessToken->getId());
+        $this->server->getTokenType()->setParam('expires_in', $this->getAccessTokenTTL());
+
+        return $this->server->getTokenType()->generateResponse();
+    }
+}

src/Grant/GrantTypeInterface.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * OAuth 2.0 Grant type interface
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Grant;
+
+/**
+ * Grant type interface
+ */
+interface GrantTypeInterface
+{
+    /**
+     * Complete the grant flow
+     * @return array
+     */
+    public function completeFlow();
+}

src/Grant/PasswordGrant.php

@@ -0,0 +1,175 @@
+<?php
+/**
+ * OAuth 2.0 Password grant
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Grant;
+
+use League\OAuth2\Server\Entity\ClientEntity;
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\RefreshTokenEntity;
+use League\OAuth2\Server\Entity\SessionEntity;
+use League\OAuth2\Server\Exception;
+use League\OAuth2\Server\Util\SecureKey;
+use League\OAuth2\Server\Event;
+
+/**
+ * Password grant class
+ */
+class PasswordGrant extends AbstractGrant
+{
+    /**
+     * Grant identifier
+     * @var string
+     */
+    protected $identifier = 'password';
+
+    /**
+     * Response type
+     * @var string
+     */
+    protected $responseType;
+
+    /**
+     * Callback to authenticate a user's name and password
+     * @var callable
+     */
+    protected $callback;
+
+    /**
+     * Access token expires in override
+     * @var int
+     */
+    protected $accessTokenTTL;
+
+    /**
+     * Set the callback to verify a user's username and password
+     * @param  callable $callback The callback function
+     * @return void
+     */
+    public function setVerifyCredentialsCallback(callable $callback)
+    {
+        $this->callback = $callback;
+    }
+
+    /**
+     * Return the callback function
+     * @return callable
+     */
+    protected function getVerifyCredentialsCallback()
+    {
+        if (is_null($this->callback) || ! is_callable($this->callback)) {
+            throw new Exception\ServerErrorException('Null or non-callable callback set on Password grant');
+        }
+
+        return $this->callback;
+    }
+
+    /**
+     * Complete the password grant
+     * @return array
+     */
+    public function completeFlow()
+    {
+        // Get the required params
+        $clientId = $this->server->getRequest()->request->get('client_id', null);
+        if (is_null($clientId)) {
+            $clientId = $this->server->getRequest()->getUser();
+            if (is_null($clientId)) {
+                throw new Exception\InvalidRequestException('client_id');
+            }
+        }
+
+        $clientSecret = $this->server->getRequest()->request->get('client_secret', null);
+        if (is_null($clientSecret)) {
+            $clientSecret = $this->server->getRequest()->getPassword();
+            if (is_null($clientSecret)) {
+                throw new Exception\InvalidRequestException('client_secret');
+            }
+        }
+
+        // Validate client ID and client secret
+        $client = $this->server->getClientStorage()->get(
+            $clientId,
+            $clientSecret,
+            null,
+            $this->getIdentifier()
+        );
+
+        if (($client instanceof ClientEntity) === false) {
+            $this->server->getEventEmitter()->emit(new Event\ClientAuthenticationFailedEvent($this->server->getRequest()));
+            throw new Exception\InvalidClientException();
+        }
+
+        $username = $this->server->getRequest()->request->get('username', null);
+        if (is_null($username)) {
+            throw new Exception\InvalidRequestException('username');
+        }
+
+        $password = $this->server->getRequest()->request->get('password', null);
+        if (is_null($password)) {
+            throw new Exception\InvalidRequestException('password');
+        }
+
+        // Check if user's username and password are correct
+        $userId = call_user_func($this->getVerifyCredentialsCallback(), $username, $password);
+
+        if ($userId === false) {
+            $this->server->getEventEmitter()->emit(new Event\UserAuthenticationFailedEvent($this->server->getRequest()));
+            throw new Exception\InvalidCredentialsException();
+        }
+
+        // Validate any scopes that are in the request
+        $scopeParam = $this->server->getRequest()->request->get('scope', '');
+        $scopes = $this->validateScopes($scopeParam, $client);
+
+        // Create a new session
+        $session = new SessionEntity($this->server);
+        $session->setOwner('user', $userId);
+        $session->associateClient($client);
+
+        // Generate an access token
+        $accessToken = new AccessTokenEntity($this->server);
+        $accessToken->setId(SecureKey::generate());
+        $accessToken->setExpireTime($this->getAccessTokenTTL() + time());
+
+        // Associate scopes with the session and access token
+        foreach ($scopes as $scope) {
+           $session->associateScope($scope);
+        }
+
+        foreach ($session->getScopes() as $scope) {
+           $accessToken->associateScope($scope);
+        }
+
+        $this->server->getTokenType()->setSession($session);
+        $this->server->getTokenType()->setParam('access_token', $accessToken->getId());
+        $this->server->getTokenType()->setParam('expires_in', $this->getAccessTokenTTL());
+
+        // Associate a refresh token if set
+        if ($this->server->hasGrantType('refresh_token')) {
+            $refreshToken = new RefreshTokenEntity($this->server);
+            $refreshToken->setId(SecureKey::generate());
+            $refreshToken->setExpireTime($this->server->getGrantType('refresh_token')->getRefreshTokenTTL() + time());
+            $this->server->getTokenType()->setParam('refresh_token', $refreshToken->getId());
+        }
+
+        // Save everything
+        $session->save();
+        $accessToken->setSession($session);
+        $accessToken->save();
+
+        if ($this->server->hasGrantType('refresh_token')) {
+            $refreshToken->setAccessToken($accessToken);
+            $refreshToken->save();
+        }
+
+        return $this->server->getTokenType()->generateResponse();
+    }
+}

src/Grant/RefreshTokenGrant.php

@@ -0,0 +1,160 @@
+<?php
+/**
+ * OAuth 2.0 Refresh token grant
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Grant;
+
+use League\OAuth2\Server\Request;
+use League\OAuth2\Server\Exception;
+use League\OAuth2\Server\Util\SecureKey;
+use League\OAuth2\Server\Entity\RefreshTokenEntity;
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\ClientEntity;
+use League\OAuth2\Server\Event;
+
+/**
+ * Referesh token grant
+ */
+class RefreshTokenGrant extends AbstractGrant
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $identifier = 'refresh_token';
+
+    /**
+     * Refresh token TTL (default = 604800 | 1 week)
+     * @var integer
+     */
+    protected $refreshTokenTTL = 604800;
+
+    /**
+     * Set the TTL of the refresh token
+     * @param  int  $refreshTokenTTL
+     * @return void
+     */
+    public function setRefreshTokenTTL($refreshTokenTTL)
+    {
+        $this->refreshTokenTTL = $refreshTokenTTL;
+    }
+
+    /**
+     * Get the TTL of the refresh token
+     * @return int
+     */
+    public function getRefreshTokenTTL()
+    {
+        return $this->refreshTokenTTL;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function completeFlow()
+    {
+        $clientId = $this->server->getRequest()->request->get('client_id', null);
+        if (is_null($clientId)) {
+            $clientId = $this->server->getRequest()->getUser();
+            if (is_null($clientId)) {
+                throw new Exception\InvalidRequestException('client_id');
+            }
+        }
+
+        $clientSecret = $this->server->getRequest()->request->get('client_secret', null);
+        if (is_null($clientSecret)) {
+            $clientSecret = $this->server->getRequest()->getPassword();
+            if (is_null($clientSecret)) {
+                throw new Exception\InvalidRequestException('client_secret');
+            }
+        }
+
+        // Validate client ID and client secret
+        $client = $this->server->getClientStorage()->get(
+            $clientId,
+            $clientSecret,
+            null,
+            $this->getIdentifier()
+        );
+
+        if (($client instanceof ClientEntity) === false) {
+            $this->server->getEventEmitter()->emit(new Event\ClientAuthenticationFailedEvent($this->server->getRequest()));
+            throw new Exception\InvalidClientException();
+        }
+
+        $oldRefreshTokenParam = $this->server->getRequest()->request->get('refresh_token', null);
+        if ($oldRefreshTokenParam === null) {
+            throw new Exception\InvalidRequestException('refresh_token');
+        }
+
+        // Validate refresh token
+        $oldRefreshToken = $this->server->getRefreshTokenStorage()->get($oldRefreshTokenParam);
+
+        if (($oldRefreshToken instanceof RefreshTokenEntity) === false) {
+            throw new Exception\InvalidRefreshException();
+        }
+
+        $oldAccessToken = $oldRefreshToken->getAccessToken();
+
+        // Get the scopes for the original session
+        $session = $oldAccessToken->getSession();
+        $scopes = $this->formatScopes($session->getScopes());
+
+        // Get and validate any requested scopes
+        $requestedScopesString = $this->server->getRequest()->request->get('scope', '');
+        $requestedScopes = $this->validateScopes($requestedScopesString, $client);
+
+        // If no new scopes are requested then give the access token the original session scopes
+        if (count($requestedScopes) === 0) {
+            $newScopes = $scopes;
+        } else {
+            // The OAuth spec says that a refreshed access token can have the original scopes or fewer so ensure
+            //  the request doesn't include any new scopes
+            foreach ($requestedScopes as $requestedScope) {
+                if (!isset($scopes[$requestedScope->getId()])) {
+                    throw new Exception\InvalidScopeException($requestedScope->getId());
+                }
+            }
+
+            $newScopes = $requestedScopes;
+        }
+
+        // Generate a new access token and assign it the correct sessions
+        $newAccessToken = new AccessTokenEntity($this->server);
+        $newAccessToken->setId(SecureKey::generate());
+        $newAccessToken->setExpireTime($this->getAccessTokenTTL() + time());
+        $newAccessToken->setSession($session);
+
+        foreach ($newScopes as $newScope) {
+            $newAccessToken->associateScope($newScope);
+        }
+
+        // Expire the old token and save the new one
+        $oldAccessToken->expire();
+        $newAccessToken->save();
+
+        $this->server->getTokenType()->setSession($session);
+        $this->server->getTokenType()->setParam('access_token', $newAccessToken->getId());
+        $this->server->getTokenType()->setParam('expires_in', $this->getAccessTokenTTL());
+
+        // Expire the old refresh token
+        $oldRefreshToken->expire();
+
+        // Generate a new refresh token
+        $newRefreshToken = new RefreshTokenEntity($this->server);
+        $newRefreshToken->setId(SecureKey::generate());
+        $newRefreshToken->setExpireTime($this->getRefreshTokenTTL() + time());
+        $newRefreshToken->setAccessToken($newAccessToken);
+        $newRefreshToken->save();
+
+        $this->server->getTokenType()->setParam('refresh_token', $newRefreshToken->getId());
+
+        return $this->server->getTokenType()->generateResponse();
+    }
+}

src/OAuth2/AuthServer.php

@@ -1,388 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Authorization Server
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2;
-
-use OAuth2\Util\Request;
-use OAuth2\Util\SecureKey;
-use OAuth2\Storage\SessionInterface;
-use OAuth2\Storage\ClientInterface;
-use OAuth2\Storage\ScopeInterface;
-use OAuth2\Grant\GrantTypeInterface;
-
-/**
- * OAuth 2.0 authorization server class
- */
-class AuthServer
-{
-    /**
-     * The delimeter between scopes specified in the scope query string parameter
-     *
-     * The OAuth 2 specification states it should be a space but that is stupid
-     * and everyone excepted Google use a comma instead.
-     *
-     * @var string
-     */
-    protected $scopeDelimeter = ',';
-
-    /**
-     * The TTL (time to live) of an access token in seconds (default: 3600)
-     * @var integer
-     */
-    static protected $expiresIn = 3600;
-
-    /**
-     * The registered grant response types
-     * @var array
-     */
-    protected $responseTypes = array();
-
-    /**
-     * The client, scope and session storage classes
-     * @var array
-     */
-    static protected $storages = array();
-
-    /**
-     * The registered grant types
-     * @var array
-     */
-    static protected $grantTypes = array();
-
-    /**
-     * The request object
-     * @var Util\RequestInterface
-     */
-    static protected $request = null;
-
-    /**
-     * Exception error codes
-     * @var array
-     */
-    protected static $exceptionCodes = array(
-        0   =>  'invalid_request',
-        1   =>  'unauthorized_client',
-        2   =>  'access_denied',
-        3   =>  'unsupported_response_type',
-        4   =>  'invalid_scope',
-        5   =>  'server_error',
-        6   =>  'temporarily_unavailable',
-        7   =>  'unsupported_grant_type',
-        8   =>  'invalid_client',
-        9   =>  'invalid_grant'
-    );
-
-    /**
-     * Exception error messages
-     * @var array
-     */
-    static protected $exceptionMessages = 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.',
-        '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.',
-        '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 "%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.',
-    );
-
-    /**
-     * Get an exception message
-     *
-     * @param  string $error The error message key
-     * @return string        The error message
-     */
-    public static function getExceptionMessage($error = '')
-    {
-        return self::$exceptionMessages[$error];
-    }
-
-    /**
-     * Get an exception code
-     *
-     * @param  integer $code The exception code
-     * @return string        The exception code type
-     */
-    public static function getExceptionType($code = 0)
-    {
-        return self::$exceptionCodes[$code];
-    }
-
-    /**
-     * Create a new OAuth2 authorization server
-     *
-     * @param ClientInterface  $client  A class which inherits from Storage/ClientInterface
-     * @param SessionInterface $session A class which inherits from Storage/SessionInterface
-     * @param ScopeInterface   $scope   A class which inherits from Storage/ScopeInterface
-     */
-    public function __construct(ClientInterface $client, SessionInterface $session, ScopeInterface $scope)
-    {
-        self::$storages = array(
-            'client'    =>  $client,
-            'session'   =>  $session,
-            'scope' =>  $scope
-        );
-    }
-
-    /**
-     * Enable support for a grant
-     * @param GrantTypeInterface $grantType  A grant class which conforms to Interface/GrantTypeInterface
-     * @param null|string        $identifier An identifier for the grant (autodetected if not passed)
-     */
-    public function addGrantType(GrantTypeInterface $grantType, $identifier = null)
-    {
-        if (is_null($identifier)) {
-            $identifier = $grantType->getIdentifier();
-        }
-        self::$grantTypes[$identifier] = $grantType;
-
-        if ( ! is_null($grantType->getResponseType())) {
-            $this->responseTypes[] = $grantType->getResponseType();
-        }
-    }
-
-    /**
-     * Check if a grant type has been enabled
-     * @param  string  $identifier The grant type identifier
-     * @return boolean             Returns "true" if enabled, "false" if not
-     */
-    public static function hasGrantType($identifier)
-    {
-        return (array_key_exists($identifier, self::$grantTypes));
-    }
-
-    /**
-     * Get the scope delimeter
-     *
-     * @return string The scope delimiter (default: ",")
-     */
-    public function getScopeDelimeter()
-    {
-        return $this->scopeDelimeter;
-    }
-
-    /**
-     * Set the scope delimiter
-     *
-     * @param string $scopeDelimeter
-     */
-    public function setScopeDelimeter($scopeDelimeter)
-    {
-        $this->scopeDelimeter = $scopeDelimeter;
-    }
-
-    /**
-     * Get the TTL for an access token
-     * @return int The TTL
-     */
-    public static function getExpiresIn()
-    {
-        return self::$expiresIn;
-    }
-
-    /**
-     * Set the TTL for an access token
-     * @param int $expiresIn The new TTL
-     */
-    public function setExpiresIn($expiresIn)
-    {
-        self::$expiresIn = $expiresIn;
-    }
-
-    /**
-     * Sets the Request Object
-     *
-     * @param Util\RequestInterface The Request Object
-     */
-    public function setRequest(Util\RequestInterface $request)
-    {
-        self::$request = $request;
-    }
-
-    /**
-     * Gets the Request object.  It will create one from the globals if one is not set.
-     *
-     * @return Util\RequestInterface
-     */
-    public static function getRequest()
-    {
-        if (self::$request === null) {
-            // @codeCoverageIgnoreStart
-            self::$request = Request::buildFromGlobals();
-
-        }
-        // @codeCoverageIgnoreEnd
-
-        return self::$request;
-    }
-
-    /**
-     * Return a storage class
-     * @param  string $obj The class required
-     * @return Storage\ClientInterface|Storage\ScopeInterface|Storage\SessionInterface
-     */
-    public static function getStorage($obj)
-    {
-        return self::$storages[$obj];
-    }
-
-    /**
-     * Check authorise parameters
-     *
-     * @param  array $inputParams Optional array of parsed $_GET keys
-     * @throws \OAuth2\Exception\ClientException
-     * @return array             Authorise request parameters
-     */
-    public function checkAuthoriseParams($inputParams = array())
-    {
-        // Auth params
-        $authParams = self::getParam(array('client_id', 'redirect_uri', 'response_type', 'scope'), 'get', $inputParams);
-
-        if (is_null($authParams['client_id'])) {
-            throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'client_id'), 0);
-        }
-
-        if (is_null($authParams['redirect_uri'])) {
-            throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'redirect_uri'), 0);
-        }
-
-        // Validate client ID and redirect URI
-        $clientDetails = self::getStorage('client')->getClient($authParams['client_id'], null, $authParams['redirect_uri']);
-
-        if ($clientDetails === false) {
-            throw new Exception\ClientException(self::$exceptionMessages['invalid_client'], 8);
-        }
-
-        $authParams['client_details'] = $clientDetails;
-
-        if (is_null($authParams['response_type'])) {
-            throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'response_type'), 0);
-        }
-
-        // Ensure response type is one that is recognised
-        if ( ! in_array($authParams['response_type'], $this->responseTypes)) {
-            throw new Exception\ClientException(self::$exceptionMessages['unsupported_response_type'], 3);
-        }
-
-        // Validate scopes
-        $scopes = explode($this->scopeDelimeter, $authParams['scope']);
-
-        for ($i = 0; $i < count($scopes); $i++) {
-            $scopes[$i] = trim($scopes[$i]);
-            if ($scopes[$i] === '') unset($scopes[$i]); // Remove any junk scopes
-        }
-
-        if (count($scopes) === 0) {
-            throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'scope'), 0);
-        }
-
-        $authParams['scopes'] = array();
-
-        foreach ($scopes as $scope) {
-            $scopeDetails = self::getStorage('scope')->getScope($scope);
-
-            if ($scopeDetails === false) {
-                throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_scope'], $scope), 4);
-            }
-
-            $authParams['scopes'][] = $scopeDetails;
-        }
-
-        return $authParams;
-    }
-
-    /**
-     * Parse a new authorise request
-     *
-     * @param  string $type        The session owner's type
-     * @param  string $typeId      The session owner's ID
-     * @param  array  $authParams  The authorise request $_GET parameters
-     * @return string              An authorisation code
-     */
-    public function newAuthoriseRequest($type, $typeId, $authParams = array())
-    {
-        // Generate an auth code
-        $authCode = SecureKey::make();
-
-        // Remove any old sessions the user might have
-        self::getStorage('session')->deleteSession($authParams['client_id'], $type, $typeId);
-
-        // Create a new session
-        $sessionId = self::getStorage('session')->createSession($authParams['client_id'], $authParams['redirect_uri'], $type, $typeId, $authCode);
-
-        // Associate scopes with the new session
-        foreach ($authParams['scopes'] as $scope)
-        {
-            self::getStorage('session')->associateScope($sessionId, $scope['id']);
-        }
-
-        return $authCode;
-    }
-
-    /**
-     * Issue an access token
-     *
-     * @param  array $inputParams Optional array of parsed $_POST keys
-     * @return array             Authorise request parameters
-     */
-    public function issueAccessToken($inputParams = array())
-    {
-        $grantType = self::getParam('grant_type', 'post', $inputParams);
-
-        if (is_null($grantType)) {
-            throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'grant_type'), 0);
-        }
-
-        // Ensure grant type is one that is recognised and is enabled
-        if ( ! in_array($grantType, array_keys(self::$grantTypes))) {
-            throw new Exception\ClientException(sprintf(self::$exceptionMessages['unsupported_grant_type'], $grantType), 7);
-        }
-
-        // Complete the flow
-        return $this->getGrantType($grantType)->completeFlow($inputParams);
-    }
-
-    /**
-     * Return a grant type class
-     * @param  string $grantType The grant type identifer
-     * @return class
-     */
-    protected function getGrantType($grantType)
-    {
-        return self::$grantTypes[$grantType];
-    }
-
-    /**
-     * Get a parameter from passed input parameters or the Request class
-     * @param  string|array $param Requried parameter
-     * @param  string $method      Get/put/post/delete
-     * @param  array  $inputParams Passed input parameters
-     * @return mixed               'Null' if parameter is missing
-     */
-    public static function getParam($param = '', $method = 'get', $inputParams = array())
-    {
-        if (is_string($param)) {
-            return (isset($inputParams[$param])) ? $inputParams[$param] : self::getRequest()->{$method}($param);
-        } else {
-            $response = array();
-            foreach ($param as $p) {
-                $response[$p] = self::getParam($p, $method, $inputParams);
-            }
-            return $response;
-        }
-    }
-
-}

src/OAuth2/Exception/ClientException.php

@@ -1,20 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Client Exception
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Exception;
-
-/**
- * ClientException Exception
- */
-class ClientException extends OAuth2Exception
-{
-
-}

src/OAuth2/Exception/InvalidAccessTokenException.php

@@ -1,20 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Invalid Access Token Exception
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Exception;
-
-/**
- * InvalidAccessToken Exception
- */
-class InvalidAccessTokenException extends OAuth2Exception
-{
-
-}

src/OAuth2/Exception/InvalidGrantTypeException.php

@@ -1,20 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Invalid Grant Type Exception
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Exception;
-
-/**
- * InvalidGrantTypeException Exception
- */
-class InvalidGrantTypeException extends OAuth2Exception
-{
-
-}

src/OAuth2/Exception/OAuth2Exception.php

@@ -1,20 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Base Exception
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Exception;
-
-/**
- * Exception class
- */
-class OAuth2Exception extends \Exception
-{
-
-}

src/OAuth2/Grant/AuthCode.php

@@ -1,132 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Auth code grant
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Grant;
-
-use OAuth2\Request;
-use OAuth2\AuthServer;
-use OAuth2\Exception;
-use OAuth2\Util\SecureKey;
-use OAuth2\Storage\SessionInterface;
-use OAuth2\Storage\ClientInterface;
-use OAuth2\Storage\ScopeInterface;
-
-/**
- * Auth code grant class
- */
-class AuthCode implements GrantTypeInterface {
-
-    /**
-     * Grant identifier
-     * @var string
-     */
-    protected $identifier = 'authorization_code';
-
-    /**
-     * Response type
-     * @var string
-     */
-    protected $responseType = 'code';
-
-    /**
-     * Return the identifier
-     * @return string
-     */
-    public function getIdentifier()
-    {
-        return $this->identifier;
-    }
-
-    /**
-     * Return the response type
-     * @return string
-     */
-    public function getResponseType()
-    {
-        return $this->responseType;
-    }
-
-    /**
-     * Complete the auth code grant
-     * @param  null|array $inputParams
-     * @return array
-     */
-    public function completeFlow($inputParams = null)
-    {
-        // Get the required params
-        $authParams = AuthServer::getParam(array('client_id', 'client_secret', 'redirect_uri', 'code'), 'post', $inputParams);
-
-        if (is_null($authParams['client_id'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'client_id'), 0);
-        }
-
-        if (is_null($authParams['client_secret'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'client_secret'), 0);
-        }
-
-        if (is_null($authParams['redirect_uri'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'redirect_uri'), 0);
-        }
-
-        // Validate client ID and redirect URI
-        $clientDetails = AuthServer::getStorage('client')->getClient($authParams['client_id'], $authParams['client_secret'], $authParams['redirect_uri']);
-
-        if ($clientDetails === false) {
-            throw new Exception\ClientException(AuthServer::getExceptionMessage('invalid_client'), 8);
-        }
-
-        $authParams['client_details'] = $clientDetails;
-
-        // Validate the authorization code
-        if (is_null($authParams['code'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'code'), 0);
-        }
-
-        // Verify the authorization code matches the client_id and the request_uri
-        $session = AuthServer::getStorage('session')->validateAuthCode($authParams['client_id'], $authParams['redirect_uri'], $authParams['code']);
-
-        if ( ! $session) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_grant'), 'code'), 9);
-        }
-
-        // A session ID was returned so update it with an access token,
-        //  remove the authorisation code, change the stage to 'granted'
-
-        $accessToken = SecureKey::make();
-        $refreshToken = (AuthServer::hasGrantType('refresh_token')) ? SecureKey::make() : null;
-
-        $accessTokenExpires = time() + AuthServer::getExpiresIn();
-        $accessTokenExpiresIn = AuthServer::getExpiresIn();
-
-        AuthServer::getStorage('session')->updateSession(
-            $session['id'],
-            null,
-            $accessToken,
-            $refreshToken,
-            $accessTokenExpires,
-            'granted'
-        );
-
-        $response = array(
-            'access_token'  =>  $accessToken,
-            'token_type'    =>  'bearer',
-            'expires'       =>  $accessTokenExpires,
-            'expires_in'    =>  $accessTokenExpiresIn
-        );
-
-        if (AuthServer::hasGrantType('refresh_token')) {
-            $response['refresh_token'] = $refreshToken;
-        }
-
-        return $response;
-    }
-
-}

src/OAuth2/Grant/ClientCredentials.php

@@ -1,121 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Auth code grant
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Grant;
-
-use OAuth2\Request;
-use OAuth2\AuthServer;
-use OAuth2\Exception;
-use OAuth2\Util\SecureKey;
-use OAuth2\Storage\SessionInterface;
-use OAuth2\Storage\ClientInterface;
-use OAuth2\Storage\ScopeInterface;
-
-/**
- * Client credentials grant class
- */
-class ClientCredentials implements GrantTypeInterface {
-
-    /**
-     * Grant identifier
-     * @var string
-     */
-    protected $identifier = 'client_credentials';
-
-    /**
-     * Response type
-     * @var string
-     */
-    protected $responseType = null;
-
-    /**
-     * Return the identifier
-     * @return string
-     */
-    public function getIdentifier()
-    {
-        return $this->identifier;
-    }
-
-    /**
-     * Return the response type
-     * @return string
-     */
-    public function getResponseType()
-    {
-        return $this->responseType;
-    }
-
-    /**
-     * Complete the client credentials grant
-     * @param  null|array $inputParams
-     * @return array
-     */
-    public function completeFlow($inputParams = null)
-    {
-         // Get the required params
-        $authParams = AuthServer::getParam(array('client_id', 'client_secret'), 'post', $inputParams);
-
-        if (is_null($authParams['client_id'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'client_id'), 0);
-        }
-
-        if (is_null($authParams['client_secret'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'client_secret'), 0);
-        }
-
-        // Validate client ID and client secret
-        $clientDetails = AuthServer::getStorage('client')->getClient($authParams['client_id'], $authParams['client_secret']);
-
-        if ($clientDetails === false) {
-            throw new Exception\ClientException(AuthServer::getExceptionMessage('invalid_client'), 8);
-        }
-
-        $authParams['client_details'] = $clientDetails;
-
-        // Generate an access token
-        $accessToken = SecureKey::make();
-        $refreshToken = (AuthServer::hasGrantType('refresh_token')) ? SecureKey::make() : null;
-
-        $accessTokenExpires = time() + AuthServer::getExpiresIn();
-        $accessTokenExpiresIn = AuthServer::getExpiresIn();
-
-        // Delete any existing sessions just to be sure
-        AuthServer::getStorage('session')->deleteSession($authParams['client_id'], 'client', $authParams['client_id']);
-
-        // Create a new session
-        AuthServer::getStorage('session')->createSession(
-            $authParams['client_id'],
-            null,
-            'client',
-            $authParams['client_id'],
-            null,
-            $accessToken,
-            $refreshToken,
-            $accessTokenExpires,
-            'granted'
-        );
-
-        $response = array(
-            'access_token'  =>  $accessToken,
-            'token_type'    =>  'bearer',
-            'expires'       =>  $accessTokenExpires,
-            'expires_in'    =>  $accessTokenExpiresIn
-        );
-
-        if (AuthServer::hasGrantType('refresh_token')) {
-            $response['refresh_token'] = $refreshToken;
-        }
-
-        return $response;
-    }
-
-}

src/OAuth2/Grant/GrantTypeInterface.php

@@ -1,54 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Grant type interface
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Grant;
-
-use OAuth2\Request;
-use OAuth2\AuthServer;
-use OAuth2\Exception;
-use OAuth2\Util\SecureKey;
-use OAuth2\Storage\SessionInterface;
-use OAuth2\Storage\ClientInterface;
-use OAuth2\Storage\ScopeInterface;
-
-interface GrantTypeInterface
-{
-	/**
-	 * Returns the grant identifier (used to validate grant_type in OAuth2\AuthServer\issueAccessToken())
-	 * @return string
-	 */
-    public function getIdentifier();
-
-    /**
-     * Returns the response type (used to validate response_type in OAuth2\AuthServer\checkAuthoriseParams())
-     * @return null|string
-     */
-    public function getResponseType();
-
-    /**
-     * Complete the grant flow
-     *
-     * Example response:
-     * <code>
-     * 	array(
-     *  	'access_token'  =>  (string),	// The access token
-     *      'refresh_token' =>  (string),	// The refresh token (only set if the refresh token grant is enabled)
-     *      'token_type'    =>  'bearer',	// Almost always "bearer" (exceptions: JWT, SAML)
-     *      'expires'       =>  (int),		// The timestamp of when the access token will expire
-     *      'expires_in'    =>  (int)		// The number of seconds before the access token will expire
-     *  )
-     * </code>
-     *
-     * @param  null|array $inputParams Null unless the input parameters have been manually set
-     * @return array                   An array of parameters to be passed back to the client
-     */
-    public function completeFlow($inputParams = null);
-}

src/OAuth2/Grant/Password.php

@@ -1,164 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Password grant
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Grant;
-
-use OAuth2\Request;
-use OAuth2\AuthServer;
-use OAuth2\Exception;
-use OAuth2\Util\SecureKey;
-use OAuth2\Storage\SessionInterface;
-use OAuth2\Storage\ClientInterface;
-use OAuth2\Storage\ScopeInterface;
-
-/**
- * Password grant class
- */
-class Password implements GrantTypeInterface {
-
-    /**
-     * Grant identifier
-     * @var string
-     */
-    protected $identifier = 'password';
-
-    /**
-     * Response type
-     * @var string
-     */
-    protected $responseType = null;
-
-    /**
-     * Callback to authenticate a user's name and password
-     * @var function
-     */
-    protected $callback = null;
-
-    /**
-     * Return the identifier
-     * @return string
-     */
-    public function getIdentifier()
-    {
-        return $this->identifier;
-    }
-
-    /**
-     * Return the response type
-     * @return string
-     */
-    public function getResponseType()
-    {
-        return $this->responseType;
-    }
-
-    /**
-     * Set the callback to verify a user's username and password
-     * @param function $callback The callback function
-     */
-    public function setVerifyCredentialsCallback($callback)
-    {
-        $this->callback = $callback;
-    }
-
-    /**
-     * Return the callback function
-     * @return function
-     */
-    protected function getVerifyCredentialsCallback()
-    {
-        if (is_null($this->callback) || ! is_callable($this->callback)) {
-            throw new Exception\InvalidGrantTypeException('Null or non-callable callback set');
-        }
-
-        return $this->callback;
-    }
-
-    /**
-     * Complete the password grant
-     * @param  null|array $inputParams
-     * @return array
-     */
-    public function completeFlow($inputParams = null)
-    {
-        // Get the required params
-        $authParams = AuthServer::getParam(array('client_id', 'client_secret', 'username', 'password'), 'post', $inputParams);
-
-        if (is_null($authParams['client_id'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'client_id'), 0);
-        }
-
-        if (is_null($authParams['client_secret'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'client_secret'), 0);
-        }
-
-        // Validate client ID and redirect URI
-        $clientDetails = AuthServer::getStorage('client')->getClient($authParams['client_id'], $authParams['client_secret']);
-
-        if ($clientDetails === false) {
-            throw new Exception\ClientException(AuthServer::getExceptionMessage('invalid_client'), 8);
-        }
-
-        $authParams['client_details'] = $clientDetails;
-
-        if (is_null($authParams['username'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'username'), 0);
-        }
-
-        if (is_null($authParams['password'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'password'), 0);
-        }
-
-        // Check if user's username and password are correct
-        $userId = call_user_func($this->getVerifyCredentialsCallback(), $authParams['username'], $authParams['password']);
-
-        if ($userId === false) {
-            throw new Exception\ClientException(AuthServer::getExceptionMessage('invalid_credentials'), 0);
-        }
-
-        // Generate an access token
-        $accessToken = SecureKey::make();
-        $refreshToken = (AuthServer::hasGrantType('refresh_token')) ? SecureKey::make() : null;
-
-        $accessTokenExpires = time() + AuthServer::getExpiresIn();
-        $accessTokenExpiresIn = AuthServer::getExpiresIn();
-
-        // Delete any existing sessions just to be sure
-        AuthServer::getStorage('session')->deleteSession($authParams['client_id'], 'user', $userId);
-
-        // Create a new session
-        AuthServer::getStorage('session')->createSession(
-            $authParams['client_id'],
-            null,
-            'user',
-            $userId,
-            null,
-            $accessToken,
-            $refreshToken,
-            $accessTokenExpires,
-            'granted'
-        );
-
-        $response = array(
-            'access_token'  =>  $accessToken,
-            'token_type'    =>  'bearer',
-            'expires'       =>  $accessTokenExpires,
-            'expires_in'    =>  $accessTokenExpiresIn
-        );
-
-        if (AuthServer::hasGrantType('refresh_token')) {
-            $response['refresh_token'] = $refreshToken;
-        }
-
-        return $response;
-    }
-
-}

src/OAuth2/Grant/RefreshToken.php

@@ -1,116 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Refresh token grant
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Grant;
-
-use OAuth2\Request;
-use OAuth2\AuthServer;
-use OAuth2\Exception;
-use OAuth2\Util\SecureKey;
-use OAuth2\Storage\SessionInterface;
-use OAuth2\Storage\ClientInterface;
-use OAuth2\Storage\ScopeInterface;
-
-/**
- * Referesh token grant
- */
-class RefreshToken implements GrantTypeInterface {
-
-    /**
-     * Grant identifier
-     * @var string
-     */
-    protected $identifier = 'refresh_token';
-
-    /**
-     * Response type
-     * @var string
-     */
-    protected $responseType = null;
-
-    /**
-     * Return the identifier
-     * @return string
-     */
-    public function getIdentifier()
-    {
-        return $this->identifier;
-    }
-
-    /**
-     * Return the response type
-     * @return string
-     */
-    public function getResponseType()
-    {
-        return $this->responseType;
-    }
-
-    /**
-     * Complete the refresh token grant
-     * @param  null|array $inputParams
-     * @return array
-     */
-    public function completeFlow($inputParams = null)
-    {
-        // Get the required params
-        $authParams = AuthServer::getParam(array('client_id', 'client_secret', 'refresh_token'), 'post', $inputParams);
-
-        if (is_null($authParams['client_id'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'client_id'), 0);
-        }
-
-        if (is_null($authParams['client_secret'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'client_secret'), 0);
-        }
-
-        // Validate client ID and client secret
-        $clientDetails = AuthServer::getStorage('client')->getClient($authParams['client_id'], $authParams['client_secret']);
-
-        if ($clientDetails === false) {
-            throw new Exception\ClientException(AuthServer::getExceptionMessage('invalid_client'), 8);
-        }
-
-        $authParams['client_details'] = $clientDetails;
-
-        if (is_null($authParams['refresh_token'])) {
-            throw new Exception\ClientException(sprintf(AuthServer::getExceptionMessage('invalid_request'), 'refresh_token'), 0);
-        }
-
-        // Validate refresh token
-        $sessionId = AuthServer::getStorage('client')->validateRefreshToken(
-            $authParams['refresh_token'],
-            $authParams['client_id']
-        );
-
-        if ($sessionId === false) {
-            throw new Exception\ClientException(AuthServer::getExceptionMessage('invalid_refresh'), 0);
-        }
-
-        // Generate new tokens
-        $accessToken = SecureKey::make();
-        $refreshToken = (AuthServer::hasGrantType('refresh_token')) ? SecureKey::make() : null;
-
-        $accessTokenExpires = time() + AuthServer::getExpiresIn();
-        $accessTokenExpiresIn = AuthServer::getExpiresIn();
-
-        AuthServer::getStorage('session')->updateRefreshToken($sessionId, $accessToken, $refreshToken, $accessTokenExpires);
-
-        return array(
-            'access_token'  =>  $accessToken,
-            'refresh_token' =>  $refreshToken,
-            'token_type'    =>  'bearer',
-            'expires'       =>  $accessTokenExpires,
-            'expires_in'    =>  $accessTokenExpiresIn
-        );
-    }
-
-}

src/OAuth2/ResourceServer.php

@@ -1,232 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Resource Server
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2;
-
-use OutOfBoundsException;
-use OAuth2\Storage\SessionInterface;
-use OAuth2\Storage\SessionScopeInterface;
-use OAuth2\Util\RequestInterface;
-use OAuth2\Util\Request;
-
-/**
- * OAuth 2.0 Resource Server
- */
-class ResourceServer
-{
-    /**
-     * The access token
-     * @var string
-     */
-    protected $accessToken = null;
-
-    /**
-     * The session ID
-     * @var string
-     */
-    protected $sessionId = null;
-
-    /**
-     * The type of the owner of the access token
-     * @var string
-     */
-    protected $ownerType = null;
-
-    /**
-     * The ID of the owner of the access token
-     * @var string
-     */
-    protected $ownerId = null;
-
-    /**
-     * The scopes associated with the access token
-     * @var array
-     */
-    protected $sessionScopes = array();
-
-    /**
-     * The client, scope and session storage classes
-     * @var array
-     */
-    protected $storages = array();
-
-    /**
-     * The request object
-     * @var Util\RequestInterface
-     */
-    protected $request = null;
-
-    /**
-     * The query string key which is used by clients to present the access token (default: access_token)
-     * @var string
-     */
-    protected $tokenKey = 'access_token';
-
-    /**
-     * Sets up the Resource
-     *
-     * @param SessionInterface  The Session Storage Object
-     */
-    public function __construct(SessionInterface $session)
-    {
-        $this->storages['session'] = $session;
-    }
-
-    /**
-     * Sets the Request Object
-     *
-     * @param  RequestInterface The Request Object
-     */
-    public function setRequest(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
-    /**
-     * Gets the Request object.  It will create one from the globals if one is not set.
-     *
-     * @return Util\RequestInterface
-     */
-    public function getRequest()
-    {
-        if ($this->request === null) {
-            // @codeCoverageIgnoreStart
-            $this->request = Request::buildFromGlobals();
-        }
-        // @codeCoverageIgnoreEnd
-
-        return $this->request;
-    }
-
-    /**
-     * Returns the query string key for the access token.
-     *
-     * @return string
-     */
-    public function getTokenKey()
-    {
-        return $this->tokenKey;
-    }
-
-    /**
-     * Sets the query string key for the access token.
-     *
-     * @param $key The new query string key
-     */
-    public function setTokenKey($key)
-    {
-        $this->tokenKey = $key;
-    }
-
-    /**
-     * Gets the access token owner ID.
-     *
-     * @return string
-     */
-    public function getOwnerId()
-    {
-        return $this->ownerId;
-    }
-
-    /**
-     * Gets the owner type.
-     *
-     * @return string
-     */
-    public function getOwnerType()
-    {
-        return $this->ownerType;
-    }
-
-    /**
-     * Gets the access token.
-     *
-     * @return string
-     */
-    public function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-
-    /**
-     * Checks if the access token is valid or not.
-     *
-     * @throws Exception\InvalidAccessTokenException Thrown if the presented access token is not valid
-     * @return bool
-     */
-    public function isValid()
-    {
-        $access_token = $this->determineAccessToken();
-
-        $result = $this->storages['session']->validateAccessToken($access_token);
-
-        if ( ! $result) {
-            throw new Exception\InvalidAccessTokenException('Access token is not valid');
-        }
-
-        $this->accessToken = $access_token;
-        $this->sessionId = $result['id'];
-        $this->ownerType = $result['owner_type'];
-        $this->ownerId = $result['owner_id'];
-
-        $this->sessionScopes = $this->storages['session']->getScopes($this->sessionId);
-
-        return true;
-    }
-
-    /**
-     * Checks if the presented access token has the given scope(s).
-     *
-     * @param array|string  An array of scopes or a single scope as a string
-     * @return bool         Returns bool if all scopes are found, false if any fail
-     */
-    public function hasScope($scopes)
-    {
-        if (is_string($scopes)) {
-            if (in_array($scopes, $this->sessionScopes)) {
-                return true;
-            }
-            return false;
-        } elseif (is_array($scopes)) {
-            foreach ($scopes as $scope) {
-                if ( ! in_array($scope, $this->sessionScopes)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Reads in the access token from the headers.
-     *
-     * @throws Exception\MissingAccessTokenException  Thrown if there is no access token presented
-     * @return string
-     */
-    protected function determineAccessToken()
-    {
-        if ($header = $this->getRequest()->header('Authorization')) {
-            $access_token = base64_decode(trim(str_replace('Bearer', '', $header)));
-        } else {
-            $method = $this->getRequest()->server('REQUEST_METHOD');
-            $access_token = $this->getRequest()->{$method}($this->tokenKey);
-        }
-
-        if (empty($access_token)) {
-            throw new Exception\InvalidAccessTokenException('Access token is missing');
-        }
-
-        return $access_token;
-    }
-
-}

src/OAuth2/Storage/ClientInterface.php

@@ -1,54 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Client storage interface
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Storage;
-
-interface ClientInterface
-{
-	/**
-	 * Validate a client
-	 *
-	 * Example SQL query:
-	 *
-	 * <code>
-	 * # Client ID + redirect URI
-	 * SELECT oauth_clients.id FROM oauth_clients LEFT JOIN client_endpoints ON client_endpoints.client_id
-	 *  = oauth_clients.id WHERE oauth_clients.id = $clientId AND client_endpoints.redirect_uri = $redirectUri
-	 *
-	 * # Client ID + client secret
-	 * SELECT oauth_clients.id FROM oauth_clients  WHERE oauth_clients.id = $clientId AND
-	 *  oauth_clients.secret = $clientSecret
-	 *
-	 * # Client ID + client secret + redirect URI
-	 * SELECT oauth_clients.id FROM oauth_clients LEFT JOIN client_endpoints ON client_endpoints.client_id
-	 *  = oauth_clients.id WHERE oauth_clients.id = $clientId AND oauth_clients.secret = $clientSecret
-	 *  AND client_endpoints.redirect_uri = $redirectUri
-	 * </code>
-	 *
-	 * 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 bool|array               Returns false if the validation fails, array on success
-	 */
-    public function getClient($clientId = null, $clientSecret = null, $redirectUri = null);
-}

src/OAuth2/Storage/ScopeInterface.php

@@ -1,41 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Scope storage interface
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Storage;
-
-interface ScopeInterface
-{
-    /**
-     * Return information about a scope
-     *
-     * Example SQL query:
-     *
-     * <code>
-     * SELECT * FROM oauth_scopes WHERE scope = $scope
-     * </code>
-     *
-     * Response:
-     *
-     * <code>
-     * Array
-     * (
-     *     [id] => (int) The scope's ID
-     *     [scope] => (string) The scope itself
-     *     [name] => (string) The scope's name
-     *     [description] => (string) The scope's description
-     * )
-     * </code>
-     *
-     * @param  string     $scope The scope
-     * @return bool|array If the scope doesn't exist return false
-     */
-    public function getScope($scope);
-}

src/OAuth2/Storage/SessionInterface.php

@@ -1,250 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Session storage interface
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Storage;
-
-interface SessionInterface
-{
-	/**
-     * Create a new OAuth session
-     *
-     * Example SQL query:
-     *
-     * <code>
-     * INSERT INTO oauth_sessions (client_id, redirect_uri, owner_type,
-     * 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 $refreshToken      The refresh token (default = "null")
-     * @param  int    $accessTokenExpire The expiry time of an access token as a unix timestamp
-     * @param  string $stage             The stage of the session (default ="request")
-     * @return int                       The session ID
-     */
-    public function createSession(
-        $clientId,
-        $redirectUri,
-        $type = 'user',
-        $typeId = null,
-        $authCode = null,
-        $accessToken = null,
-        $refreshToken = null,
-        $accessTokenExpire = null,
-        $stage = 'requested'
-    );
-
-    /**
-     * Update an OAuth session
-     *
-     * Example SQL 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 $refreshToken      The refresh token (default = "null")
-     * @param  int    $accessTokenExpire The expiry time of an access token as a unix timestamp
-     * @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 $typeId   The session owner's ID
-     * @return  void
-     */
-    public function deleteSession(
-        $clientId,
-        $type,
-        $typeId
-    );
-
-    /**
-     * Validate that an authorisation code is valid
-     *
-     * Example SQL query:
-     *
-     * <code>
-     * SELECT id FROM oauth_sessions WHERE client_id = $clientID AND
-     *  redirect_uri = $redirectUri AND auth_code = $authCode
-     * </code>
-     *
-     * Response:
-     *
-     * <code>
-     * Array
-     * (
-     *     [id] => (int) The session ID
-     *     [client_id] => (string) The client ID
-     *     [redirect_uri] => (string) The redirect URI
-     *     [owner_type] => (string) The session owner type
-     *     [owner_id] => (string) The session owner's ID
-     *     [auth_code] => (string) The authorisation code
-     *     [stage] => (string) The session's stage
-     *     [first_requested] => (int) Unix timestamp of the time the session was
-     *      first generated
-     *     [last_updated] => (int) Unix timestamp of the time the session was
-     *      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
-     */
-    public function validateAuthCode(
-        $clientId,
-        $redirectUri,
-        $authCode
-    );
-
-    /**
-     * Validate an access token
-     *
-     * Example SQL query:
-     *
-     * <code>
-     * SELECT id, owner_id, owner_type FROM oauth_sessions WHERE access_token = $accessToken
-     * </code>
-     *
-     * Response:
-     *
-     * <code>
-     * Array
-     * (
-     *     [id] => (int) The session ID
-     *     [owner_type] => (string) The owner type
-     *     [owner_id] => (string) The owner ID
-     * )
-     * </code>
-     *
-     * @param  [type] $accessToken [description]
-     * @return [type]              [description]
-     */
-    public function validateAccessToken($accessToken);
-
-    /**
-     * Return the access token for a given session
-     *
-     * Example SQL 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
-     */
-    public function getAccessToken($sessionId);
-
-    /**
-     * Validate a refresh token
-     * @param  string $refreshToken The refresh token
-     * @param  string $clientId     The client ID
-     * @return int                  The session ID
-     */
-    public function validateRefreshToken($refreshToken, $clientId);
-
-    /**
-     * Update the refresh token
-     *
-     * Example SQL 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);
-
-    /**
-     * Associates a session with a scope
-     *
-     * Example SQL query:
-     *
-     * <code>
-     * INSERT INTO oauth_session_scopes (session_id, scope_id) VALUE ($sessionId,
-     *  $scopeId)
-     * </code>
-     *
-     * @param int    $sessionId The session ID
-     * @param string $scopeId   The scope ID
-     * @return void
-     */
-    public function associateScope($sessionId, $scopeId);
-
-    /**
-     * Return the scopes associated with an access token
-     *
-     * Example SQL query:
-     *
-     * <code>
-     * SELECT oauth_scopes.scope FROM oauth_session_scopes JOIN oauth_scopes ON
-     *  oauth_session_scopes.scope_id = oauth_scopes.id WHERE
-     *  session_id = $sessionId
-     * </code>
-     *
-     * Response:
-     *
-     * <code>
-     * Array
-     * (
-     *     [0] => (string) The scope
-     *     [1] => (string) The scope
-     *     [2] => (string) The scope
-     *     ...
-     *     ...
-     * )
-     * </code>
-     *
-     * @param  int   $sessionId The session ID
-     * @return array
-     */
-    public function getScopes($sessionId);
-}

src/OAuth2/Util/RedirectUri.php

@@ -1,31 +0,0 @@
-<?php
-/**
- * OAuth 2.0 Redirect URI generator
- *
- * @package     lncd/oauth2
- * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
- * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
- */
-
-namespace OAuth2\Util;
-
-/**
- * RedirectUri class
- */
-class RedirectUri
-{
-	/**
-	 * Generate a new redirect uri
-	 * @param  string $uri            The base URI
-	 * @param  array  $params         The query string parameters
-	 * @param  string $queryDelimeter The query string delimeter (default: "?")
-	 * @return string                 The updated URI
-	 */
-    public static function make($uri, $params = array(), $queryDelimeter = '?')
-    {
-        $uri .= (strstr($uri, $queryDelimeter) === false) ? $queryDelimeter : '&';
-        return $uri.http_build_query($params);
-    }
-}

src/OAuth2/Util/Request.php

@@ -1,100 +0,0 @@
-<?php
-
-namespace OAuth2\Util;
-
-use OutOfBoundsException;
-use InvalidMethodCallException;
-use InvalidArgumentException;
-
-class Request implements RequestInterface
-{
-    protected $get = array();
-    protected $post = array();
-    protected $cookies = array();
-    protected $files = array();
-    protected $server = array();
-    protected $headers = array();
-
-    public static function buildFromGlobals()
-    {
-        return new static($_GET, $_POST, $_COOKIE, $_FILES, $_SERVER);
-    }
-
-    public function __construct(array $get = array(), array $post = array(), array $cookies = array(), array $files = array(), array $server = array(), $headers = array())
-    {
-        $this->get = $get;
-        $this->post = $post;
-        $this->cookies = $cookies;
-        $this->files = $files;
-        $this->server = $server;
-
-        if (empty($headers)) {
-            $this->headers = $this->readHeaders();
-        }
-    }
-
-    public function get($index = null, $default = null)
-    {
-        return $this->getPropertyValue('get', $index, $default);
-    }
-
-    public function post($index = null, $default = null)
-    {
-        return $this->getPropertyValue('post', $index, $default);
-    }
-
-    public function file($index = null, $default = null)
-    {
-        return $this->getPropertyValue('files', $index, $default);
-    }
-
-    public function cookie($index = null, $default = null)
-    {
-        return $this->getPropertyValue('cookies', $index, $default);
-    }
-
-    public function server($index = null, $default = null)
-    {
-        return $this->getPropertyValue('server', $index, $default);
-    }
-
-    public function header($index = null, $default = null)
-    {
-        return $this->getPropertyValue('headers', $index, $default);
-    }
-
-    protected function readHeaders()
-    {
-        if (function_exists('getallheaders')) {
-            // @codeCoverageIgnoreStart
-            $headers = getallheaders();
-        } else {
-            // @codeCoverageIgnoreEnd
-            $headers = array();
-            foreach ($this->server() as $name => $value) {
-                if (substr($name, 0, 5) == 'HTTP_') {
-                    $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
-                    $headers[$name] = $value;
-                }
-            }
-        }
-
-        return $headers;
-   }
-
-    protected function getPropertyValue($property, $index = null, $default = null)
-    {
-        if ( ! isset($this->{$property})) {
-            throw new InvalidArgumentException("Property '$property' does not exist.");
-        }
-        if (is_null($index)) {
-            return $this->{$property};
-        }
-
-        if ( ! array_key_exists($index, $this->{$property})) {
-            return $default;
-        }
-
-        return $this->{$property}[$index];
-    }
-}

src/OAuth2/Util/RequestInterface.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace OAuth2\Util;
-
-interface RequestInterface
-{
-
-    public static function buildFromGlobals();
-
-    public function __construct(array $get = array(), array $post = array(), array $cookies = array(), array $files = array(), array $server = array(), $headers = array());
-
-    public function get($index = null);
-
-    public function post($index = null);
-
-    public function cookie($index = null);
-
-    public function file($index = null);
-
-    public function server($index = null);
-
-    public function header($index = null);
-
-}

src/ResourceServer.php

@@ -0,0 +1,138 @@
+<?php
+/**
+ * OAuth 2.0 Resource Server
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server;
+
+use League\OAuth2\Server\Storage\ClientInterface;
+use League\OAuth2\Server\Storage\AccessTokenInterface;
+use League\OAuth2\Server\Storage\SessionInterface;
+use League\OAuth2\Server\Storage\ScopeInterface;
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\TokenType\Bearer;
+use League\OAuth2\Server\Exception;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * OAuth 2.0 Resource Server
+ */
+class ResourceServer extends AbstractServer
+{
+    /**
+     * The access token
+     * @var \League\OAuth2\Server\Entity\AccessTokenEntity
+     */
+    protected $accessToken;
+
+    /**
+     * The query string key which is used by clients to present the access token (default: access_token)
+     * @var string
+     */
+    protected $tokenKey = 'access_token';
+
+    /**
+     * Initialise the resource server
+     * @param  SessionInterface    $sessionStorage
+     * @param  AccessTokenInteface $accessTokenStorage
+     * @param  ClientInterface     $clientStorage
+     * @param  ScopeInterface      $scopeStorage
+     * @return self
+     */
+    public function __construct(
+        SessionInterface $sessionStorage,
+        AccessTokenInterface $accessTokenStorage,
+        ClientInterface $clientStorage,
+        ScopeInterface $scopeStorage
+    ) {
+        $this->setSessionStorage($sessionStorage);
+        $this->setAccessTokenStorage($accessTokenStorage);
+        $this->setClientStorage($clientStorage);
+        $this->setScopeStorage($scopeStorage);
+
+        // Set Bearer as the default token type
+        $this->setTokenType(new Bearer);
+
+        parent::__construct();
+
+        return $this;
+    }
+
+    /**
+     * Sets the query string key for the access token.
+     * @param $key The new query string key
+     * @return self
+     */
+    public function setIdKey($key)
+    {
+        $this->tokenKey = $key;
+
+        return $this;
+    }
+
+    /**
+     * Gets the access token
+     * @return string
+     */
+    public function getAccessToken()
+    {
+        return $this->accessToken->getId();
+    }
+
+    /**
+     * Checks if the access token is valid or not
+     * @param $headersOnly Limit Access Token to Authorization header only
+     * @return bool
+     */
+    public function isValidRequest($headersOnly = true, $accessToken = null)
+    {
+        $accessTokenString = ($accessToken !== null)
+                                ? $accessToken
+                                : $this->determineAccessToken($headersOnly);
+
+        // Set the access token
+        $this->accessToken = $this->getAccessTokenStorage()->get($accessTokenString);
+
+        // Ensure the access token exists
+        if (!$this->accessToken instanceof AccessTokenEntity) {
+            throw new Exception\AccessDeniedException;
+        }
+
+        // Check the access token hasn't expired
+        // Ensure the auth code hasn't expired
+        if ($this->accessToken->isExpired() === true) {
+            throw new Exception\AccessDeniedException;
+        }
+
+        return true;
+    }
+
+    /**
+     * Reads in the access token from the headers
+     * @param $headersOnly Limit Access Token to Authorization header only
+     * @throws Exception\MissingAccessTokenException Thrown if there is no access token presented
+     * @return string
+     */
+    public function determineAccessToken($headersOnly = false)
+    {
+        if ($this->getRequest()->headers->get('Authorization') !== null) {
+            $accessToken = $this->getTokenType()->determineAccessTokenInHeader($this->getRequest());
+        } elseif ($headersOnly === false) {
+            $accessToken = ($this->getRequest()->server->get('REQUEST_METHOD') === 'GET')
+                                ? $this->getRequest()->query->get($this->tokenKey)
+                                : $this->getRequest()->request->get($this->tokenKey);
+        }
+
+        if (empty($accessToken)) {
+            throw new Exception\InvalidRequestException('access token');
+        }
+
+        return $accessToken;
+    }
+}

src/Storage/AbstractStorage.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * OAuth 2.0 abstract storage
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Storage;
+
+use League\OAuth2\Server\AbstractServer;
+
+/**
+ * Abstract storage class
+ */
+abstract class AbstractStorage implements StorageInterface
+{
+    /**
+     * Server
+     * @var \League\OAuth2\Server\AbstractServer $server
+     */
+    protected $server;
+
+    /**
+     * Set the server
+     * @param \League\OAuth2\Server\AbstractServer $server
+     */
+    public function setServer(AbstractServer $server)
+    {
+        $this->server = $server;
+
+        return $this;
+    }
+
+    /**
+     * Return the server
+     * @return \League\OAuth2\Server\AbstractServer
+     */
+    protected function getServer()
+    {
+        return $this->server;
+    }
+}

src/Storage/AccessTokenInterface.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * OAuth 2.0 Access token storage interface
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Storage;
+
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\AbstractTokenEntity;
+use League\OAuth2\Server\Entity\RefreshTokenEntity;
+use League\OAuth2\Server\Entity\ScopeEntity;
+
+/**
+ * Access token interface
+ */
+interface AccessTokenInterface extends StorageInterface
+{
+    /**
+     * Get an instance of Entity\AccessTokenEntity
+     * @param  string                                         $token The access token
+     * @return \League\OAuth2\Server\Entity\AccessTokenEntity
+     */
+    public function get($token);
+
+    /**
+     * Get the scopes for an access token
+     * @param  \League\OAuth2\Server\Entity\AbstractTokenEntity $token The access token
+     * @return array                                            Array of \League\OAuth2\Server\Entity\ScopeEntity
+     */
+    public function getScopes(AbstractTokenEntity $token);
+
+    /**
+     * Creates a new access token
+     * @param  string                                   $token      The access token
+     * @param  integer                                  $expireTime The expire time expressed as a unix timestamp
+     * @param  string|integer                           $sessionId  The session ID
+     * @return \League\OAuth2\Server\Entity\AccessToken
+     */
+    public function create($token, $expireTime, $sessionId);
+
+    /**
+     * Associate a scope with an acess token
+     * @param  \League\OAuth2\Server\Entity\AbstractTokenEntity $token The access token
+     * @param  \League\OAuth2\Server\Entity\ScopeEntity         $scope The scope
+     * @return void
+     */
+    public function associateScope(AbstractTokenEntity $token, ScopeEntity $scope);
+
+    /**
+     * Delete an access token
+     * @param  \League\OAuth2\Server\Entity\AbstractTokenEntity $token The access token to delete
+     * @return void
+     */
+    public function delete(AbstractTokenEntity $token);
+}

src/Storage/AuthCodeInterface.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * OAuth 2.0 Auth code storage interface
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Storage;
+
+use League\OAuth2\Server\Entity\AuthCodeEntity;
+use League\OAuth2\Server\Entity\ScopeEntity;
+
+/**
+ * Auth code storage interface
+ */
+interface AuthCodeInterface extends StorageInterface
+{
+    /**
+     * Get the auth code
+     * @param  string                                      $code
+     * @return \League\OAuth2\Server\Entity\AuthCodeEntity
+     */
+    public function get($code);
+
+    /**
+     * Create an auth code.
+     * @param string  $token       The token ID
+     * @param integer $expireTime  Token expire time
+     * @param integer $sessionId   Session identifier
+     * @param string  $redirectUri Client redirect uri
+     *
+     * @return void
+     */
+    public function create($token, $expireTime, $sessionId, $redirectUri);
+
+    /**
+     * Get the scopes for an access token
+     * @param  \League\OAuth2\Server\Entity\AuthCodeEntity $token The auth code
+     * @return array                                       Array of \League\OAuth2\Server\Entity\ScopeEntity
+     */
+    public function getScopes(AuthCodeEntity $token);
+
+    /**
+     * Associate a scope with an acess token
+     * @param  \League\OAuth2\Server\Entity\AuthCodeEntity $token The auth code
+     * @param  \League\OAuth2\Server\Entity\ScopeEntity    $scope The scope
+     * @return void
+     */
+    public function associateScope(AuthCodeEntity $token, ScopeEntity $scope);
+
+    /**
+     * Delete an access token
+     * @param  \League\OAuth2\Server\Entity\AuthCodeEntity $token The access token to delete
+     * @return void
+     */
+    public function delete(AuthCodeEntity $token);
+}

src/Storage/ClientInterface.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * OAuth 2.0 Client storage interface
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Storage;
+
+use League\OAuth2\Server\Entity\SessionEntity;
+
+/**
+ * Client storage interface
+ */
+interface ClientInterface extends StorageInterface
+{
+    /**
+     * Validate a client
+     * @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")
+     * @param  string                                   $grantType    The grant type used (default = "null")
+     * @return League\OAuth2\Server\Entity\ClientEntity
+     */
+    public function get($clientId, $clientSecret = null, $redirectUri = null, $grantType = null);
+
+    /**
+     * Get the client associated with a session
+     * @param  \League\OAuth2\Server\Entity\SessionEntity $session The session
+     * @return \League\OAuth2\Server\Entity\ClientEntity
+     */
+    public function getBySession(SessionEntity $session);
+}

src/Storage/RefreshTokenInterface.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * OAuth 2.0 Refresh token storage interface
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Storage;
+
+use League\OAuth2\Server\Entity\RefreshTokenEntity;
+
+/**
+ * Refresh token interface
+ */
+interface RefreshTokenInterface extends StorageInterface
+{
+    /**
+     * Return a new instance of \League\OAuth2\Server\Entity\RefreshTokenEntity
+     * @param  string                                          $token
+     * @return \League\OAuth2\Server\Entity\RefreshTokenEntity
+     */
+    public function get($token);
+
+    /**
+     * Create a new refresh token_name
+     * @param  string                                          $token
+     * @param  integer                                         $expireTime
+     * @param  string                                          $accessToken
+     * @return \League\OAuth2\Server\Entity\RefreshTokenEntity
+     */
+    public function create($token, $expireTime, $accessToken);
+
+    /**
+     * Delete the refresh token
+     * @param  \League\OAuth2\Server\Entity\RefreshTokenEntity $token
+     * @return void
+     */
+    public function delete(RefreshTokenEntity $token);
+}

src/Storage/ScopeInterface.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * OAuth 2.0 Scope storage interface
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Storage;
+
+/**
+ * Scope interface
+ */
+interface ScopeInterface extends StorageInterface
+{
+    /**
+     * Return information about a scope
+     * @param  string                                   $scope     The scope
+     * @param  string                                   $grantType The grant type used in the request (default = "null")
+     * @param  string                                   $clientId  The client sending the request (default = "null")
+     * @return \League\OAuth2\Server\Entity\ScopeEntity
+     */
+    public function get($scope, $grantType = null, $clientId = null);
+}

src/Storage/SessionInterface.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * OAuth 2.0 Session storage interface
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Storage;
+
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\AuthCodeEntity;
+use League\OAuth2\Server\Entity\SessionEntity;
+use League\OAuth2\Server\Entity\ScopeEntity;
+
+/**
+ * Session storage interface
+ */
+interface SessionInterface extends StorageInterface
+{
+    /**
+     * Get a session from an access token
+     * @param  \League\OAuth2\Server\Entity\AccessTokenEntity $accessToken The access token
+     * @return \League\OAuth2\Server\Entity\SessionEntity
+     */
+    public function getByAccessToken(AccessTokenEntity $accessToken);
+
+    /**
+     * Get a session from an auth code
+     * @param  \League\OAuth2\Server\Entity\AuthCodeEntity $authCode The auth code
+     * @return \League\OAuth2\Server\Entity\SessionEntity
+     */
+    public function getByAuthCode(AuthCodeEntity $authCode);
+
+    /**
+     * Get a session's scopes
+     * @param  \League\OAuth2\Server\Entity\SessionEntity
+     * @return array Array of \League\OAuth2\Server\Entity\ScopeEntity
+     */
+    public function getScopes(SessionEntity $session);
+
+    /**
+     * Create a new session
+     * @param  string  $ownerType         Session owner's type (user, client)
+     * @param  string  $ownerId           Session owner's ID
+     * @param  string  $clientId          Client ID
+     * @param  string  $clientRedirectUri Client redirect URI (default = null)
+     * @return integer The session's ID
+     */
+    public function create($ownerType, $ownerId, $clientId, $clientRedirectUri = null);
+
+    /**
+     * Associate a scope with a session
+     * @param  \League\OAuth2\Server\Entity\SessionEntity $scope The scope
+     * @param  \League\OAuth2\Server\Entity\ScopeEntity   $scope The scope
+     * @return void
+     */
+    public function associateScope(SessionEntity $session, ScopeEntity $scope);
+}

src/Storage/StorageInterface.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * OAuth 2.0 Storage interface
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Storage;
+
+use League\OAuth2\Server\AbstractServer;
+
+/**
+ * Storage interface
+ */
+interface StorageInterface
+{
+    /**
+     * Set the server
+     * @param \League\OAuth2\Server\AbstractServer $server
+     */
+    public function setServer(AbstractServer $server);
+}

src/TokenType/AbstractTokenType.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * OAuth 2.0 Abstract Token Type
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\TokenType;
+
+use Symfony\Component\HttpFoundation\Request;
+use League\OAuth2\Server\AbstractServer;
+use League\OAuth2\Server\Entity\SessionEntity;
+
+abstract class AbstractTokenType
+{
+    /**
+     * Response array
+     * @var array
+     */
+    protected $response = [];
+
+    /**
+     * Server
+     * @var \League\OAuth2\Server\AbstractServer $server
+     */
+    protected $server;
+
+    /**
+     * Server
+     * @var \League\OAuth2\Server\Entity\SessionEntity $session
+     */
+    protected $session;
+
+    /**
+     * Set the server
+     * @param \League\OAuth2\Server\AbstractServer $server
+     */
+    public function setServer(AbstractServer $server)
+    {
+        $this->server = $server;
+        return $this;
+    }
+
+    /**
+     * Set the session entity
+     * @param \League\OAuth2\Server\Entity\SessionEntity $session
+     */
+    public function setSession(SessionEntity $session)
+    {
+        $this->session = $session;
+        return $this;
+    }
+
+    /**
+     * Set a key/value response pair
+     * @param string $key
+     * @param mixed  $value
+     */
+    public function setParam($key, $value)
+    {
+        $this->response[$key] = $value;
+    }
+
+    /**
+     * Get a key from the response array
+     * @param  string $key
+     * @return mixed
+     */
+    public function getParam($key)
+    {
+        return isset($this->response[$key]) ? $this->response[$key] : null;
+    }
+
+    /**
+     * Determine the access token in the authorization header
+     * @param  \Symfony\Component\HttpFoundation\Request $request
+     * @return string
+     */
+    abstract public function determineAccessTokenInHeader(Request $request);
+}

src/TokenType/Bearer.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * OAuth 2.0 Bearer Token Type
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\TokenType;
+
+use Symfony\Component\HttpFoundation\Request;
+
+class Bearer extends AbstractTokenType implements TokenTypeInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function generateResponse()
+    {
+        $return = [
+            'access_token'  =>  $this->getParam('access_token'),
+            'token_type'    =>  'Bearer',
+            'expires_in'    =>  $this->getParam('expires_in')
+        ];
+
+        if (!is_null($this->getParam('refresh_token'))) {
+            $return['refresh_token'] = $this->getParam('refresh_token');
+        }
+
+        return $return;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function determineAccessTokenInHeader(Request $request)
+    {
+        $header = $request->headers->get('Authorization');
+        $accessToken = trim(preg_replace('/^(?:\s+)?Bearer\s/', '', $header));
+
+        return ($accessToken === 'Bearer') ? '' : $accessToken;
+    }
+}

src/TokenType/TokenTypeInterface.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * OAuth 2.0 Token Type Interface
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\TokenType;
+
+interface TokenTypeInterface
+{
+    /**
+     * Generate a response
+     * @return array
+     */
+    public function generateResponse();
+}

src/Util/KeyAlgorithm/DefaultAlgorithm.php

@@ -1,27 +1,22 @@
 <?php
 /**
- * OAuth 2.0 Secure key generator
+ * OAuth 2.0 Secure key interface
  *
- * @package     lncd/oauth2
+ * @package     league/oauth2-server
  * @author      Alex Bilbie <hello@alexbilbie.com>
- * @copyright   Copyright (c) 2013 University of Lincoln
+ * @copyright   Copyright (c) Alex Bilbie
  * @license     http://mit-license.org/
- * @link        http://github.com/lncd/oauth2
+ * @link        https://github.com/thephpleague/oauth2-server
  */
 
-namespace OAuth2\Util;
+namespace League\OAuth2\Server\Util\KeyAlgorithm;
 
-/**
- * SecureKey class
- */
-class SecureKey
+class DefaultAlgorithm implements KeyAlgorithmInterface
 {
     /**
-     * Generate a new unique code
-     * @param  integer $len Length of the generated code
-     * @return string
+     * {@inheritdoc}
      */
-    public static function make($len = 40)
+    public function generate($len = 40)
     {
         // We generate twice as many bytes here because we want to ensure we have
         // enough after we base64 encode it to get the length we need because we
@@ -37,4 +32,4 @@ class SecureKey
 
         return substr(str_replace(array('/', '+', '='), '', base64_encode($bytes)), 0, $len);
     }
-}
+}

src/Util/KeyAlgorithm/KeyAlgorithmInterface.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * OAuth 2.0 Secure key interface
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Util\KeyAlgorithm;
+
+interface KeyAlgorithmInterface
+{
+    /**
+     * Generate a new unique code
+     * @param  integer $len Length of the generated code
+     * @return string
+     */
+    public function generate($len);
+}

src/Util/RedirectUri.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * OAuth 2.0 Redirect URI generator
+ *
+ * @package     league/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) Alex Bilbie
+ * @license     http://mit-license.org/
+ * @link        https://github.com/thephpleague/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Util;
+
+/**
+ * RedirectUri class
+ */
+class RedirectUri
+{
+    /**
+     * Generate a new redirect uri
+     * @param  string $uri            The base URI
+     * @param  array  $params         The query string parameters
+     * @param  string $queryDelimeter The query string delimeter (default: "?")
+     * @return string The updated URI
+     */
+    public static function make($uri, $params = array(), $queryDelimeter = '?')
+    {
+        $uri .= (strstr($uri, $queryDelimeter) === false) ? $queryDelimeter : '&';
+
+        return $uri.http_build_query($params);
+    }
+}

src/Util/SecureKey.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * OAuth 2.0 Secure key generator
+ *
+ * @package     php-loep/oauth2-server
+ * @author      Alex Bilbie <hello@alexbilbie.com>
+ * @copyright   Copyright (c) 2013 PHP League of Extraordinary Packages
+ * @license     http://mit-license.org/
+ * @link        http://github.com/php-loep/oauth2-server
+ */
+
+namespace League\OAuth2\Server\Util;
+
+use League\OAuth2\Server\Util\KeyAlgorithm\DefaultAlgorithm;
+use League\OAuth2\Server\Util\KeyAlgorithm\KeyAlgorithmInterface;
+
+/**
+ * SecureKey class
+ */
+class SecureKey
+{
+    protected static $algorithm;
+
+    /**
+     * Generate a new unique code
+     * @param  integer $len Length of the generated code
+     * @return string
+     */
+    public static function generate($len = 40)
+    {
+        return self::getAlgorithm()->generate($len);
+    }
+
+    /**
+     * @param KeyAlgorithmInterface $algorithm
+     */
+    public static function setAlgorithm(KeyAlgorithmInterface $algorithm)
+    {
+        self::$algorithm = $algorithm;
+    }
+
+    /**
+     * @return KeyAlgorithmInterface
+     */
+    public static function getAlgorithm()
+    {
+        if (is_null(self::$algorithm)) {
+            self::$algorithm = new DefaultAlgorithm();
+        }
+
+        return self::$algorithm;
+    }
+}

tests/authorization/AuthServerTest.php

@@ -1,608 +0,0 @@
-<?php
-
-use \Mockery as m;
-
-class Authorization_Server_test extends PHPUnit_Framework_TestCase
-{
-    private $client;
-    private $session;
-    private $scope;
-
-    public function setUp()
-    {
-        $this->client = M::mock('OAuth2\Storage\ClientInterface');
-        $this->session = M::mock('OAuth2\Storage\SessionInterface');
-        $this->scope = M::mock('OAuth2\Storage\ScopeInterface');
-    }
-
-    private function returnDefault()
-    {
-        return new OAuth2\AuthServer($this->client, $this->session, $this->scope);
-    }
-
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     */
-    public function test__construct_NoStorage()
-    {
-        $a = new OAuth2\AuthServer;
-    }
-
-    public function test__contruct_WithStorage()
-    {
-        $a = $this->returnDefault();
-    }
-
-    public function test_getExceptionMessage()
-    {
-        $m = OAuth2\AuthServer::getExceptionMessage('access_denied');
-
-        $reflector = new ReflectionClass($this->returnDefault());
-        $exceptionMessages = $reflector->getProperty('exceptionMessages');
-        $exceptionMessages->setAccessible(true);
-        $v = $exceptionMessages->getValue();
-
-        $this->assertEquals($v['access_denied'], $m);
-    }
-
-    public function test_getExceptionCode()
-    {
-        $this->assertEquals('access_denied', OAuth2\AuthServer::getExceptionType(2));
-    }
-
-    public function test_hasGrantType()
-    {
-        $this->assertFalse(OAuth2\AuthServer::hasGrantType('test'));
-    }
-
-    public function test_addGrantType()
-    {
-        $a = $this->returnDefault();
-        $grant = M::mock('OAuth2\Grant\GrantTypeInterface');
-        $grant->shouldReceive('getResponseType')->andReturn('test');
-        $a->addGrantType($grant, 'test');
-
-        $this->assertTrue(OAuth2\AuthServer::hasGrantType('test'));
-    }
-
-    public function test_addGrantType_noIdentifier()
-    {
-        $a = $this->returnDefault();
-        $grant = M::mock('OAuth2\Grant\GrantTypeInterface');
-        $grant->shouldReceive('getIdentifier')->andReturn('test');
-        $grant->shouldReceive('getResponseType')->andReturn('test');
-        $a->addGrantType($grant);
-
-        $this->assertTrue(OAuth2\AuthServer::hasGrantType('test'));
-    }
-
-    public function test_getScopeDelimeter()
-    {
-        $a = $this->returnDefault();
-        $this->assertEquals(',', $a->getScopeDelimeter());
-    }
-
-    public function test_setScopeDelimeter()
-    {
-        $a = $this->returnDefault();
-        $a->setScopeDelimeter(';');
-        $this->assertEquals(';', $a->getScopeDelimeter());
-    }
-
-    public function test_getExpiresIn()
-    {
-        $a = $this->returnDefault();
-        $a->setExpiresIn(7200);
-        $this->assertEquals(7200, $a::getExpiresIn());
-    }
-
-    public function test_setExpiresIn()
-    {
-        $a = $this->returnDefault();
-        $a->setScopeDelimeter(';');
-        $this->assertEquals(';', $a->getScopeDelimeter());
-    }
-
-    public function test_setRequest()
-    {
-        $a = $this->returnDefault();
-        $request = new OAuth2\Util\Request();
-        $a->setRequest($request);
-
-        $reflector = new ReflectionClass($a);
-        $requestProperty = $reflector->getProperty('request');
-        $requestProperty->setAccessible(true);
-        $v = $requestProperty->getValue();
-
-        $this->assertTrue($v instanceof OAuth2\Util\RequestInterface);
-    }
-
-    public function test_getRequest()
-    {
-        $a = $this->returnDefault();
-        $request = new OAuth2\Util\Request();
-        $a->setRequest($request);
-        $v = $a::getRequest();
-
-        $this->assertTrue($v instanceof OAuth2\Util\RequestInterface);
-    }
-
-    public function test_getStorage()
-    {
-        $a = $this->returnDefault();
-        $this->assertTrue($a->getStorage('session') instanceof OAuth2\Storage\SessionInterface);
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_checkAuthoriseParams_noClientId()
-    {
-        $a = $this->returnDefault();
-        $a->checkAuthoriseParams();
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_checkAuthoriseParams_noRedirectUri()
-    {
-        $a = $this->returnDefault();
-        $a->checkAuthoriseParams(array(
-            'client_id' =>  1234
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    8
-     */
-    public function test_checkAuthoriseParams_badClient()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(false);
-
-        $a = $this->returnDefault();
-        $a->checkAuthoriseParams(array(
-            'client_id' =>  1234,
-            'redirect_uri'  =>  'http://foo/redirect'
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_checkAuthoriseParams_missingResponseType()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $a = $this->returnDefault();
-        $a->checkAuthoriseParams(array(
-            'client_id' =>  1234,
-            'redirect_uri'  =>  'http://foo/redirect'
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    3
-     */
-    public function test_checkAuthoriseParams_badResponseType()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $a = $this->returnDefault();
-        $a->checkAuthoriseParams(array(
-            'client_id' =>  1234,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'response_type' =>  'foo'
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_checkAuthoriseParams_missingScopes()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $a->checkAuthoriseParams(array(
-            'client_id' =>  1234,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'response_type' =>  'code',
-            'scope' =>  ''
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    4
-     */
-    public function test_checkAuthoriseParams_badScopes()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->scope->shouldReceive('getScope')->andReturn(false);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $a->checkAuthoriseParams(array(
-            'client_id' =>  1234,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'response_type' =>  'code',
-            'scope' =>  'foo'
-        ));
-    }
-
-    public function test_checkAuthoriseParams_passedInput()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->scope->shouldReceive('getScope')->andReturn(array(
-            'id'    =>  1,
-            'scope' =>  'foo',
-            'name'  =>  'Foo Name',
-            'description'   =>  'Foo Name Description'
-        ));
-
-        $v = $a->checkAuthoriseParams(array(
-            'client_id' =>  1234,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'response_type' =>  'code',
-            'scope' =>  'foo'
-        ));
-
-        $this->assertEquals(array(
-            'client_id' =>  1234,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'client_details' => array(
-                'client_id' => 1234,
-                'client_secret' => 5678,
-                'redirect_uri' => 'http://foo/redirect',
-                'name' => 'Example Client'
-            ),
-            'response_type' =>  'code',
-            'scopes'    =>  array(
-                array(
-                    'id'    =>  1,
-                    'scope' =>  'foo',
-                    'name'  =>  'Foo Name',
-                    'description'   =>  'Foo Name Description'
-                )
-            ),
-            'scope' =>  'foo'
-        ), $v);
-    }
-
-    public function test_checkAuthoriseParams()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->scope->shouldReceive('getScope')->andReturn(array(
-            'id'    =>  1,
-            'scope' =>  'foo',
-            'name'  =>  'Foo Name',
-            'description'   =>  'Foo Name Description'
-        ));
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $_GET['client_id'] = 1234;
-        $_GET['redirect_uri'] = 'http://foo/redirect';
-        $_GET['response_type'] = 'code';
-        $_GET['scope'] = 'foo';
-
-        $request = new OAuth2\Util\Request($_GET);
-        $a->setRequest($request);
-
-        $v = $a->checkAuthoriseParams();
-
-        $this->assertEquals(array(
-            'client_id' =>  1234,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'client_details' => array(
-                'client_id' => 1234,
-                'client_secret' => 5678,
-                'redirect_uri' => 'http://foo/redirect',
-                'name' => 'Example Client'
-            ),
-            'response_type' =>  'code',
-            'scopes'    =>  array(
-                array(
-                    'id'    =>  1,
-                    'scope' =>  'foo',
-                    'name'  =>  'Foo Name',
-                    'description'   =>  'Foo Name Description'
-                )
-            ),
-            'scope' =>  'foo'
-        ), $v);
-    }
-
-    function test_newAuthoriseRequest()
-    {
-        $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('createSession')->andReturn(1);
-        $this->session->shouldReceive('associateScope')->andReturn(null);
-
-        $a = $this->returnDefault();
-
-        $params = array(
-            'client_id' =>  1234,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'client_details' => array(
-                'client_id' => 1234,
-                'client_secret' => 5678,
-                'redirect_uri' => 'http://foo/redirect',
-                'name' => 'Example Client'
-            ),
-            'response_type' =>  'code',
-            'scopes'    =>  array(
-                array(
-                    'id'    =>  1,
-                    'scope' =>  'foo',
-                    'name'  =>  'Foo Name',
-                    'description'   =>  'Foo Name Description'
-                )
-            )
-        );
-
-        $v = $a->newAuthoriseRequest('user', 123, $params);
-
-        $this->assertEquals(40, strlen($v));
-    }
-
-    public function test_getGrantType()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $reflector = new ReflectionClass($a);
-        $method = $reflector->getMethod('getGrantType');
-        $method->setAccessible(true);
-
-        $result = $method->invoke($a, 'authorization_code');
-
-        $this->assertTrue($result instanceof OAuth2\Grant\GrantTypeInterface);
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_missingGrantType()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $v = $a->issueAccessToken();
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    7
-     */
-    public function test_issueAccessToken_badGrantType()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $v = $a->issueAccessToken(array('grant_type' => 'foo'));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_missingClientId()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'authorization_code'
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_missingClientSecret()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'authorization_code',
-            'client_id' =>  1234
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_missingRedirectUri()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'authorization_code',
-            'client_id' =>  1234,
-            'client_secret' =>  5678
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    8
-     */
-    public function test_issueAccessToken_badClient()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(false);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'authorization_code',
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect'
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_missingCode()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array());
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'authorization_code',
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect'
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    9
-     */
-    public function test_issueAccessToken_badCode()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array());
-        $this->session->shouldReceive('validateAuthCode')->andReturn(false);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'authorization_code',
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'code'  =>  'foobar'
-        ));
-    }
-
-    public function test_issueAccessToken_passedInput()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('updateSession')->andReturn(null);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'authorization_code',
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'code'  =>  'foobar'
-        ));
-
-        $this->assertArrayHasKey('access_token', $v);
-        $this->assertArrayHasKey('token_type', $v);
-        $this->assertArrayHasKey('expires', $v);
-        $this->assertArrayHasKey('expires_in', $v);
-
-        $this->assertEquals($a::getExpiresIn(), $v['expires_in']);
-        $this->assertEquals(time()+$a::getExpiresIn(), $v['expires']);
-    }
-
-    public function test_issueAccessToken()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('updateSession')->andReturn(null);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-
-        $_POST['grant_type'] = 'authorization_code';
-        $_POST['client_id'] = 1234;
-        $_POST['client_secret'] = 5678;
-        $_POST['redirect_uri'] = 'http://foo/redirect';
-        $_POST['code'] = 'foobar';
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken();
-
-        $this->assertArrayHasKey('access_token', $v);
-        $this->assertArrayHasKey('token_type', $v);
-        $this->assertArrayHasKey('expires', $v);
-        $this->assertArrayHasKey('expires_in', $v);
-
-        $this->assertEquals($a::getExpiresIn(), $v['expires_in']);
-        $this->assertEquals(time()+$a::getExpiresIn(), $v['expires']);
-    }
-
-    public function tearDown() {
-        M::close();
-    }
-}

tests/authorization/ClientCredentialsGrantTest.php

@@ -1,189 +0,0 @@
-<?php
-
-use \Mockery as m;
-
-class Client_Credentials_Grant_Test extends PHPUnit_Framework_TestCase
-{
-    private $client;
-    private $session;
-    private $scope;
-
-    public function setUp()
-    {
-        $this->client = M::mock('OAuth2\Storage\ClientInterface');
-        $this->session = M::mock('OAuth2\Storage\SessionInterface');
-        $this->scope = M::mock('OAuth2\Storage\ScopeInterface');
-    }
-
-    private function returnDefault()
-    {
-        return new OAuth2\AuthServer($this->client, $this->session, $this->scope);
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_clientCredentialsGrant_missingClientId()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\ClientCredentials());
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'client_credentials'
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_clientCredentialsGrant_missingClientPassword()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\ClientCredentials());
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'client_credentials',
-            'client_id' =>  1234
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    8
-     */
-    public function test_issueAccessToken_clientCredentialsGrant_badClient()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(false);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\ClientCredentials());
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'client_credentials',
-            'client_id' =>  1234,
-            'client_secret' =>  5678
-        ));
-    }
-
-    function test_issueAccessToken_clientCredentialsGrant_passedInput()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('createSession')->andReturn(1);
-        $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\ClientCredentials());
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'client_credentials',
-            'client_id' =>  1234,
-            'client_secret' =>  5678
-        ));
-
-        $this->assertArrayHasKey('access_token', $v);
-        $this->assertArrayHasKey('token_type', $v);
-        $this->assertArrayHasKey('expires', $v);
-        $this->assertArrayHasKey('expires_in', $v);
-
-        $this->assertEquals($a::getExpiresIn(), $v['expires_in']);
-        $this->assertEquals(time()+$a::getExpiresIn(), $v['expires']);
-    }
-
-    function test_issueAccessToken_clientCredentialsGrant()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('createSession')->andReturn(1);
-        $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\ClientCredentials());
-
-        $_POST['grant_type'] = 'client_credentials';
-        $_POST['client_id'] = 1234;
-        $_POST['client_secret'] = 5678;
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken();
-
-        $this->assertArrayHasKey('access_token', $v);
-        $this->assertArrayHasKey('token_type', $v);
-        $this->assertArrayHasKey('expires', $v);
-        $this->assertArrayHasKey('expires_in', $v);
-
-        $this->assertEquals($a::getExpiresIn(), $v['expires_in']);
-        $this->assertEquals(time()+$a::getExpiresIn(), $v['expires']);
-    }
-
-    function test_issueAccessToken_clientCredentialsGrant_withRefreshToken()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('createSession')->andReturn(1);
-        $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\ClientCredentials());
-        $a->addGrantType(new OAuth2\Grant\RefreshToken());
-
-        $_POST['grant_type'] = 'client_credentials';
-        $_POST['client_id'] = 1234;
-        $_POST['client_secret'] = 5678;
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken();
-
-        $this->assertArrayHasKey('access_token', $v);
-        $this->assertArrayHasKey('token_type', $v);
-        $this->assertArrayHasKey('expires', $v);
-        $this->assertArrayHasKey('expires_in', $v);
-        $this->assertArrayHasKey('refresh_token', $v);
-
-        $this->assertEquals($a::getExpiresIn(), $v['expires_in']);
-        $this->assertEquals(time()+$a::getExpiresIn(), $v['expires']);
-    }
-
-}

tests/authorization/PasswordGrantTest.php

@@ -1,347 +0,0 @@
-<?php
-
-use \Mockery as m;
-
-class Password_Grant_Test extends PHPUnit_Framework_TestCase
-{
-    private $client;
-    private $session;
-    private $scope;
-
-    public function setUp()
-    {
-        $this->client = M::mock('OAuth2\Storage\ClientInterface');
-        $this->session = M::mock('OAuth2\Storage\SessionInterface');
-        $this->scope = M::mock('OAuth2\Storage\ScopeInterface');
-    }
-
-    private function returnDefault()
-    {
-        return new OAuth2\AuthServer($this->client, $this->session, $this->scope);
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_passwordGrant_missingClientId()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\Password());
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'password'
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_passwordGrant_missingClientPassword()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\Password());
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'password',
-            'client_id' =>  1234
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    8
-     */
-    public function test_issueAccessToken_passwordGrant_badClient()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(false);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\Password());
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'password',
-            'client_id' =>  1234,
-            'client_secret' =>  5678
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\InvalidGrantTypeException
-     */
-    function test_issueAccessToken_passwordGrant_invalidCallback()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('createSession')->andReturn(1);
-        $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $testCredentials = null;
-
-        $a = $this->returnDefault();
-        $pgrant = new OAuth2\Grant\Password();
-        $pgrant->setVerifyCredentialsCallback($testCredentials);
-        $a->addGrantType($pgrant);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'password',
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'username'  => 'foo',
-            'password'  => 'bar'
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    function test_issueAccessToken_passwordGrant_missingUsername()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('createSession')->andReturn(1);
-        $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $testCredentials = function($u, $p) { return false; };
-
-        $a = $this->returnDefault();
-        $pgrant = new OAuth2\Grant\Password();
-        $pgrant->setVerifyCredentialsCallback($testCredentials);
-        $a->addGrantType($pgrant);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'password',
-            'client_id' =>  1234,
-            'client_secret' =>  5678
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    function test_issueAccessToken_passwordGrant_missingPassword()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('createSession')->andReturn(1);
-        $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $testCredentials = function($u, $p) { return false; };
-
-        $a = $this->returnDefault();
-        $pgrant = new OAuth2\Grant\Password();
-        $pgrant->setVerifyCredentialsCallback($testCredentials);
-        $a->addGrantType($pgrant);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'password',
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'username'  =>  'foo'
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    function test_issueAccessToken_passwordGrant_badCredentials()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('createSession')->andReturn(1);
-        $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $testCredentials = function($u, $p) { return false; };
-
-        $a = $this->returnDefault();
-        $pgrant = new OAuth2\Grant\Password();
-        $pgrant->setVerifyCredentialsCallback($testCredentials);
-        $a->addGrantType($pgrant);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'password',
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'username'  => 'foo',
-            'password'  => 'bar'
-        ));
-    }
-
-    function test_issueAccessToken_passwordGrant_passedInput()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('createSession')->andReturn(1);
-        $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $testCredentials = function($u, $p) { return 1; };
-
-        $a = $this->returnDefault();
-        $pgrant = new OAuth2\Grant\Password();
-        $pgrant->setVerifyCredentialsCallback($testCredentials);
-        $a->addGrantType($pgrant);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'password',
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'username'  => 'foo',
-            'password'  => 'bar'
-        ));
-
-        $this->assertArrayHasKey('access_token', $v);
-        $this->assertArrayHasKey('token_type', $v);
-        $this->assertArrayHasKey('expires', $v);
-        $this->assertArrayHasKey('expires_in', $v);
-
-        $this->assertEquals($a::getExpiresIn(), $v['expires_in']);
-        $this->assertEquals(time()+$a::getExpiresIn(), $v['expires']);
-    }
-
-    function test_issueAccessToken_passwordGrant()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('createSession')->andReturn(1);
-        $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $testCredentials = function($u, $p) { return 1; };
-
-        $a = $this->returnDefault();
-        $pgrant = new OAuth2\Grant\Password();
-        $pgrant->setVerifyCredentialsCallback($testCredentials);
-        $a->addGrantType($pgrant);
-
-        $_POST['grant_type'] = 'password';
-        $_POST['client_id'] = 1234;
-        $_POST['client_secret'] = 5678;
-        $_POST['username'] = 'foo';
-        $_POST['password'] = 'bar';
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken();
-
-        $this->assertArrayHasKey('access_token', $v);
-        $this->assertArrayHasKey('token_type', $v);
-        $this->assertArrayHasKey('expires', $v);
-        $this->assertArrayHasKey('expires_in', $v);
-
-        $this->assertEquals($a::getExpiresIn(), $v['expires_in']);
-        $this->assertEquals(time()+$a::getExpiresIn(), $v['expires']);
-    }
-
-    function test_issueAccessToken_passwordGrant_withRefreshToken()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('createSession')->andReturn(1);
-        $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $testCredentials = function($u, $p) { return 1; };
-
-        $a = $this->returnDefault();
-        $pgrant = new OAuth2\Grant\Password();
-        $pgrant->setVerifyCredentialsCallback($testCredentials);
-        $a->addGrantType($pgrant);
-        $a->addGrantType(new OAuth2\Grant\RefreshToken());
-
-        $_POST['grant_type'] = 'password';
-        $_POST['client_id'] = 1234;
-        $_POST['client_secret'] = 5678;
-        $_POST['username'] = 'foo';
-        $_POST['password'] = 'bar';
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken();
-
-        $this->assertArrayHasKey('access_token', $v);
-        $this->assertArrayHasKey('token_type', $v);
-        $this->assertArrayHasKey('expires', $v);
-        $this->assertArrayHasKey('expires_in', $v);
-        $this->assertArrayHasKey('refresh_token', $v);
-
-        $this->assertEquals($a::getExpiresIn(), $v['expires_in']);
-        $this->assertEquals(time()+$a::getExpiresIn(), $v['expires']);
-    }
-
-}

tests/authorization/RefreshTokenTest.php

@@ -1,233 +0,0 @@
-<?php
-
-use \Mockery as m;
-
-class Refresh_Token_test extends PHPUnit_Framework_TestCase
-{
-    private $client;
-    private $session;
-    private $scope;
-
-    public function setUp()
-    {
-        $this->client = M::mock('OAuth2\Storage\ClientInterface');
-        $this->session = M::mock('OAuth2\Storage\SessionInterface');
-        $this->scope = M::mock('OAuth2\Storage\ScopeInterface');
-    }
-
-    private function returnDefault()
-    {
-        return new OAuth2\AuthServer($this->client, $this->session, $this->scope);
-    }
-
-    public function test_issueAccessToken_with_refresh_token()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('updateSession')->andReturn(null);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\AuthCode());
-        $a->addGrantType(new OAuth2\Grant\RefreshToken());
-
-        $_POST['grant_type'] = 'authorization_code';
-        $_POST['client_id'] = 1234;
-        $_POST['client_secret'] = 5678;
-        $_POST['redirect_uri'] = 'http://foo/redirect';
-        $_POST['code'] = 'foobar';
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken();
-
-        $this->assertArrayHasKey('access_token', $v);
-        $this->assertArrayHasKey('token_type', $v);
-        $this->assertArrayHasKey('expires', $v);
-        $this->assertArrayHasKey('expires_in', $v);
-        $this->assertArrayHasKey('refresh_token', $v);
-
-        $this->assertEquals($a::getExpiresIn(), $v['expires_in']);
-        $this->assertEquals(time()+$a::getExpiresIn(), $v['expires']);
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_refreshTokenGrant_missingClientId()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\RefreshToken());
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'refresh_token'
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_refreshTokenGrant_missingClientSecret()
-    {
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\RefreshToken());
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'refresh_token',
-            'client_id' =>  1234
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    8
-     */
-    public function test_issueAccessToken_refreshTokenGrant_badClient()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(false);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\RefreshToken());
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'refresh_token',
-            'client_id' =>  1234,
-            'client_secret' =>  5678
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_refreshTokenGrant_missingRefreshToken()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array());
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\RefreshToken());
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'refresh_token',
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            //'refresh_token' =>
-        ));
-    }
-
-    /**
-     * @expectedException        OAuth2\Exception\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_refreshTokenGrant_badRefreshToken()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array());
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(false);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\RefreshToken());
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'refresh_token',
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'refresh_token' =>  'abcdef'
-        ));
-    }
-
-    public function test_issueAccessToken_refreshTokenGrant_passedInput()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('updateSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\RefreshToken());
-
-        $_POST['grant_type'] = 'refresh_token';
-        $_POST['client_id'] = 1234;
-        $_POST['client_secret'] = 5678;
-        $_POST['refresh_token'] = 'abcdef';
-
-        $request = new OAuth2\Util\Request(array(), $_POST);
-        $a->setRequest($request);
-
-        $v = $a->issueAccessToken();
-
-        $this->assertArrayHasKey('access_token', $v);
-        $this->assertArrayHasKey('token_type', $v);
-        $this->assertArrayHasKey('expires', $v);
-        $this->assertArrayHasKey('expires_in', $v);
-        $this->assertArrayHasKey('refresh_token', $v);
-
-        $this->assertEquals($a::getExpiresIn(), $v['expires_in']);
-        $this->assertEquals(time()+$a::getExpiresIn(), $v['expires']);
-    }
-
-    public function test_issueAccessToken_refreshTokenGrant()
-    {
-        $this->client->shouldReceive('getClient')->andReturn(array(
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'redirect_uri'  =>  'http://foo/redirect',
-            'name'  =>  'Example Client'
-        ));
-
-        $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
-        $this->session->shouldReceive('updateSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
-
-        $a = $this->returnDefault();
-        $a->addGrantType(new OAuth2\Grant\RefreshToken());
-
-        $v = $a->issueAccessToken(array(
-            'grant_type'    =>  'refresh_token',
-            'client_id' =>  1234,
-            'client_secret' =>  5678,
-            'refresh_token'  =>  'abcdef',
-        ));
-
-        $this->assertArrayHasKey('access_token', $v);
-        $this->assertArrayHasKey('token_type', $v);
-        $this->assertArrayHasKey('expires', $v);
-        $this->assertArrayHasKey('expires_in', $v);
-        $this->assertArrayHasKey('refresh_token', $v);
-
-        $this->assertEquals($a::getExpiresIn(), $v['expires_in']);
-        $this->assertEquals(time()+$a::getExpiresIn(), $v['expires']);
-    }
-}

tests/fuzz/grant-authcode.yml

@@ -0,0 +1,9 @@
+url: 'http://localhost:8000/authcode_grant.php/authorize?client_id=testclient&redirect_uri=http%3A%2F%2Fexample.com%2Fredirect&response_type=code&scope=basic'
+request:
+    method: GET
+response:
+    statusCode: 200
+    headers:
+        -
+            key: Location
+            valueRegex: /http:\/\/example.com\/redirect\?code=([a-zA-Z0-9]*)/

tests/fuzz/grant-client-credentials.yml

@@ -0,0 +1,67 @@
+url: 'http://localhost:8000/other_grants.php/access_token'
+request:
+    method: POST
+    body:
+        -
+            key: client_id
+            value: testclient
+            missing:
+                response.statusCode: 400
+                headers.content-type: "application/json"
+                body.error: invalid_request
+                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"client_id\" parameter."
+            invalid:
+                response.statusCode: 401
+                headers.content-type: "application/json"
+                body.error: invalid_client
+                body.message: "Client authentication failed."
+        -
+            key: client_secret
+            value: secret
+            missing:
+                response.statusCode: 400
+                headers.content-type: "application/json"
+                body.error: invalid_request
+                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"client_secret\" parameter."
+            invalid:
+                response.statusCode: 401
+                headers.content-type: "application/json"
+                body.error: invalid_client
+                body.message: "Client authentication failed."
+        -
+            key: grant_type
+            value: client_credentials
+            missing:
+                response.statusCode: 400
+                headers.content-type: "application/json"
+                body.error: invalid_request
+                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"grant_type\" parameter."
+            invalid:
+                response.statusCode: 400
+                headers.content-type: "application/json"
+                body.error: unsupported_grant_type
+                #body.message: "The authorization grant type XXX is not supported by the authorization server."
+        -
+            key: scope
+            value: "basic"
+            invalid:
+                response.statusCode: 400
+                headers.content-type: "application/json"
+                body.error: invalid_scope
+                border.message: fooooooooo
+response:
+    statusCode: 200
+    headers:
+        -
+            key: Content-type
+            value: application/json
+    body:
+        -
+            key: expires_in
+            valueType: integer
+        -
+            key: access_token
+            valueRegex: /([a-zA-Z0-9]*)/
+        -
+            key: token_type
+            value: Bearer

tests/fuzz/grant-password.yml

@@ -0,0 +1,88 @@
+url: 'http://localhost:8000/other_grants.php/access_token'
+request:
+    method: POST
+    body:
+        -
+            key: client_id
+            value: testclient
+            missing:
+                response.statusCode: 400
+                headers.content-type: "application/json"
+                body.error: invalid_request
+                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"client_id\" parameter."
+            invalid:
+                response.statusCode: 401
+                headers.content-type: "application/json"
+                body.error: invalid_client
+                body.message: "Client authentication failed."
+        -
+            key: client_secret
+            value: secret
+            missing:
+                response.statusCode: 400
+                headers.content-type: "application/json"
+                body.error: invalid_request
+                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"client_secret\" parameter."
+            invalid:
+                response.statusCode: 401
+                headers.content-type: "application/json"
+                body.error: invalid_client
+                body.message: "Client authentication failed."
+        -
+            key: username
+            value: alexbilbie
+            missing:
+                response.statusCode: 400
+                headers.content-type: "application/json"
+                body.error: invalid_request
+                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"username\" parameter."
+            invalid:
+                response.statusCode: 401
+                headers.content-type: "application/json"
+                body.error: invalid_credentials
+                body.message: "The user credentials were incorrect."
+        -
+            key: password
+            value: whisky
+            missing:
+                response.statusCode: 400
+                headers.content-type: "application/json"
+                body.error: invalid_request
+                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"password\" parameter."
+            invalid:
+                response.statusCode: 401
+                headers.content-type: "application/json"
+                body.error: invalid_credentials
+                body.message: "The user credentials were incorrect."
+        -
+            key: grant_type
+            value: password
+            missing:
+                response.statusCode: 400
+                headers.content-type: "application/json"
+                body.error: invalid_request
+                body.message: "The request is missing a required parameter, includes an invalid parameter value, includes a parameter more than once, or is otherwise malformed. Check the \"grant_type\" parameter."
+            invalid:
+                response.statusCode: 400
+                headers.content-type: "application/json"
+                body.error: unsupported_grant_type
+                #body.message: "The authorization grant type XXX is not supported by the authorization server."
+response:
+    statusCode: 200
+    headers:
+        -
+            key: Content-type
+            value: application/json
+    body:
+        -
+            key: expires_in
+            valueType: integer
+        -
+            key: access_token
+            valueRegex: /([a-zA-Z0-9]*)/
+        -
+            key: refresh_token
+            valueRegex: /([a-zA-Z0-9]*)/
+        -
+            key: token_type
+            value: Bearer