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

fix api version in answer

Browse Source
This commit is contained in:
aina-esokia
2018-07-06 15:23:54 +04:00
parent 01f8ba396f
commit 1699b0a6d1
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Alchemy/Phrasea/Core/Event/Listener/OAuthListener.php
View File

@@ -13,6 +13,8 @@ use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Authentication\Authenticator;
use Alchemy\Phrasea\Authentication\Context;
use Alchemy\Phrasea\Controller\Api\Result;
use Alchemy\Phrasea\ControllerProvider\Api\V1;
use Alchemy\Phrasea\ControllerProvider\Api\V2;
use Alchemy\Phrasea\Core\Configuration\PropertyAccess;
use Alchemy\Phrasea\Core\Event\ApiOAuth2EndEvent;
use Alchemy\Phrasea\Core\Event\ApiOAuth2StartEvent;
@@ -72,7 +74,16 @@ class OAuthListener
$oAuth2Account = $token->getAccount();
// Sets the Api Version
$request->attributes->set('api_version', $oAuth2Account->getApiVersion());
$CalledController = $request->attributes->get('_controller');
if(mb_strpos($CalledController, 'controller.api.v1') !== FALSE){
$request->attributes->set('api_version', V1::VERSION);
}elseif(mb_strpos($CalledController, 'controller.api.v2') !== FALSE){
$request->attributes->set('api_version', V2::VERSION);
}else{
$request->attributes->set('api_version', $oAuth2Account->getApiVersion());
}
$oAuth2App = $oAuth2Account->getApplication();
/** @var PropertyAccess $conf */