diff --git a/composer.json b/composer.json
index 5ba67484..8d62bbe8 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,7 @@
"name": "lncd/oauth2",
"description": "OAuth 2.0 Framework",
"version": "1.0.0",
+ "version": "1.0.1",
"homepage": "https://github.com/lncd/OAuth2",
"license": "MIT",
"require": {
diff --git a/src/OAuth2/AuthServer.php b/src/OAuth2/AuthServer.php
index 82f464fa..069de718 100644
--- a/src/OAuth2/AuthServer.php
+++ b/src/OAuth2/AuthServer.php
@@ -248,22 +248,13 @@ class AuthServer
*/
public function checkAuthoriseParams($inputParams = array())
{
- $authParams = array();
-
- // Client ID
- $authParams['client_id'] = (isset($inputParams['client_id'])) ?
- $inputParams['client_id'] :
- self::getRequest()->get('client_id');
+ // 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);
}
- // Redirect URI
- $authParams['redirect_uri'] = (isset($inputParams['redirect_uri'])) ?
- $inputParams['redirect_uri'] :
- self::getRequest()->get('redirect_uri');
-
if (is_null($authParams['redirect_uri'])) {
throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'redirect_uri'), 0);
}
@@ -277,11 +268,6 @@ class AuthServer
$authParams['client_details'] = $clientDetails;
- // Response type
- $authParams['response_type'] = (isset($inputParams['response_type'])) ?
- $inputParams['response_type'] :
- self::getRequest()->get('response_type');
-
if (is_null($authParams['response_type'])) {
throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'response_type'), 0);
}
@@ -291,12 +277,8 @@ class AuthServer
throw new Exception\ClientException(self::$exceptionMessages['unsupported_response_type'], 3);
}
- // Get and validate scopes
- $scopes = (isset($inputParams['scope'])) ?
- $inputParams['scope'] :
- self::getRequest()->get('scope', '');
-
- $scopes = explode($this->scopeDelimeter, $scopes);
+ // Validate scopes
+ $scopes = explode($this->scopeDelimeter, $authParams['scope']);
for ($i = 0; $i < count($scopes); $i++) {
$scopes[$i] = trim($scopes[$i]);
@@ -358,9 +340,7 @@ class AuthServer
*/
public function issueAccessToken($inputParams = array())
{
- $grantType = (isset($inputParams['grant_type'])) ?
- $inputParams['grant_type'] :
- self::getRequest()->post('grant_type');
+ $grantType = self::getParam('grant_type', 'post', $inputParams);
if (is_null($grantType)) {
throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'grant_type'), 0);
@@ -395,7 +375,7 @@ class AuthServer
public static function getParam($param = '', $method = 'get', $inputParams = array())
{
if (is_string($param)) {
- return (isset($inputParams[$param])) ? $inputParams['client_id'] : self::getRequest()->{$method}($param);
+ return (isset($inputParams[$param])) ? $inputParams[$param] : self::getRequest()->{$method}($param);
} else {
$response = array();
foreach ($param as $p) {
diff --git a/src/OAuth2/Storage/ClientInterface.php b/src/OAuth2/Storage/ClientInterface.php
index 605c42a9..408ff959 100644
--- a/src/OAuth2/Storage/ClientInterface.php
+++ b/src/OAuth2/Storage/ClientInterface.php
@@ -20,19 +20,17 @@ interface ClientInterface
*
*
* # Client ID + redirect URI
- * SELECT clients.id FROM clients LEFT JOIN client_endpoints ON
- * client_endpoints.client_id = clients.id WHERE clients.id = $clientId AND
- * client_endpoints.redirect_uri = $redirectUri
+ * 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 clients.id FROM clients WHERE clients.id = $clientId AND
- * clients.secret = $clientSecret
+ * SELECT oauth_clients.id FROM oauth_clients WHERE oauth_clients.id = $clientId AND
+ * oauth_clients.secret = $clientSecret
*
* # Client ID + client secret + redirect URI
- * SELECT clients.id FROM clients LEFT JOIN client_endpoints ON
- * client_endpoints.client_id = clients.id WHERE clients.id = $clientId AND
- * clients.secret = $clientSecret AND client_endpoints.redirect_uri =
- * $redirectUri
+ * 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
*
*
* Response:
diff --git a/src/OAuth2/Storage/ScopeInterface.php b/src/OAuth2/Storage/ScopeInterface.php
index 82c71c39..99c6689a 100644
--- a/src/OAuth2/Storage/ScopeInterface.php
+++ b/src/OAuth2/Storage/ScopeInterface.php
@@ -19,7 +19,7 @@ interface ScopeInterface
* Example SQL query:
*
*
- * SELECT * FROM scopes WHERE scope = $scope
+ * SELECT * FROM oauth_scopes WHERE scope = $scope
*
*
* Response:
diff --git a/src/OAuth2/Storage/SessionInterface.php b/src/OAuth2/Storage/SessionInterface.php
index 1c2632f6..9878e822 100644
--- a/src/OAuth2/Storage/SessionInterface.php
+++ b/src/OAuth2/Storage/SessionInterface.php
@@ -225,9 +225,10 @@ interface SessionInterface
* Example SQL query:
*
*
- * SELECT scopes.scope, scopes.name, scopes.description FROM
- * oauth_session_scopes JOIN scopes ON oauth_session_scopes.scope =
- * scopes.scope WHERE access_token = $accessToken
+ * SELECT oauth_scopes.scope, oauth_scopes.name, oauth_scopes.description
+ * FROM oauth_session_scopes JOIN oauth_scopes ON
+ * oauth_session_scopes.scope = oauth_scopes.scope
+ * WHERE access_token = $accessToken
*
*
* Response:
diff --git a/tests/authentication/AuthServerTest.php b/tests/authentication/AuthServerTest.php
index f8f3e35e..f9cbf412 100644
--- a/tests/authentication/AuthServerTest.php
+++ b/tests/authentication/AuthServerTest.php
@@ -304,7 +304,8 @@ class Authentication_Server_test extends PHPUnit_Framework_TestCase
'name' => 'Foo Name',
'description' => 'Foo Name Description'
)
- )
+ ),
+ 'scope' => 'foo'
), $v);
}
@@ -354,7 +355,8 @@ class Authentication_Server_test extends PHPUnit_Framework_TestCase
'name' => 'Foo Name',
'description' => 'Foo Name Description'
)
- )
+ ),
+ 'scope' => 'foo'
), $v);
}