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

Merge pull request #1512 from aztech-dev/oauth-2

Browse Source 
Fix undefined method call
This commit is contained in:
Thibaud Fabre
2015-09-25 17:44:16 +02:00
parent dd0925621b b6b7f52c63
commit b3ed9eeb47
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/API/OAuth2/Adapter.php
View File

@@ -603,9 +603,12 @@ class API_OAuth2_Adapter extends OAuth2
'state' => null,
];
$result = [];
if ($params['state'] !== null) {
$result["query"]["state"] = $params['state'];
}
if ($is_authorized === false) {
$result["query"]["error"] = OAUTH2_ERROR_USER_DENIED;
} else {
@@ -617,6 +620,7 @@ class API_OAuth2_Adapter extends OAuth2
$result["fragment"] = $this->createAccessToken($params['account_id'], $params['scope']);
}
}
$this->doRedirectUriCallback($params['redirect_uri'], $result);
}
@@ -820,7 +824,7 @@ class API_OAuth2_Adapter extends OAuth2
return [
'redirect_uri' => $this->client->getRedirectUri(),
'client_id' => $this->client->getClient(),
'client_id' => $this->client->getClientId(),
'account_id' => $account->getId(),
];
} catch (AccountLockedException $e) {