From 3d0c55fd18d4044b4bcaa99a59f4916d4adf5a45 Mon Sep 17 00:00:00 2001 From: Konstantin Schaper Date: Fri, 21 Aug 2020 11:38:59 +0200 Subject: [PATCH] fix tests and adjust cookie duration --- .../sonia/scm/security/DefaultAccessTokenCookieIssuer.java | 4 ++-- .../scm/api/v2/resources/AuthenticationResourceTest.java | 1 - .../scm/security/DefaultAccessTokenCookieIssuerTest.java | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/security/DefaultAccessTokenCookieIssuer.java b/scm-webapp/src/main/java/sonia/scm/security/DefaultAccessTokenCookieIssuer.java index 73d9e7f3a7..2a7f6b1edd 100644 --- a/scm-webapp/src/main/java/sonia/scm/security/DefaultAccessTokenCookieIssuer.java +++ b/scm-webapp/src/main/java/sonia/scm/security/DefaultAccessTokenCookieIssuer.java @@ -52,8 +52,8 @@ public final class DefaultAccessTokenCookieIssuer implements AccessTokenCookieIs */ private static final Logger LOG = LoggerFactory.getLogger(DefaultAccessTokenCookieIssuer.class); - private static final int DEFAULT_COOKIE_EXPIRATION_AMOUNT = 24; - private static final TimeUnit DEFAULT_COOKIE_EXPIRATION_UNIT = TimeUnit.HOURS; + private static final int DEFAULT_COOKIE_EXPIRATION_AMOUNT = 365; + private static final TimeUnit DEFAULT_COOKIE_EXPIRATION_UNIT = TimeUnit.DAYS; private static final int DEFAULT_COOKIE_EXPIRATION = (int) TimeUnit.SECONDS.convert(DEFAULT_COOKIE_EXPIRATION_AMOUNT, DEFAULT_COOKIE_EXPIRATION_UNIT); private final ScmConfiguration configuration; diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/AuthenticationResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/AuthenticationResourceTest.java index 92ab7b1209..2fe891e4cd 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/AuthenticationResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/AuthenticationResourceTest.java @@ -139,7 +139,6 @@ public class AuthenticationResourceTest { dispatcher.addSingletonResource(authenticationResource); AccessToken accessToken = mock(AccessToken.class); - when(accessToken.getExpiration()).thenReturn(new Date(Long.MAX_VALUE)); when(accessTokenBuilder.build()).thenReturn(accessToken); when(accessTokenBuilderFactory.create()).thenReturn(accessTokenBuilder); diff --git a/scm-webapp/src/test/java/sonia/scm/security/DefaultAccessTokenCookieIssuerTest.java b/scm-webapp/src/test/java/sonia/scm/security/DefaultAccessTokenCookieIssuerTest.java index 926022af55..1a759ad75c 100644 --- a/scm-webapp/src/test/java/sonia/scm/security/DefaultAccessTokenCookieIssuerTest.java +++ b/scm-webapp/src/test/java/sonia/scm/security/DefaultAccessTokenCookieIssuerTest.java @@ -121,8 +121,6 @@ public class DefaultAccessTokenCookieIssuerTest { } private Cookie authenticate() { - when(accessToken.getExpiration()).thenReturn(new Date()); - issuer.authenticate(request, response, accessToken); verify(response).addCookie(cookieArgumentCaptor.capture());