fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(BE) Endpoints must implement language as part of the header

Browse Source
This commit is contained in:
Ronald Quenta
2015-09-21 09:17:27 -04:00
parent 2f641e76cd
commit bd565ce6af
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/src/Maveriks/WebApplication.php
View File

@@ -405,9 +405,6 @@ class WebApplication
public function loadEnvironment($workspace = "") public function loadEnvironment($workspace = "")
{ {
$lang = "en";
define("SYS_LANG", $lang);
define("PATH_SEP", DIRECTORY_SEPARATOR); define("PATH_SEP", DIRECTORY_SEPARATOR);
define("PATH_TRUNK", $this->rootDir . PATH_SEP); define("PATH_TRUNK", $this->rootDir . PATH_SEP);

10
workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
View File

@@ -295,5 +295,15 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
return array_merge($a, array_change_key_case($a, $case)); return array_merge($a, array_change_key_case($a, $case));
} }
public function loadPostEnvironment($request = null)
{
if (!defined('SYS_LANG')) {
$acceptLanguage =$request->headers('ACCEPT_LANGUAGE');
$lang = (!is_null($acceptLanguage) && strlen($acceptLanguage)<=2)?$acceptLanguage:'en';
define("SYS_LANG", $lang);
}
return true;
}
} }

3
workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
View File

@@ -285,6 +285,8 @@ class Server implements iAuthenticate
$request = \OAuth2\Request::createFromGlobals(); $request = \OAuth2\Request::createFromGlobals();
} }
$this->storage->loadPostEnvironment($request);
$response = $this->server->handleTokenRequest($request); //Set/Get token //PmPdo->setAccessToken() $response = $this->server->handleTokenRequest($request); //Set/Get token //PmPdo->setAccessToken()
$token = $response->getParameters(); $token = $response->getParameters();
@@ -332,6 +334,7 @@ class Server implements iAuthenticate
public function __isAllowed() public function __isAllowed()
{ {
$request = \OAuth2\Request::createFromGlobals(); $request = \OAuth2\Request::createFromGlobals();
$this->storage->loadPostEnvironment($request);
$allowed = $this->server->verifyResourceRequest($request); $allowed = $this->server->verifyResourceRequest($request);
$token = $this->server->getAccessTokenData($request); $token = $this->server->getAccessTokenData($request);
self::$userId = $token['user_id']; self::$userId = $token['user_id'];