From bdbf9072f6ef15bf06f4045a2f458621768b2cb0 Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Fri, 7 Sep 2012 12:59:41 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index a1f48c37..eb16e602 100644 --- a/README.md +++ b/README.md @@ -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 [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. \ No newline at end of file From 9844613b2d969fe70ecafa91e729015569c0e384 Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Wed, 19 Sep 2012 19:34:05 +0100 Subject: [PATCH 2/2] Fixed test checks Signed-off-by: Alex Bilbie --- tests/resource/server_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/resource/server_test.php b/tests/resource/server_test.php index fdb35be4..7feb4389 100644 --- a/tests/resource/server_test.php +++ b/tests/resource/server_test.php @@ -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 */ 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 */ function test_init_wrongToken()