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

Lots of updates so it all works now

Browse Source 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
This commit is contained in:
Alex Bilbie 2012-10-14 17:18:27 +01:00
parent af83b1e80e
commit b1082ecb41
7 changed files with 200 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -37,5 +37,8 @@
"psr-0": { "psr-0": {
"Oauth2": "src/" "Oauth2": "src/"
} }
},
"suggest": {
"lncd/oauth2-facebook": "Adds support for Facebook as an IDP"
} }
} }

19
src/Oauth2/Client/Client.php
View File

@ -1,19 +0,0 @@
<?php
namespace OAuth2\Client;
include_once('Exception.php');
class Client
{
public function __construct($name, array $options = null)
{
if ( ! class_exists($name)) {
throw new OAuth2\Client\Exception('There is no identity provider called: '.$name);
}
return new $name($options);
}
}

83
src/Oauth2/Client/Exception.php
View File

@ -1,83 +0,0 @@
<?php
namespace OAuth2\Client;
class Exception extends \Exception
{
/**
* The result from the API server that represents the exception information.
*/
protected $result;
/**
* Make a new API Exception with the given result.
*
* @param $result
* The result from the API server.
*/
public function __construct($result)
{
$this->result = $result;
$code = isset($result['code']) ? $result['code'] : 0;
if (isset($result['error'])) {
// OAuth 2.0 Draft 10 style
$message = $result['error'];
} elseif (isset($result['message'])) {
// cURL style
$message = $result['message'];
} else {
$message = 'Unknown Error.';
}
parent::__construct($message, $code);
}
/**
* Returns the associated type for the error. This will default to
* 'Exception' when a type is not available.
*
* @return
* The type for the error.
*/
public function getType()
{
if (isset($this->result['error'])) {
$message = $this->result['error'];
if (is_string($message)) {
// OAuth 2.0 Draft 10 style
return $message;
}
}
return 'Exception';
}
/**
* To make debugging easier.
*
* @returns
* The string representation of the error.
*/
public function __toString()
{
$str = $this->getType() . ': ';
if ($this->code != 0) {
$str .= $this->code . ': ';
}
return $str . $this->message;
}
}

143
src/Oauth2/Client/IDP.php
View File

@ -2,11 +2,72 @@
namespace OAuth2\Client; namespace OAuth2\Client;
use Guzzle\Service\Client; use Guzzle\Service\Client as GuzzleClient;
class IDPException extends \Exception {} class IDPException extends \Exception
{
protected $result;
class IDP { public function __construct($result)
{
$this->result = $result;
$code = isset($result['code']) ? $result['code'] : 0;
if (isset($result['error'])) {
// OAuth 2.0 Draft 10 style
$message = $result['error'];
} elseif (isset($result['message'])) {
// cURL style
$message = $result['message'];
} else {
$message = 'Unknown Error.';
}
parent::__construct($message['message'], $message['code']);
}
public function getType()
{
if (isset($this->result['error'])) {
$message = $this->result['error'];
if (is_string($message)) {
// OAuth 2.0 Draft 10 style
return $message;
}
}
return 'Exception';
}
/**
* To make debugging easier.
*
* @returns
* The string representation of the error.
*/
public function __toString()
{
$str = $this->getType() . ': ';
if ($this->code != 0) {
$str .= $this->code . ': ';
}
return $str . $this->message;
}
}
abstract class IDP {
public $clientId = ''; public $clientId = '';
@ -26,21 +87,22 @@ class IDP {
public $responseType = 'json'; public $responseType = 'json';
public function __construct() public function __construct($options)
{ {
//$this->redirectUri = $_SERVER[] foreach ($options as $option => $value) {
if (isset($this->{$option})) {
$this->{$option} = $value;
}
} }
public function __get($key)
{
return $this->$key;
} }
abstract public function urlAuthorize(); abstract public function urlAuthorize();
abstract public function urlAccessToken(); abstract public function urlAccessToken();
abstract public function urlUserInfo(); abstract public function urlUserDetails(\Oauth2\Client\Token\Access $token);
abstract public function userDetails($response, \Oauth2\Client\Token\Access $token);
public function authorize($options = array()) public function authorize($options = array())
{ {
@ -60,19 +122,23 @@ class IDP {
exit; exit;
} }
public function getAccessToken() public function getAccessToken($code = NULL, $options = array())
{ {
if ($code === NULL) {
throw new \BadMethodCallException('Missing authorization code');
}
$params = array( $params = array(
'client_id' => $this->clientId, 'client_id' => $this->clientId,
'client_secret' => $this->clientSecret, 'client_secret' => $this->clientSecret,
'grant_type' => isset($options['grant_type']) ? $options['grant_type'] : 'authorization_code', 'grant_type' => isset($options['grantType']) ? $options['grantType'] : 'authorization_code',
); );
switch ($params['grant_type']) { switch ($params['grant_type']) {
case 'authorization_code': case 'authorization_code':
$params['code'] = $code; $params['code'] = $code;
$params['redirect_uri'] = isset($options['redirect_uri']) ? $options['redirect_uri'] : $this->redirect_uri; $params['redirect_uri'] = isset($options['redirectUri']) ? $options['redirectUri'] : $this->redirectUri;
break; break;
case 'refresh_token': case 'refresh_token':
@ -81,20 +147,36 @@ class IDP {
} }
try {
switch ($this->method) { switch ($this->method) {
case 'get': case 'get':
$client = new Client($this->urlAccessToken() .= '?'.http_build_query($params));
$response = $client->get(); $client = new GuzzleClient($this->urlAccessToken() . '?' . http_build_query($params));
$request = $client->send();
$response = $request->getBody();
break; break;
default: case 'post':
$client = new Client($this->urlAccessToken());
$response = $client->{$this->method}(null, null, $params); $client = new GuzzleClient($this->urlAccessToken());
$request = $client->post(null, null, $params)->send();
$response = $request->getBody();
break; break;
} }
}
catch (\Guzzle\Http\Exception\BadResponseException $e)
{
$raw_response = explode("\n", $e->getResponse());
$response = end($raw_response);
}
switch ($this->responseType) { switch ($this->responseType) {
case 'json': case 'json':
@ -109,21 +191,40 @@ class IDP {
if (isset($result['error']) && ! empty($result['error'])) { if (isset($result['error']) && ! empty($result['error'])) {
throw new Oauth2\Client\IDPException($result); throw new \Oauth2\Client\IDPException($result);
} }
switch ($params['grant_type']) { switch ($params['grant_type']) {
case 'authorization_code': case 'authorization_code':
return Oauth2\Client\Token::factory('access', $result); return \Oauth2\Client\Token::factory('access', $result);
break; break;
case 'refresh_token': case 'refresh_token':
return Oauth2\Client\Token::factory('refresh', $result); return \Oauth2\Client\Token::factory('refresh', $result);
break; break;
} }
} }
public function getUserDetails(\Oauth2\Client\Token\Access $token)
{
$url = $this->urlUserDetails($token);
try {
$client = new GuzzleClient($url);
$request = $client->get()->send();
$response = $request->getBody();
return $this->userDetails(json_decode($response), $token);
}
catch (\Guzzle\Http\Exception\BadResponseException $e)
{
$raw_response = explode("\n", $e->getResponse());
throw new \Oauth2\Client\IDPException(end($raw_response));
}
}
} }

2
src/Oauth2/Client/Token.php
View File

@ -16,7 +16,7 @@ abstract class Token
{ {
include_once 'Token/'.ucfirst(strtolower($name)).'.php'; include_once 'Token/'.ucfirst(strtolower($name)).'.php';
$class = $name.'Token'; $class = 'Oauth2\Client\Token\\'.ucfirst($name);
return new $class($options); return new $class($options);
} }

4
src/Oauth2/Client/Token/Access.php
View File

@ -11,7 +11,7 @@ namespace Oauth2\Client\Token;
* @copyright (c) 2011 HappyNinjas Ltd * @copyright (c) 2011 HappyNinjas Ltd
*/ */
class Access extends Oauth2\Client\Token class Access extends \Oauth2\Client\Token
{ {
/** /**
* @var string accessToken * @var string accessToken
@ -42,7 +42,7 @@ class Access extends Oauth2\Client\Token
public function __construct(array $options = null) public function __construct(array $options = null)
{ {
if ( ! isset($options['access_token'])) { if ( ! isset($options['access_token'])) {
throw new Exception('Required option not passed: access_token'.PHP_EOL.print_r($options, true)); throw new \BadMethodCallException('Required option not passed: access_token'.PHP_EOL.print_r($options, true));
} }
$this->accessToken = $options['access_token']; $this->accessToken = $options['access_token'];

2
src/Oauth2/Client/Token/Authorize.php
View File

@ -8,7 +8,7 @@
* @copyright (c) 2011 HappyNinjas Ltd * @copyright (c) 2011 HappyNinjas Ltd
*/ */
class Authorize extends Oauth2\Client\Token class Authorize extends \Oauth2\Client\Token
{ {
/** /**
* @var string code * @var string code