From 66dcf0432c0242762b0fb469d2831f57560abc64 Mon Sep 17 00:00:00 2001 From: qronald Date: Mon, 22 May 2017 13:27:38 -0400 Subject: [PATCH 1/3] HOR-3279 --- workflow/engine/controllers/designer.php | 8 ++++++++ .../src/ProcessMaker/BusinessModel/Light/Tracker.php | 8 ++++---- .../src/ProcessMaker/Services/Api/Light/Tracker.php | 3 +-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php index 24d370c97..10e983a9e 100644 --- a/workflow/engine/controllers/designer.php +++ b/workflow/engine/controllers/designer.php @@ -29,6 +29,14 @@ class Designer extends Controller $client = $this->getClientCredentials(); if (isset($httpData->tracker_designer) && $httpData->tracker_designer == 1) { + try { + $response = \ProcessMaker\BusinessModel\Light\Tracker::authentication($_SESSION['CASE'], $_SESSION['PIN']); + } catch (\Exception $e) { + G::header('Location: /errors/error403.php'); + die(); + } + $httpData->prj_uid = $response['process']; + $httpData->app_uid = $response['app_uid']; $client["tracker_designer"] = 1; } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/Tracker.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/Tracker.php index 7d5b87eed..bc6a5e4ef 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/Tracker.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/Tracker.php @@ -13,14 +13,14 @@ class Tracker } /** - * authenticaction for case tracker + * Authentication for case tracker * - * @param $case numbre case - * @param $pin code pin access for case tracek + * @param int $case number case + * @param int $pin code pin access for case track * @return array * @throws \Exception */ - public function authentication($case, $pin) + public static function authentication($case, $pin) { $cases = new \Cases(); $response = array(); diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Light/Tracker.php b/workflow/engine/src/ProcessMaker/Services/Api/Light/Tracker.php index 051c7d2f7..b723c2170 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Light/Tracker.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Light/Tracker.php @@ -21,8 +21,7 @@ class Tracker extends Api public function Authentication($case, $pin) { try { - $oMobile = new \ProcessMaker\BusinessModel\Light\Tracker(); - $response = $oMobile->authentication($case, $pin); + $response = \ProcessMaker\BusinessModel\Light\Tracker::authentication($case, $pin); } catch (\Exception $e) { throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } From 7b8f3541994b3bad013387186bff9d33d3c74314 Mon Sep 17 00:00:00 2001 From: qronald Date: Tue, 23 May 2017 12:19:36 -0400 Subject: [PATCH 2/3] up observations --- workflow/engine/controllers/designer.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php index 10e983a9e..41259de0b 100644 --- a/workflow/engine/controllers/designer.php +++ b/workflow/engine/controllers/designer.php @@ -30,13 +30,17 @@ class Designer extends Controller if (isset($httpData->tracker_designer) && $httpData->tracker_designer == 1) { try { - $response = \ProcessMaker\BusinessModel\Light\Tracker::authentication($_SESSION['CASE'], $_SESSION['PIN']); + if(!isset($_SESSION['CASE']) && !isset($_SESSION['PIN'])){ + throw (new \Exception( + \G::LoadTranslation('ID_CASE_NOT_EXISTS') . "\n" . \G::LoadTranslation('ID_PIN_INVALID') + )); + } + \ProcessMaker\BusinessModel\Light\Tracker::authentication($_SESSION['CASE'], $_SESSION['PIN']); } catch (\Exception $e) { - G::header('Location: /errors/error403.php'); + Bootstrap::registerMonolog('CaseTracker', 400, $e->getMessage(), [], SYS_SYS, 'processmaker.log'); + \G::header('Location: /errors/error403.php'); die(); } - $httpData->prj_uid = $response['process']; - $httpData->app_uid = $response['app_uid']; $client["tracker_designer"] = 1; } From 48581193bf06fc5469590db7febebeadc5d27ba4 Mon Sep 17 00:00:00 2001 From: qronald Date: Tue, 23 May 2017 15:00:57 -0400 Subject: [PATCH 3/3] Psr-2 --- workflow/engine/controllers/designer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php index 41259de0b..f80d6c52f 100644 --- a/workflow/engine/controllers/designer.php +++ b/workflow/engine/controllers/designer.php @@ -30,7 +30,7 @@ class Designer extends Controller if (isset($httpData->tracker_designer) && $httpData->tracker_designer == 1) { try { - if(!isset($_SESSION['CASE']) && !isset($_SESSION['PIN'])){ + if (!isset($_SESSION['CASE']) && !isset($_SESSION['PIN'])) { throw (new \Exception( \G::LoadTranslation('ID_CASE_NOT_EXISTS') . "\n" . \G::LoadTranslation('ID_PIN_INVALID') ));