ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-12-23 05:29:52 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into develop

Browse Source
This commit is contained in:
Alex Bilbie 2012-09-19 19:34:17 +01:00
commit 0db10063ac
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -38,6 +38,10 @@ The resource server allows you to secure your API endpoints by checking for a va
* Support for [JSON web tokens](http://tools.ietf.org/wg/oauth/draft-ietf-oauth-json-web-token/). * 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/). * Support for [SAML assertions](http://tools.ietf.org/wg/oauth/draft-ietf-oauth-saml2-bearer/).
### Client support
* Merge in https://github.com/philsturgeon/codeigniter-oauth2
--- ---
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. 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.

4
tests/resource/server_test.php
View File

@ -72,7 +72,7 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase {
} }
/** /**
* @expectedException \Oauth2\Resource\OAuthResourceServerException * @expectedException \Oauth2\Resource\ClientException
* @expectedExceptionMessage An access token was not presented with the request * @expectedExceptionMessage An access token was not presented with the request
*/ */
function test_init_missingToken() function test_init_missingToken()
@ -81,7 +81,7 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase {
} }
/** /**
* @expectedException \Oauth2\Resource\OAuthResourceServerException * @expectedException \Oauth2\Resource\ClientException
* @expectedExceptionMessage The access token is not registered with the resource server * @expectedExceptionMessage The access token is not registered with the resource server
*/ */
function test_init_wrongToken() function test_init_wrongToken()