Fix tests for login expiry token

finos · Dec 8, 2024 · 350b74c · 350b74c
1 parent 0289fee
commit 350b74c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/tracdap-libs/tracdap-lib-auth/src/test/java/org/finos/tracdap/auth/login/GuestLoginTest.java b/tracdap-libs/tracdap-lib-auth/src/test/java/org/finos/tracdap/auth/login/GuestLoginTest.java
@@ -120,7 +120,7 @@ void testLoginFromScratch() throws Exception {
             var cookies = response.headers().allValues("set-cookie");
 
             var tokenCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-token")).findFirst();
-            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry-utc")).findFirst();
+            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry")).findFirst();
             var userIdCookie = cookies.stream().filter(c -> c.startsWith("trac-user-id")).findFirst();
             var userNameCookie = cookies.stream().filter(c -> c.startsWith("trac-user-name")).findFirst();
 
@@ -254,7 +254,7 @@ void testLoginExistingToken() throws Exception {
             var cookies = response.headers().allValues("set-cookie");
 
             var tokenCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-token")).findFirst();
-            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry-utc")).findFirst();
+            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry")).findFirst();
             var userIdCookie = cookies.stream().filter(c -> c.startsWith("trac-user-id")).findFirst();
             var userNameCookie = cookies.stream().filter(c -> c.startsWith("trac-user-name")).findFirst();
 
@@ -311,7 +311,7 @@ void testLoginTokenExpired() throws Exception {
             var cookies = response.headers().allValues("set-cookie");
 
             var tokenCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-token")).findFirst();
-            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry-utc")).findFirst();
+            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry")).findFirst();
             var userIdCookie = cookies.stream().filter(c -> c.startsWith("trac-user-id")).findFirst();
             var userNameCookie = cookies.stream().filter(c -> c.startsWith("trac-user-name")).findFirst();
 
@@ -358,7 +358,7 @@ void testLoginTokenGarbled() throws Exception {
             var cookies = response.headers().allValues("set-cookie");
 
             var tokenCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-token")).findFirst();
-            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry-utc")).findFirst();
+            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry")).findFirst();
             var userIdCookie = cookies.stream().filter(c -> c.startsWith("trac-user-id")).findFirst();
             var userNameCookie = cookies.stream().filter(c -> c.startsWith("trac-user-name")).findFirst();
 

diff --git a/...ap-libs/tracdap-lib-auth/src/test/java/org/finos/tracdap/auth/login/LoginRefreshTest.java b/...ap-libs/tracdap-lib-auth/src/test/java/org/finos/tracdap/auth/login/LoginRefreshTest.java
@@ -143,7 +143,7 @@ void testRefreshBrowser() throws Exception {
             var cookies = response.headers().allValues("set-cookie");
 
             var tokenCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-token")).findFirst();
-            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry-utc")).findFirst();
+            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry")).findFirst();
             var userIdCookie = cookies.stream().filter(c -> c.startsWith("trac-user-id")).findFirst();
             var userNameCookie = cookies.stream().filter(c -> c.startsWith("trac-user-name")).findFirst();
 

diff --git a/...ces/tracdap-svc-auth/src/test/java/org/finos/tracdap/svc/auth/LoginProviderSmokeTest.java b/...ces/tracdap-svc-auth/src/test/java/org/finos/tracdap/svc/auth/LoginProviderSmokeTest.java
@@ -82,7 +82,7 @@ void testLoginFromScratch() throws Exception {
             var cookies = response.headers().allValues("set-cookie");
 
             var tokenCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-token")).findFirst();
-            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry-utc")).findFirst();
+            var expiryCookie = cookies.stream().filter(c -> c.startsWith("trac-auth-expiry")).findFirst();
             var userIdCookie = cookies.stream().filter(c -> c.startsWith("trac-user-id")).findFirst();
             var userNameCookie = cookies.stream().filter(c -> c.startsWith("trac-user-name")).findFirst();