feat(ZMS-2778): Monitor logged in sessions by scope and department (#651

) * feat(ZMS-2778): Add three queries to status to monitor active sessions * feat(ZMS-2778): Update three queries to status to monitor active sessions * feat(ZMS-2778): Update three queries to status to monitor active sessions * feat(ZMS-2778): Add token session duration to expiry. * feat(ZMS-2778): Add to expiry to user table. * feat(ZMS-2778): Change status query and fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Add update sessionExpiry to updateEntityAuthkey
it-at-m · Oct 24, 2024 · 2b1a93c · 2b1a93c
1 parent e7e1930
commit 2b1a93c
Show file tree

Hide file tree

Showing 12 changed files with 143 additions and 112 deletions.
diff --git a/zmsapi/src/Zmsapi/WorkstationLogin.php b/zmsapi/src/Zmsapi/WorkstationLogin.php
@@ -58,6 +58,7 @@ public static function getLoggedInWorkstation($request, $entity, $resolveReferen
             $useraccount->id,
             $useraccount->password,
             \App::getNow(),
+            (new \DateTime())->setTimestamp(time() + \App::SESSION_DURATION),
             $resolveReferences
         );
 

diff --git a/zmsapi/src/Zmsapi/WorkstationOAuth.php b/zmsapi/src/Zmsapi/WorkstationOAuth.php
@@ -60,6 +60,7 @@ protected function getLoggedInWorkstationByOidc($request, $entity, $resolveRefer
             $entity->id,
             $request->getHeaderLine('X-Authkey'),
             \App::getNow(),
+            (new \DateTime())->setTimestamp(time() + \App::SESSION_DURATION),
             $resolveReferences
         );
         return $workstation;
@@ -73,12 +74,14 @@ protected function writeOAuthWorkstation(UseraccountEntity $entity, $state, $res
             $useraccount->getId(),
             $entity->password,
             \App::getNow(),
+            (new \DateTime())->setTimestamp(time() + \App::SESSION_DURATION),
             $resolveReferences
         );
         $workstation = $query->updateEntityAuthkey(
             $useraccount->getId(),
             $entity->password,
             $state,
+            (new \DateTime())->setTimestamp(time() + \App::SESSION_DURATION),
             $resolveReferences
         );
         return $workstation;

diff --git a/zmsapi/tests/Zmsapi/WorkstationGetTest.php b/zmsapi/tests/Zmsapi/WorkstationGetTest.php
@@ -36,7 +36,7 @@ public function testRendering()
     public function testReadWorkstationByXAuthKey()
     {
         $workstation = (new \BO\Zmsdb\Workstation)
-            ->writeEntityLoginByName(static::$loginName, md5(static::$authKey), \App::getNow(), 1);
+            ->writeEntityLoginByName(static::$loginName, md5(static::$authKey), \App::getNow(), (new \DateTime())->setTimestamp(time() + \App::SESSION_DURATION), 1);
         $logInHash = (new \BO\Zmsdb\Workstation)->readLoggedInHashByName($workstation->getUseraccount()->id);
         $response = $this->render([], [
             '__header' => [

diff --git a/zmsapi/tests/Zmsapi/WorkstationUpdateTest.php b/zmsapi/tests/Zmsapi/WorkstationUpdateTest.php
@@ -63,7 +63,7 @@ public function testOveragedLogin()
         $this->expectExceptionCode(200);
 
         $entity = (new \BO\Zmsdb\Workstation)
-            ->writeEntityLoginByName(static::$loginName, static::$authKey, \App::getNow(), 2);
+            ->writeEntityLoginByName(static::$loginName, static::$authKey, \App::getNow(), (new \DateTime())->setTimestamp(time() + \App::SESSION_DURATION), 2);
         $entity->scope['id'] = self::SCOPEID;
         $entity->name = self::PLACE;
         (new \BO\Zmsdb\Workstation)->updateEntity($entity, 0);

diff --git a/zmsdb/migrations/91729672394-add-session-duration-to-nutzer-table.sql b/zmsdb/migrations/91729672394-add-session-duration-to-nutzer-table.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `nutzer`
+    ADD COLUMN `sessionExpiry` DATETIME DEFAULT NULL;
diff --git a/zmsdb/src/Zmsdb/Query/Workstation.php b/zmsdb/src/Zmsdb/Query/Workstation.php
@@ -18,6 +18,7 @@ class Workstation extends Base implements MappingInterface
             '. self::TABLE .'
         SET
             `SessionID`=?,
+            `sessionExpiry`=?,
             `Datum`=?,
             `lastUpdate`=?,
             `Arbeitsplatznr`="",
@@ -33,6 +34,7 @@ class Workstation extends Base implements MappingInterface
             '. self::TABLE .'
         SET
             `SessionID`=?,
+            `sessionExpiry`=?,
             `Datum`=?,
             `Arbeitsplatznr`="",
             `aufrufzusatz`="",
@@ -56,6 +58,7 @@ class Workstation extends Base implements MappingInterface
             '. self::TABLE .'
         SET
             `SessionID`="",
+            `sessionExpiry`=NULL,
             `StandortID`=0,
             `Datum`="0000-00-00",
             `Arbeitsplatznr`="",
@@ -78,7 +81,8 @@ class Workstation extends Base implements MappingInterface
         UPDATE
             '. self::TABLE .'
         SET
-            `SessionID`=?
+            `SessionID`=?,
+            `sessionExpiry`=?
         WHERE
             `Name`= ?  AND
             `Passworthash` = ?
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE `nutzer`
		ADD COLUMN `sessionExpiry` DATETIME DEFAULT NULL;