Aut 1474 session cap reauth

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

@@ -88,7 +88,12 @@ synchronized String refreshOrRequestNewAccessToken(boolean forceRefresh)
             log.debug("Going to refresh access token.");
             try
             {
-                return refreshAccessToken();
+                String accessToken = refreshAccessToken();
+                if (!isSessionCapped())
+                {
+                    return accessToken;
+                }
+                log.debug("Refreshed token has a session-capped lifetime ({}s); re-authenticating.", authentication.getRefreshExpiresIn());
             }
             catch (Exception e)
             {
@@ -116,19 +121,24 @@ boolean isRefreshable()
         return refreshExpiresAt > clock.currentTimeMillis();
     }
 
+    boolean isSessionCapped()
+    {
+        return authentication.getRefreshExpiresIn() * 1000L < REFRESH_BEFORE_EXPIRES_MS;
+    }
+
     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,46 @@ public void isRefreshableExpired()
         when(clock.currentTimeMillis()).thenReturn(REFRESH_TOKEN_TTL * 1000 + System.currentTimeMillis());
         assertFalse(authenticator.isRefreshable());
     }
+
+    @Test
+    public void refreshExpiresAtUsesSecondsToMillisConversion()
+    {
+        when(clock.currentTimeMillis()).thenReturn(System.currentTimeMillis());
+        authenticator.getAccessToken();
+
+        when(clock.currentTimeMillis()).thenReturn(REFRESH_TOKEN_TTL * 1000 + System.currentTimeMillis() - 1000);
+        assertTrue(authenticator.isRefreshable());
+    }
+
+    @Test
+    public void refreshOrRequestNewAccessTokenSessionCappedTriggersReAuth()
+    {
+        when(clock.currentTimeMillis()).thenReturn(System.currentTimeMillis());
+        authenticator.getAccessToken();
+
+        Authentication cappedAuth = new Authentication("cappedAccessToken", "cappedRefreshToken", ACCESS_TOKEN_TTL, 45, "bearer");
+        when(authenticationApi.refresh(any(AuthenticationRefreshRequest.class))).thenReturn(cappedAuth);
+
+        String accessToken = authenticator.refreshOrRequestNewAccessToken(true);
+
+        verify(authenticationApi).refresh(any(AuthenticationRefreshRequest.class));
+        verify(authenticationApi, times(2)).authenticate(any(AuthenticationRequest.class));
+        assertEquals(auth.getAccessToken(), accessToken);
+    }
+
+    @Test
+    public void refreshOrRequestNewAccessTokenNormalRefreshUnaffected()
+    {
+        when(clock.currentTimeMillis()).thenReturn(System.currentTimeMillis());
+        authenticator.getAccessToken();
+
+        Authentication refreshedAuth = new Authentication("refreshedAccessToken", "refreshedRefreshToken", ACCESS_TOKEN_TTL, REFRESH_TOKEN_TTL, "bearer");
+        when(authenticationApi.refresh(any(AuthenticationRefreshRequest.class))).thenReturn(refreshedAuth);
+
+        String accessToken = authenticator.refreshOrRequestNewAccessToken(true);
+
+        verify(authenticationApi).refresh(any(AuthenticationRefreshRequest.class));
+        verify(authenticationApi, times(1)).authenticate(any(AuthenticationRequest.class));
+        assertEquals(refreshedAuth.getAccessToken(), accessToken);
+    }
 }