hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 21:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

check if oAuth2 client has password grant type enable for password grant_type authentication flow

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-04-26 14:33:42 +02:00
parent 3e8ffac725
commit 9ec4535832
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/classes/API/OAuth2/Adapter.class.php
View File

@@ -232,8 +232,10 @@ class API_OAuth2_Adapter extends OAuth2
protected function getAccessToken($oauth_token) protected function getAccessToken($oauth_token)
{ {
$result = null; $result = null;
try { try {
$token = API_OAuth2_Token::load_by_oauth_token($this->appbox, $oauth_token); $token = API_OAuth2_Token::load_by_oauth_token($this->appbox, $oauth_token);
$result = array( $result = array(
'scope' => $token->get_scope() 'scope' => $token->get_scope()
, 'expires' => $token->get_expires() , 'expires' => $token->get_expires()
@@ -243,6 +245,7 @@ class API_OAuth2_Adapter extends OAuth2
, 'usr_id' => $token->get_account()->get_user()->get_id() , 'usr_id' => $token->get_account()->get_user()->get_id()
, 'oauth_token' => $token->get_value() , 'oauth_token' => $token->get_value()
); );
} catch (Exception $e) { } catch (Exception $e) {
} }
@@ -703,6 +706,9 @@ class API_OAuth2_Adapter extends OAuth2
if ( ! $this->checkRestrictedGrantType($client[0], $input["grant_type"])) if ( ! $this->checkRestrictedGrantType($client[0], $input["grant_type"]))
$this->errorJsonResponse(OAUTH2_HTTP_BAD_REQUEST, OAUTH2_ERROR_UNAUTHORIZED_CLIENT); $this->errorJsonResponse(OAUTH2_HTTP_BAD_REQUEST, OAUTH2_ERROR_UNAUTHORIZED_CLIENT);
if ( ! $this->checkRestrictedGrantType($client[0], $input["grant_type"]))
$this->errorJsonResponse(OAUTH2_HTTP_BAD_REQUEST, OAUTH2_ERROR_UNAUTHORIZED_CLIENT);
// Do the granting // Do the granting
switch ($input["grant_type"]) { switch ($input["grant_type"]) {
case OAUTH2_GRANT_TYPE_AUTH_CODE: case OAUTH2_GRANT_TYPE_AUTH_CODE:
@@ -718,6 +724,12 @@ class API_OAuth2_Adapter extends OAuth2
$this->errorJsonResponse(OAUTH2_HTTP_BAD_REQUEST, OAUTH2_ERROR_EXPIRED_TOKEN); $this->errorJsonResponse(OAUTH2_HTTP_BAD_REQUEST, OAUTH2_ERROR_EXPIRED_TOKEN);
break; break;
case OAUTH2_GRANT_TYPE_USER_CREDENTIALS: case OAUTH2_GRANT_TYPE_USER_CREDENTIALS:
$application = API_OAuth2_Application::load_from_client_id($this->appbox, $client[0]);
if ( ! $application->is_password_granted()) {
$this->errorJsonResponse(OAUTH2_HTTP_BAD_REQUEST, OAUTH2_ERROR_UNSUPPORTED_GRANT_TYPE, 'Password grant type is not enable for your client');
}
if ( ! $input["username"] || ! $input["password"]) if ( ! $input["username"] || ! $input["password"])
$this->errorJsonResponse(OAUTH2_HTTP_BAD_REQUEST, OAUTH2_ERROR_INVALID_REQUEST, 'Missing parameters. "username" and "password" required'); $this->errorJsonResponse(OAUTH2_HTTP_BAD_REQUEST, OAUTH2_ERROR_INVALID_REQUEST, 'Missing parameters. "username" and "password" required');