fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in gproly/processmaker/HOR-499 (pull request #3863)

Browse Source 
HOR-499
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-18 15:33:35 -04:00
parent be25df3cdd f374ff4e30
commit 20b443872f
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/class.pmDynaform.php
View File

@@ -115,7 +115,9 @@ class pmDynaform
$flagTrackerUser = false; $flagTrackerUser = false;
if (!isset($_SESSION['USER_LOGGED'])) { if (!isset($_SESSION['USER_LOGGED'])) {
if (!preg_match("/^.*\/" . SYS_SKIN . "\/tracker\/.*$/", $_SERVER["REQUEST_URI"])) { if (!preg_match("/^.*\/" . SYS_SKIN . "\/tracker\/.*$/", $_SERVER["REQUEST_URI"]) &&
!preg_match("/^.*\/" . SYS_SKIN . "\/[a-z0-9A-Z]+\/[a-z0-9A-Z]+\.php$/", $_SERVER["REQUEST_URI"])
) {
return; return;
} }
@@ -1529,7 +1531,7 @@ class pmDynaform
'scope' => implode(' ', $oauthServer->getScope()) 'scope' => implode(' ', $oauthServer->getScope())
)); ));
$response = $oauthServer->postAuthorize($authorize, $userId, true); $response = $oauthServer->postAuthorize($authorize, $userId, true, array('USER_LOGGED' => $_SESSION['USER_LOGGED']));
$code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=') + 5, 40); $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=') + 5, 40);
return $code; return $code;

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

@@ -236,10 +236,14 @@ class Server implements iAuthenticate
* *
* @format JsonFormat,UploadFormat * @format JsonFormat,UploadFormat
*/ */
public function postAuthorize($authorize = null, $userId = null, $returnResponse = false) public function postAuthorize($authorize = null, $userId = null, $returnResponse = false, $cacheSessionValue = array())
{ {
@session_start(); @session_start();
foreach ($cacheSessionValue as $key => $value) {
$_SESSION[$key] = $value;
}
if (! isset($_SESSION['USER_LOGGED'])) { if (! isset($_SESSION['USER_LOGGED'])) {
throw new RestException(400, "Local Authentication Error, user session is not started."); throw new RestException(400, "Local Authentication Error, user session is not started.");
} }