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

Merge branch '3.8'

Browse Source 
Conflicts:
	.travis.yml
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/databox.php
This commit is contained in:
Nicolas Le Goff
2014-01-27 17:23:03 +01:00
parent 6ba5ce6669 33447f7315
commit 383ff77449
8 changed files with 148 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -787,7 +787,7 @@ class API_OAuth2_Adapter extends OAuth2
protected function checkUserCredentials($client_id, $username, $password)
{
try {
$application = API_OAuth2_Application::load_from_client_id($this->app, $client_id);
$this->setClient(API_OAuth2_Application::load_from_client_id($this->app, $client_id));
$usr_id = $this->app['auth.native']->getUsrId($username, $password, Request::createFromGlobals());
@@ -795,13 +795,11 @@ class API_OAuth2_Adapter extends OAuth2
return false;
}
$user = \User_Adapter::getInstance($usr_id, $this->app);
$account = API_OAuth2_Account::load_with_user($this->app, $application, $user);
$account = $this->updateAccount($usr_id);
return [
'redirect_uri' => $application->get_redirect_uri()
, 'client_id' => $application->get_client_id()
'redirect_uri' => $this->client->get_redirect_uri()
, 'client_id' => $this->client->get_client_id()
, 'account_id' => $account->get_id()
];
} catch (AccountLockedException $e) {