From 9608164cc32b038c62cc9abea96f562b6adaf6b4 Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Mon, 14 Oct 2024 16:57:12 +0000 Subject: [PATCH 1/5] Prevents adding multiple requests for same authorization by a member --- .../src/Services/DefaultAuthorizationManager.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/plugins/Activities/src/Services/DefaultAuthorizationManager.php b/app/plugins/Activities/src/Services/DefaultAuthorizationManager.php index ed01d143..c500766c 100644 --- a/app/plugins/Activities/src/Services/DefaultAuthorizationManager.php +++ b/app/plugins/Activities/src/Services/DefaultAuthorizationManager.php @@ -50,6 +50,20 @@ public function request( return false; } } + //Checking for existing pending requests + $existingRequests = $table + ->find() + ->where([ + "member_id" => $requesterId, + "activity_id" => $activityId, + "status" => Authorization::PENDING_STATUS + ]) + ->count(); + if ($existingRequests > 0) { + return false; + } + + $auth = $table->newEmptyEntity(); $auth->member_id = $requesterId; $auth->activity_id = $activityId; @@ -534,4 +548,4 @@ private function saveAuthorizationApproval( } // endregion -} +} \ No newline at end of file From 17be562cc65b29e30e4ac44b15ebfea9c0b05f1a Mon Sep 17 00:00:00 2001 From: Chris Thompson <=> Date: Wed, 16 Oct 2024 17:14:52 +0000 Subject: [PATCH 2/5] =?UTF-8?q?Authorizations=20Queues=20handles=20=C3=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthorizationApprovalsController.php | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/app/plugins/Activities/src/Controller/AuthorizationApprovalsController.php b/app/plugins/Activities/src/Controller/AuthorizationApprovalsController.php index c9ef8521..75305da9 100644 --- a/app/plugins/Activities/src/Controller/AuthorizationApprovalsController.php +++ b/app/plugins/Activities/src/Controller/AuthorizationApprovalsController.php @@ -26,6 +26,7 @@ class AuthorizationApprovalsController extends AppController public function index() { $search = $this->request->getQuery("search"); + $search = $search ? trim($search) : null; $query = $this->AuthorizationApprovals @@ -58,11 +59,26 @@ public function index() ), ]) ->group("Approvers.id"); + if ($search) { + //detect th and replace with Þ + $nsearch = $search; + if (preg_match("/th/", $search)) { + $nsearch = str_replace("th", "Þ", $search); + } + //detect Þ and replace with th + $usearch = $search; + if (preg_match("/Þ/", $search)) { + $usearch = str_replace("Þ", "th", $search); + } $query = $query->where([ "OR" => [ - "Approvers.sca_name LIKE" => "%" . $search . "%", - "Approvers.email_address LIKE" => "%" . $search . "%", + ["Approvers.sca_name LIKE" => "%" . $search . "%"], + ["Approvers.sca_name LIKE" => "%" . $nsearch . "%"], + ["Approvers.sca_name LIKE" => "%" . $usearch . "%"], + ["Approvers.email_address LIKE" => "%" . $search . "%"], + ["Approvers.email_address LIKE" => "%" . $nsearch . "%"], + ["Approvers.email_address LIKE" => "%" . $usearch . "%"], ], ]); } @@ -281,4 +297,4 @@ public function deny(AuthorizationManagerInterface $maService, $id = null) return $this->redirect($this->referer()); } -} \ No newline at end of file +} From 677586ded37270b56bd3ae3503af69b021974940 Mon Sep 17 00:00:00 2001 From: Chris Thompson <=> Date: Wed, 16 Oct 2024 22:57:55 +0000 Subject: [PATCH 3/5] added Alert that triggers ajax request to extend session if clicked within 5 minutes --- app/config/routes.php | 4 ++- app/src/Controller/SessionsController.php | 25 +++++++++++++ .../layout/TwitterBootstrap/dashboard.php | 15 +++++--- .../layout/TwitterBootstrap/view_record.php | 36 ++++++++++++++++--- app/webroot/js/sessionExtender.js | 15 ++++++++ 5 files changed, 86 insertions(+), 9 deletions(-) create mode 100644 app/src/Controller/SessionsController.php create mode 100644 app/webroot/js/sessionExtender.js diff --git a/app/config/routes.php b/app/config/routes.php index 74f45f5d..2b3d802b 100644 --- a/app/config/routes.php +++ b/app/config/routes.php @@ -82,8 +82,10 @@ * You can remove these routes once you've connected the * routes you want in your application. */ + $builder->fallbacks(); }); + $routes->connect('/keepalive', ['controller' => 'Sessions', 'action' => 'keepalive']); $routes->scope('/images', function ($routes) { $routes->registerMiddleware('glide', new \ADmad\Glide\Middleware\GlideMiddleware([ // Run this middleware only for URLs starting with specified string. Default null. @@ -157,4 +159,4 @@ * }); * ``` */ -}; \ No newline at end of file +}; diff --git a/app/src/Controller/SessionsController.php b/app/src/Controller/SessionsController.php new file mode 100644 index 00000000..ff64cbc8 --- /dev/null +++ b/app/src/Controller/SessionsController.php @@ -0,0 +1,25 @@ +request->getSession(); + // if ($session->check('count')) { + // $session->write(['count' => $session->read('count') + 1]); + // } else { + // $session->write(['count' => 1]); + // } + $response = $this->response; + $response = $response->withStringBody('My Body'); + $response = $response->withType('application/json') + ->withStringBody(json_encode(['response' => 'Session extended'])); + return $response; + } +} diff --git a/app/templates/layout/TwitterBootstrap/dashboard.php b/app/templates/layout/TwitterBootstrap/dashboard.php index aa0eb78d..82a5883f 100644 --- a/app/templates/layout/TwitterBootstrap/dashboard.php +++ b/app/templates/layout/TwitterBootstrap/dashboard.php @@ -22,6 +22,13 @@ ?> fetch("tb_body_attrs") ?>> + Html->script('sessionExtender') + ?> +
Html->image($this->KMP->getAppSetting("KMP.BannerLogo", "badge.png"), [ @@ -46,9 +53,9 @@ $css = $parts[1]; } ?> -
  • - -
    • +
  • + +
  • Html->link( @@ -98,4 +105,4 @@ $this->KMP->endBlock(); } echo $this->fetch("content"); -echo $this->element('copyrightFooter', []); \ No newline at end of file +echo $this->element('copyrightFooter', []); diff --git a/app/templates/layout/TwitterBootstrap/view_record.php b/app/templates/layout/TwitterBootstrap/view_record.php index 55924e87..9cb82149 100644 --- a/app/templates/layout/TwitterBootstrap/view_record.php +++ b/app/templates/layout/TwitterBootstrap/view_record.php @@ -21,6 +21,13 @@ ?> fetch("tb_body_attrs") ?>> + Html->script('sessionExtender') + ?> +
    Html->image($this->KMP->getAppSetting("KMP.BannerLogo", "badge.png"), [ @@ -45,10 +52,31 @@ $css = $parts[1]; } ?> -
  • - -
    • +
  • + +
    • +
  • Html->link( __("Sign out"), @@ -146,4 +174,4 @@ } echo $this->fetch("content"); -echo $this->element('copyrightFooter', []); \ No newline at end of file +echo $this->element('copyrightFooter', []); diff --git a/app/webroot/js/sessionExtender.js b/app/webroot/js/sessionExtender.js new file mode 100644 index 00000000..d7add8c3 --- /dev/null +++ b/app/webroot/js/sessionExtender.js @@ -0,0 +1,15 @@ +function extendSesh(url) { + setTimeout(function () { + alert('Session Expiring! Click ok to extend session.'); + fetch(url) + .then(res => { + return res.json() + }) + .then(data => { + console.log(data.response) + extendSesh(url) + }) + //minutes * 60000 miliseconds per minute + }, 25 * 60000) + +} From a9045496107971f2020cf2840f28783fc0de3609 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2024 15:05:05 +0000 Subject: [PATCH 4/5] Bump cookie and express in /app Bumps [cookie](https://github.com/jshttp/cookie) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `cookie` from 0.6.0 to 0.7.1 - [Release notes](https://github.com/jshttp/cookie/releases) - [Commits](https://github.com/jshttp/cookie/compare/v0.6.0...v0.7.1) Updates `express` from 4.21.0 to 4.21.1 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.1/History.md) - [Commits](https://github.com/expressjs/express/compare/4.21.0...4.21.1) --- updated-dependencies: - dependency-name: cookie dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- app/package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 4494e6f7..ac7eb15f 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -3591,9 +3591,9 @@ "dev": true }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "dev": true, "engines": { "node": ">= 0.6" @@ -4471,9 +4471,9 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dev": true, "dependencies": { "accepts": "~1.3.8", @@ -4481,7 +4481,7 @@ "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", From e682819bcc75c993a01e8080bac705403d416a89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:55:52 +0000 Subject: [PATCH 5/5] Bump elliptic from 6.5.7 to 6.6.0 in /app Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.7 to 6.6.0. - [Commits](https://github.com/indutny/elliptic/compare/v6.5.7...v6.6.0) --- updated-dependencies: - dependency-name: elliptic dependency-type: indirect ... Signed-off-by: dependabot[bot] --- app/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 7cef3672..cb7a5b9f 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -4819,9 +4819,9 @@ "dev": true }, "node_modules/elliptic": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", - "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz", + "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==", "dev": true, "dependencies": { "bn.js": "^4.11.9",