diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 985d1e9cd..ec4a48feb 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -1293,13 +1293,26 @@ class adminProxy extends HttpProxyController
$pmRestClient->delete();
}
+ $http = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
+ $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
+ $host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
+
+ $endpoint = sprintf(
+ '%s://%s/sys%s/%s/%s/oauth2/grant',
+ $http,
+ $host,
+ SYS_SYS,
+ $lang,
+ SYS_SKIN
+ );
+
$oauthClients = new OauthClients();
$oauthClients->setClientId('x-pm-local-client');
$oauthClients->setClientSecret('179ad45c6ce2cb97cf1029e212046e81');
$oauthClients->setClientName('PM Web Designer');
$oauthClients->setClientDescription('ProcessMaker Web Designer App');
$oauthClients->setClientWebsite('www.processmaker.com');
- $oauthClients->setRedirectUri('http://pmos/sysworkflow/en/neoclassic/services/oauth2_grant');
+ $oauthClients->setRedirectUri($endpoint);
$oauthClients->save();
$result['success'] = true;
diff --git a/workflow/engine/methods/oauth2/authorize.php b/workflow/engine/methods/oauth2/authorize.php
index b6a9bb730..3090ba1bc 100644
--- a/workflow/engine/methods/oauth2/authorize.php
+++ b/workflow/engine/methods/oauth2/authorize.php
@@ -4,6 +4,7 @@ switch ($_SERVER['REQUEST_METHOD']) {
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'view', 'oauth2/authorize' );
+ $erik = 'neyek';
G::RenderPage('publish', 'minimal');
break;
@@ -24,11 +25,11 @@ switch ($_SERVER['REQUEST_METHOD']) {
$response = $oauthServer->postAuthorize($authorize, $userid, true);
- $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
+ //$code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
- echo 'session_id ' . session_id() . '
';
- exit("SUCCESS! ==> Authorization Code: $code");
+ //echo 'session_id ' . session_id() . '
';
+ //exit("SUCCESS! ==> Authorization Code: $code");
- //die($response->send());
+ die($response->send());
break;
}
\ No newline at end of file
diff --git a/workflow/engine/methods/oauth2/grant.php b/workflow/engine/methods/oauth2/grant.php
new file mode 100644
index 000000000..e2ddcfad1
--- /dev/null
+++ b/workflow/engine/methods/oauth2/grant.php
@@ -0,0 +1,35 @@
+ 'authorization_code',
+ 'code' => $code
+);
+
+$ch = curl_init($endpoint);
+
+curl_setopt($ch, CURLOPT_HEADER, false);
+curl_setopt($ch, CURLOPT_USERPWD, "$clientId:$secret");
+curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+curl_setopt($ch, CURLOPT_POST, 1);
+curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+$data = @json_decode(curl_exec($ch));
+curl_close($ch);
+
+G::pr((array) $data);
\ No newline at end of file
diff --git a/workflow/engine/methods/services/oauth2_grant.php b/workflow/engine/methods/services/oauth2_grant.php
deleted file mode 100644
index b17278580..000000000
--- a/workflow/engine/methods/services/oauth2_grant.php
+++ /dev/null
@@ -1,51 +0,0 @@
-'.$_GET['error'] . '
';
- die($_GET['error_description']);
-}
-
-
-$host = 'http://pmos/api/1.0/workflow/token';
-$code = empty($_GET['code']) ? 'NN' : $_GET['code'];
-
-$clientId = 'x-pm-local-client';
-$secret = '179ad45c6ce2cb97cf1029e212046e81';
-
-$data = array(
- 'grant_type' => 'authorization_code',
- 'code' => $code
-);
-
-$ch = curl_init($host);
-//curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
-curl_setopt($ch, CURLOPT_HEADER, false);
-curl_setopt($ch, CURLOPT_USERPWD, "$clientId:$secret");
-curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-curl_setopt($ch, CURLOPT_POST, 1);
-curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-$data = @json_decode(curl_exec($ch));
-
-if (is_object($data)) {
- /*$data = (array) $data;
- require_once PATH_CORE . 'classes/model/DesignerOauthAccessTokens.php';
-
- $model = new DesignerOauthAccessTokens();
- $model->setAccessToken($data['access_token']);
- $model->setExpires($data['expires_in']);
- $model->setTokenType($data['token_type']);
- $model->setScope($data['scope']);
- $model->setRefreshToken($data['refresh_token']);
- $model->setClientId($clientId);
- $model->setUserId($_SESSION['USER_LOGGED']);
-
- $model->save();*/
-}
-
-echo '';
-//print_r($_SESSION);
-print_r($data);
-
-curl_close($ch);
\ No newline at end of file
diff --git a/workflow/engine/services/oauth2/Server.php b/workflow/engine/services/oauth2/Server.php
index 8830d1cb5..7a0a10d74 100644
--- a/workflow/engine/services/oauth2/Server.php
+++ b/workflow/engine/services/oauth2/Server.php
@@ -195,7 +195,7 @@ class Server implements iAuthenticate
return $allowed;
}
- // making a partcular session verification for PM Web Designer Client
+ // making a local session verification for PM Web Designer Client
if (! isset($_SESSION) || ! array_key_exists('USER_LOGGED', $_SESSION)) {
return false;
}
diff --git a/workflow/engine/templates/admin/maintenance.html b/workflow/engine/templates/admin/maintenance.html
index 1be3b0d9a..19fa3df9b 100644
--- a/workflow/engine/templates/admin/maintenance.html
+++ b/workflow/engine/templates/admin/maintenance.html
@@ -32,7 +32,9 @@ function main()
enableColumnResize: false,
enableHdMenu: false,
disableSelection: true,
- loading: true,
+ trackMouseOver:false,
+ columnLines: true,
+ loadMask: true,
store : store,
columns : [
{
diff --git a/workflow/engine/templates/oauth2/authorize.php b/workflow/engine/templates/oauth2/authorize.php
index 569c62289..677b6d4e1 100644
--- a/workflow/engine/templates/oauth2/authorize.php
+++ b/workflow/engine/templates/oauth2/authorize.php
@@ -33,20 +33,17 @@ $response = array(
?>
-
-
- |
- |
+
+
+ |
|
-
-
-
-
-
-
|
@@ -122,7 +99,8 @@ $response = array(
-
+
+