Merge pull request #105 from nextcloud/backport/104/stable25

[stable25] pass idp to sls
nextcloud · Apr 20, 2023 · 6ab5fcc · 6ab5fcc
2 parents fb8af2a + e5dec7e
commit 6ab5fcc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/Controller/MasterController.php b/lib/Controller/MasterController.php
@@ -79,15 +79,16 @@ public function __construct(
 	 */
 	public function autoLogout(?string $jwt) {
 		try {
-			if ($jwt !== null && $this->master->isValidJwt($jwt)) {
+			if ($jwt !== null) {
 				$key = $this->gss->getJwtKey();
 				$decoded = (array)JWT::decode($jwt, new Key($key, Application::JWT_ALGORITHM));
-
 				$idp = $decoded['saml.idp'] ?? null;
+
 				$logoutUrl = $this->urlGenerator->linkToRoute('user_saml.SAML.singleLogoutService');
-				if (!empty($logoutUrl) && $idp !== null) {
+				if (!empty($logoutUrl)) {
 					$token = [
 						'logout' => 'logout',
+						'idp' => $idp,
 						'exp' => time() + 300, // expires after 5 minutes
 					];