Token Expiry Logic

Reversed Token expiry logic

Author: Aidan Laing

mobileauthentication/src/main/java/ca/bc/gov/mobileauthentication/data/models/Token.kt

@@ -21,12 +21,12 @@ data class Token(
 
     fun isExpired(currentTime: Long = System.currentTimeMillis()): Boolean {
         val currExpiresAt = expiresAt ?: return true
-        return currExpiresAt > currentTime
+        return currExpiresAt < currentTime
     }
 
     fun isRefreshExpired(currentTime: Long = System.currentTimeMillis()): Boolean {
         val currRefreshExpiresAt = refreshExpiresAt ?: return true
-        return currRefreshExpiresAt > currentTime
+        return currRefreshExpiresAt < currentTime
     }
 
 }

mobileauthentication/src/test/java/ca/bc/gov/mobileauthentication/data/models/TokenTest.kt

@@ -15,9 +15,9 @@ class TokenTest {
         val currentTime = 2000L
         val expiresAt = 3000L
         val token = Token(null, null, null, null,
-                null, null, null, null, expiresAt)
+                null, null, null, null, expiresAt, 4000L)
 
-        val expected = true
+        val expected = false
         val actual = token.isExpired(currentTime)
 
         assertEquals(expected, actual)
@@ -28,9 +28,9 @@ class TokenTest {
         val currentTime = 2000L
         val expiresAt = 1000L
         val token = Token(null, null, null, null,
-                null, null, null, null, expiresAt)
+                null, null, null, null, expiresAt, 4000L)
 
-        val expected = false
+        val expected = true
         val actual = token.isExpired(currentTime)
 
         assertEquals(expected, actual)
@@ -41,7 +41,7 @@ class TokenTest {
         val currentTime = 2000L
         val expiresAt = 2000L
         val token = Token(null, null, null, null,
-                null, null, null, null, expiresAt)
+                null, null, null, null, expiresAt, 4000L)
 
         val expected = false
         val actual = token.isExpired(currentTime)
@@ -56,7 +56,7 @@ class TokenTest {
         val token = Token(null, null, null, null,
                 null, null, null, null, 0, refreshExpiresAt)
 
-        val expected = true
+        val expected = false
         val actual = token.isRefreshExpired(currentTime)
 
         assertEquals(expected, actual)
@@ -69,7 +69,7 @@ class TokenTest {
         val token = Token(null, null, null, null,
                 null, null, null, null, 0, refreshExpiresAt)
 
-        val expected = false
+        val expected = true
         val actual = token.isRefreshExpired(currentTime)
 
         assertEquals(expected, actual)

mobileauthentication/src/test/java/ca/bc/gov/mobileauthentication/screens/redirect/RedirectPresenterTest.kt

@@ -100,7 +100,7 @@ class RedirectPresenterTest {
     fun redirectReceived() {
         val code = "123"
         val token = Token("opensesame",null,null,null,
-                null,null,null,null)
+                null,null,null,null, 3000L, 4000L)
         whenever(tokenRepo.getToken(code)).thenReturn(Observable.just(token))
 
         val tokenJson = "{ \"accessToken\" : \"opensesame\"}"
@@ -128,7 +128,7 @@ class RedirectPresenterTest {
     fun getToken() {
         val code = "123"
         val token = Token("opensesame",null,null,null,
-                null,null,null,null)
+                null,null,null,null, 3000L, 4000L)
         whenever(tokenRepo.getToken(code)).thenReturn(Observable.just(token))
 
         val tokenJson = "{ \"accessToken\" : \"opensesame\"}"