feat: add authenticator invalidate (SHOP-231)

Author: vsolovei-smartling

smartling-api-commons/src/main/java/com/smartling/api/v2/client/auth/Authenticator.java

@@ -116,19 +116,26 @@ boolean isRefreshable()
         return refreshExpiresAt > clock.currentTimeMillis();
     }
 
+    public synchronized void invalidate()
+    {
+        this.authentication = null;
+        this.expiresAt = -1;
+        this.refreshExpiresAt = -1;
+    }
+
     private synchronized String getAccessTokenInternal()
     {
         this.authentication = api.authenticate(new AuthenticationRequest(userIdentifier, userSecret));
         this.expiresAt = authentication.getExpiresIn() * 1000 + System.currentTimeMillis();
-        this.refreshExpiresAt = authentication.getRefreshExpiresIn() * 100 + System.currentTimeMillis();
+        this.refreshExpiresAt = authentication.getRefreshExpiresIn() * 1000 + System.currentTimeMillis();
         return authentication.getAccessToken();
     }
 
     private synchronized String refreshAccessToken()
     {
         this.authentication = api.refresh(new AuthenticationRefreshRequest(authentication.getRefreshToken()));
         this.expiresAt = authentication.getExpiresIn() * 1000 + System.currentTimeMillis();
-        this.refreshExpiresAt = authentication.getRefreshExpiresIn() * 100 + System.currentTimeMillis();
+        this.refreshExpiresAt = authentication.getRefreshExpiresIn() * 1000 + System.currentTimeMillis();
         return authentication.getAccessToken();
     }
 }

smartling-api-commons/src/test/java/com/smartling/api/v2/client/auth/AuthenticatorTest.java

@@ -141,4 +141,90 @@ public void isRefreshableExpired()
         when(clock.currentTimeMillis()).thenReturn(REFRESH_TOKEN_TTL * 1000 + System.currentTimeMillis());
         assertFalse(authenticator.isRefreshable());
     }
+
+    @Test
+    public void invalidateClearsToken()
+    {
+        when(clock.currentTimeMillis()).thenReturn(System.currentTimeMillis());
+        authenticator.getAccessToken();
+        assertTrue(authenticator.isValid());
+
+        authenticator.invalidate();
+
+        assertFalse(authenticator.isValid());
+        assertFalse(authenticator.isRefreshable());
+    }
+
+    @Test
+    public void getAccessTokenAfterInvalidateReAuthenticates()
+    {
+        when(clock.currentTimeMillis()).thenReturn(System.currentTimeMillis());
+        authenticator.getAccessToken();
+        authenticator.invalidate();
+        authenticator.getAccessToken();
+
+        verify(authenticationApi, times(2)).authenticate(any(AuthenticationRequest.class));
+        verify(authenticationApi, never()).refresh(any(AuthenticationRefreshRequest.class));
+    }
+
+    @Test
+    public void getAccessTokenRefreshesAtExactExpiryBoundary()
+    {
+        Authentication shortLivedAuth = new Authentication("accessToken", "refreshToken", 480, 21600, "bearer");
+        Authentication refreshedAuth = new Authentication("newAccessToken", "newRefreshToken", 480, 21600, "bearer");
+
+        when(authenticationApi.authenticate(any(AuthenticationRequest.class))).thenReturn(shortLivedAuth);
+        when(authenticationApi.refresh(any(AuthenticationRefreshRequest.class))).thenReturn(refreshedAuth);
+
+        authenticator.getAccessToken();
+
+        when(clock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 480_000L);
+
+        String token = authenticator.getAccessToken();
+
+        assertEquals(refreshedAuth.getAccessToken(), token);
+        verify(authenticationApi, times(1)).authenticate(any(AuthenticationRequest.class));
+        verify(authenticationApi, times(1)).refresh(any(AuthenticationRefreshRequest.class));
+    }
+
+    @Test
+    public void getAccessTokenRefreshesJustBeforeRefreshTokenExpiry()
+    {
+        Authentication shortLivedAuth = new Authentication("accessToken", "refreshToken", 480, 21600, "bearer");
+        Authentication refreshedAuth = new Authentication("newAccessToken", "newRefreshToken", 480, 21600, "bearer");
+
+        when(authenticationApi.authenticate(any(AuthenticationRequest.class))).thenReturn(shortLivedAuth);
+        when(authenticationApi.refresh(any(AuthenticationRefreshRequest.class))).thenReturn(refreshedAuth);
+
+        authenticator.getAccessToken();
+
+        // Access token expired, refresh token still valid
+        when(clock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 21_510_000L);
+
+        String token = authenticator.getAccessToken();
+
+        assertEquals(refreshedAuth.getAccessToken(), token);
+        verify(authenticationApi, times(1)).authenticate(any(AuthenticationRequest.class));
+        verify(authenticationApi, times(1)).refresh(any(AuthenticationRefreshRequest.class));
+    }
+
+    @Test
+    public void getAccessTokenRefreshesWhenAccessTokenExpiredButRefreshTokenValid()
+    {
+        Authentication shortLivedAuth = new Authentication("accessToken", "refreshToken", 480, 21600, "bearer");
+        Authentication refreshedAuth = new Authentication("newAccessToken", "newRefreshToken", 480, 21600, "bearer");
+
+        when(authenticationApi.authenticate(any(AuthenticationRequest.class))).thenReturn(shortLivedAuth);
+        when(authenticationApi.refresh(any(AuthenticationRefreshRequest.class))).thenReturn(refreshedAuth);
+
+        authenticator.getAccessToken();
+
+        when(clock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 600_000L);
+
+        String token = authenticator.getAccessToken();
+
+        assertEquals(refreshedAuth.getAccessToken(), token);
+        verify(authenticationApi, times(1)).authenticate(any(AuthenticationRequest.class));
+        verify(authenticationApi, times(1)).refresh(any(AuthenticationRefreshRequest.class));
+    }
 }