From: Dan Brown <redacted>
Date: Tue, 12 Mar 2024 12:08:26 +0000 (+0000)
Subject: Dev: Fixed flaky OIDC test, updated dev version
X-Git-Tag: v24.05~1^2~26
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/07761524af8277699d75fca09f35341420a6c619

Dev: Fixed flaky OIDC test, updated dev version
---

diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index 345d1dc78..228c75e9e 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -594,10 +594,16 @@ class OidcTest extends TestCase
     {
         config()->set(['oidc.end_session_endpoint' => 'https://example.com/logout']);
 
-        $this->runLogin();
+        // Fix times so our token is predictable
+        $claimOverrides = [
+            'iat' => time(),
+            'exp' => time() + 720,
+            'auth_time' => time()
+        ];
+        $this->runLogin($claimOverrides);
 
         $resp = $this->asEditor()->post('/oidc/logout');
-        $query = 'id_token_hint=' . urlencode(OidcJwtHelper::idToken()) .  '&post_logout_redirect_uri=' . urlencode(url('/'));
+        $query = 'id_token_hint=' . urlencode(OidcJwtHelper::idToken($claimOverrides)) .  '&post_logout_redirect_uri=' . urlencode(url('/'));
         $resp->assertRedirect('https://example.com/logout?' . $query);
     }
 
diff --git a/version b/version
index 05edb56cc..522220af0 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v23.09-dev
+v24.03-dev