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

PM-3755 Consume the oauth/token endpoint specifying an invalid workspace,

Browse Source
This commit is contained in:
Ronald Quenta
2015-10-09 14:09:18 -04:00
committed by Victor Saisa Lopez
parent 50f1c742dc
commit 4bfbc750f8
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,7 +378,6 @@ class WebApplication
} }
Services\OAuth2\Server::setWorkspace(SYS_SYS); Services\OAuth2\Server::setWorkspace(SYS_SYS);
Services\OAuth2\Server::loadPostEnvironment();
$this->rest->addAPIClass('\ProcessMaker\\Services\\OAuth2\\Server', 'oauth2'); $this->rest->addAPIClass('\ProcessMaker\\Services\\OAuth2\\Server', 'oauth2');
return $uri; return $uri;
@@ -495,6 +494,8 @@ class WebApplication
define("PATH_TEMPORAL", PATH_C . "dynEditor/"); define("PATH_TEMPORAL", PATH_C . "dynEditor/");
define("PATH_DB", PATH_DATA . "sites" . PATH_SEP); define("PATH_DB", PATH_DATA . "sites" . PATH_SEP);
\Bootstrap::setLanguage();
\Bootstrap::LoadTranslationObject((defined("SYS_LANG"))? SYS_LANG : "en"); \Bootstrap::LoadTranslationObject((defined("SYS_LANG"))? SYS_LANG : "en");
if (empty($workspace)) { if (empty($workspace)) {

23
gulliver/system/class.bootstrap.php
View File

@@ -2952,5 +2952,28 @@ class Bootstrap
{ {
return md5($string); return md5($string);
} }
/**
* Set Language
*/
public static function setLanguage()
{
$acceptLanguage = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
if (!defined('SYS_LANG')) {
$Translations = new \Translation;
$translationsTable = $Translations->getTranslationEnvironments();
$inLang = false;
foreach ($translationsTable as $locale) {
if ($locale['LOCALE'] == $acceptLanguage){
$inLang = true;
break;
}
}
$lang = $inLang?$acceptLanguage:'en';
define("SYS_LANG", $lang);
}
}
} }

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

@@ -392,23 +392,5 @@ class Server implements iAuthenticate
return ""; return "";
} }
public static function loadPostEnvironment()
{
$acceptLanguage = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
if (!defined('SYS_LANG')) {
$Translations = new \Translation;
$translationsTable = $Translations->getTranslationEnvironments();
$inLang = false;
foreach ($translationsTable as $locale) {
if ($locale['LOCALE'] == $acceptLanguage){
$inLang = true;
break;
}
}
$lang = $inLang?$acceptLanguage:'en';
define("SYS_LANG", $lang);
}
}
} }