mirror of
https://github.com/elyby/oauth2-server.git
synced 2024-12-16 18:19:47 +05:30
Merge branch 'master' of github.com:lncd/OAuth2
Conflicts: composer.json Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
This commit is contained in:
commit
ed2cabc5b6
@ -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.
|
@ -121,6 +121,9 @@ class Server
|
|||||||
{
|
{
|
||||||
$accessToken = null;
|
$accessToken = null;
|
||||||
|
|
||||||
|
|
||||||
|
$_SERVER['REQUEST_METHOD'] = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
|
||||||
|
|
||||||
// Try and get the access token via an access_token or oauth_token parameter
|
// Try and get the access token via an access_token or oauth_token parameter
|
||||||
switch ($_SERVER['REQUEST_METHOD'])
|
switch ($_SERVER['REQUEST_METHOD'])
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user