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

last update for PM compatibility

Browse Source
This commit is contained in:
eriknyk
2014-08-20 12:05:12 -04:00
parent c108ea8678
commit 6437fddcc8
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,7 +182,7 @@ class Server implements iAuthenticate
*
* @format JsonFormat,UploadFormat
*/
public function postAuthorize()
public function postAuthorize($authorize = null, $userId = null, $returnResponse = false)
{
session_start();
@@ -190,8 +190,12 @@ class Server implements iAuthenticate
throw new RestException(400, "Local Authentication Error, user session is not started.");
}
$userId = $_SESSION['USER_LOGGED'];
$authorize = array_key_exists('cancel', $_REQUEST)? false: true;
if (empty($userId)) {
$userId = $_SESSION['USER_LOGGED'];
}
if (empty($authorize)) {
$authorize = array_key_exists('cancel', $_REQUEST)? false: true;
}
$request = \OAuth2\Request::createFromGlobals();
$response = new \OAuth2\Response();
@@ -203,7 +207,11 @@ class Server implements iAuthenticate
$userId
);
die($response->send());
if ($returnResponse) {
return $response;
} else {
die($response->send());
}
}