Fix external logout handler to process all sessions. (vufind-org#3798)

Author: EreMaijala

module/VuFind/src/VuFind/Controller/ShibbolethLogoutNotificationController.php

@@ -116,11 +116,14 @@ public function postAction()
      */
     public function logoutNotification($sessionId)
     {
-        $row = $this->getDbService(ExternalSessionServiceInterface::class)->getByExternalSessionId(trim($sessionId));
-        if ($row) {
+        $rows = $this->getDbService(ExternalSessionServiceInterface::class)
+            ->getAllByExternalSessionId(trim($sessionId));
+        if ($rows) {
             $sessionManager = $this->serviceLocator->get(\Laminas\Session\SessionManager::class);
             $handler = $sessionManager->getSaveHandler();
-            $handler->destroy($row->getSessionId());
+            foreach ($rows as $row) {
+                $handler->destroy($row->getSessionId());
+            }
         }
     }
 

module/VuFind/src/VuFind/Db/Service/ExternalSessionService.php

@@ -82,15 +82,15 @@ public function addSessionMapping(
     }
 
     /**
-     * Retrieve an object from the database based on an external session ID
+     * Retrieve objects from the database based on an external session ID
      *
      * @param string $sid External session ID to retrieve
      *
-     * @return ?ExternalSessionEntityInterface
+     * @return ExternalSessionEntityInterface[]
      */
-    public function getByExternalSessionId(string $sid): ?ExternalSessionEntityInterface
+    public function getAllByExternalSessionId(string $sid): array
     {
-        return $this->getDbTable('ExternalSession')->select(['external_session_id' => $sid])->current();
+        return iterator_to_array($this->getDbTable('ExternalSession')->select(['external_session_id' => $sid]));
     }
 
     /**

module/VuFind/src/VuFind/Db/Service/ExternalSessionServiceInterface.php

@@ -63,13 +63,13 @@ public function addSessionMapping(
     ): ExternalSessionEntityInterface;
 
     /**
-     * Retrieve an object from the database based on an external session ID
+     * Retrieve objects from the database based on an external session ID
      *
      * @param string $sid External session ID to retrieve
      *
-     * @return ?ExternalSessionEntityInterface
+     * @return ExternalSessionEntityInterface[]
      */
-    public function getByExternalSessionId(string $sid): ?ExternalSessionEntityInterface;
+    public function getAllByExternalSessionId(string $sid): array;
 
     /**
      * Destroy data for the given session ID.

module/VuFind/src/VuFind/Db/Table/ExternalSession.php

@@ -94,11 +94,12 @@ public function addSessionMapping($localSessionId, $externalSessionId)
      *
      * @return ?\VuFind\Db\Row\ExternalSession
      *
-     * @deprecated Use ExternalSessionServiceInterface::getByExternalSessionId()
+     * @deprecated Use ExternalSessionServiceInterface::getAllByExternalSessionId()
      */
     public function getByExternalSessionId($sid)
     {
-        $this->getDbService(ExternalSessionServiceInterface::class)->getByExternalSessionId($sid);
+        $sessions = $this->getDbService(ExternalSessionServiceInterface::class)->getAllByExternalSessionId($sid);
+        return $sessions[0] ?? null;
     }
 
     /**