Feat/expiration token local

app/src/main/java/com/xpeho/xpeapp/MainActivity.kt

@@ -3,7 +3,6 @@
 import android.app.AlertDialog
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
@@ -32,6 +31,7 @@
 import org.json.JSONObject
 import java.io.IOException
 import com.xpeho.xpeho_ui_android.foundations.Colors as XpehoColors
+import androidx.core.net.toUri
 
 class MainActivity : ComponentActivity() {
 
@@ -65,16 +65,26 @@
         val startScreenFlow: MutableStateFlow<Screens> =
             MutableStateFlow(if (connectedLastTime) Screens.Home else Screens.Login)
 
+        // Periodic check for token expiration (every 8 hours)
+        CoroutineScope(Dispatchers.IO).launch {
+            while (true) {
+                kotlinx.coroutines.delay(8 * 60 * 60 * 1000L) // 8 hours
+
+                // Check if we are connected and if the token has expired
+                val authState = XpeApp.appModule.authenticationManager.authState.value
+                if (authState is com.xpeho.xpeapp.domain.AuthState.Authenticated) {
+                    // isAuthValid() automatically logs out if the token has expired
+                    XpeApp.appModule.authenticationManager.isAuthValid()
+                }
+            }
+        }
+
         // If the user was connected last time, try to restore the authentication state.
         if (connectedLastTime) {
             CoroutineScope(Dispatchers.IO).launch {
                 XpeApp.appModule.authenticationManager.restoreAuthStateFromStorage()
-                if (!XpeApp.appModule.authenticationManager.isAuthValid()) {
-                    XpeApp.appModule.authenticationManager.logout()
-                    withContext(Dispatchers.Main) {
-                        startScreenFlow.value = Screens.Login
-                    }
-                }
+                // Check validity after restoration (automatic logout if expired)
+                XpeApp.appModule.authenticationManager.isAuthValid()
             }
         }
 
@@ -145,7 +155,7 @@
             .setCancelable(false)
             .setPositiveButton(getString(R.string.force_update_popup_button_label)) { _, _ ->
                 val intent = Intent(Intent.ACTION_VIEW).apply {
-                    data = Uri.parse("market://details?id=$packageName")
+                    data = "market://details?id=$packageName".toUri()
                     setPackage("com.android.vending")
                 }
                 startActivity(intent)
@@ -167,7 +177,7 @@
             client.newCall(request).execute().use { response ->
                 if (!response.isSuccessful) throw IOException("Unexpected code $response")
 
-                val jsonResponse = JSONObject(response.body?.string() ?: "")
+                val jsonResponse = JSONObject(response.body.string())
                 jsonResponse.getString("tag_name")
             }
         }

app/src/main/java/com/xpeho/xpeapp/data/DatastorePref.kt

@@ -24,6 +24,7 @@ class DatastorePref(
         val CONNECT = stringPreferencesKey("isConnectedLeastOneTime")
         val AUTH_DATA = stringPreferencesKey("authData")
         val WAS_CONNECTED_LAST_TIME = stringPreferencesKey("wasConnectedLastTime")
+        val LAST_EMAIL = stringPreferencesKey("lastEmail")
     }
 
     val isConnectedLeastOneTime: Flow<Boolean> = context.dataStore.data
@@ -85,5 +86,19 @@ class DatastorePref(
             preferences[WAS_CONNECTED_LAST_TIME]?.toBoolean() ?: false
         }.first()
     }
+
+    // Last email persistence
+
+    suspend fun setLastEmail(email: String) {
+        context.dataStore.edit { preference ->
+            preference[LAST_EMAIL] = email
+        }
+    }
+
+    suspend fun getLastEmail(): String? {
+        return context.dataStore.data.map { preferences ->
+            preferences[LAST_EMAIL]
+        }.first()
+    }
 }
 

app/src/main/java/com/xpeho/xpeapp/domain/AuthenticationManager.kt

@@ -35,16 +35,29 @@
     val authState = _authState.asStateFlow()
 
     fun restoreAuthStateFromStorage() = runBlocking {
-        datastorePref.getAuthData()?.let {
-            _authState.value = AuthState.Authenticated(it)
-            tokenProvider.set("Bearer ${it.token.token}")
+        datastorePref.getAuthData()?.let { authData ->
+            // Verify if the token has expired (5 days)
+            if (isTokenExpired(authData)) {
+                // The token has expired, perform logout
+                logout()
+            } else {
+                // The token is still valid, restore the authenticated state
+                _authState.value = AuthState.Authenticated(authData)
+                tokenProvider.set("Bearer ${authData.token.token}")
+            }
         }
     }
 
     suspend fun isAuthValid(): Boolean {
         return when (val authState = this.authState.value) {
             is AuthState.Unauthenticated -> false
             is AuthState.Authenticated -> {
+                // Verify if the token has expired (5 days)
+                if (isTokenExpired(authState.authData)) {
+                    logout()
+                    return false
+                }
+
                 // Note(loucas): Order of operations here is important,
                 // lazy `&&` evalutation makes this faster
                 firebaseService.isAuthenticated()
@@ -53,6 +66,23 @@
         }
     }
 
+    /**
+     * Verify if the token has expired.
+     * A token is considered expired if it is older than 5 days.
+     * @param authData: The authentication data containing the token and its saved timestamp.
+     * @return True if the token has expired, false otherwise.
+     */
+    private fun isTokenExpired(authData: AuthData): Boolean {
+        val currentTime = System.currentTimeMillis()
+        val tokenAge = currentTime - authData.tokenSavedTimestamp
+        val fiveDaysInMillis = 5 * 24 * 60 * 60 * 1000L // 5 days in milliseconds
+
+        val ageInDays = tokenAge / (24 * 60 * 60 * 1000L)
+        Log.d("AuthenticationManager", "Token age: $ageInDays days")
+
+        return tokenAge > fiveDaysInMillis
+    }
+
     fun getAuthData(): AuthData? {
         return when (val authState = this.authState.value) {
             is AuthState.Authenticated -> authState.authData
@@ -104,6 +134,7 @@
         datastorePref.setAuthData(authData)
         datastorePref.setIsConnectedLeastOneTime(true)
         datastorePref.setWasConnectedLastTime(true)
+        datastorePref.setLastEmail(username)
         wordpressUid?.let { datastorePref.setUserId(it) }
     }
 
@@ -120,4 +151,8 @@
     data class Authenticated(val authData: AuthData) : AuthState
 }
 
-data class AuthData(val username: String, val token: WordpressToken)
+data class AuthData(
+    val username: String, 
+    val token: WordpressToken,
+    val tokenSavedTimestamp: Long = System.currentTimeMillis()
+)

app/src/main/java/com/xpeho/xpeapp/ui/Home.kt

@@ -4,8 +4,12 @@ import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
+import com.xpeho.xpeapp.XpeApp
+import com.xpeho.xpeapp.domain.AuthState
 import com.xpeho.xpeapp.enums.Screens
 
 // Navigation animation duration in milliseconds.
@@ -17,6 +21,18 @@ private const val NAV_ANIM_DURATION_MILLIS = 300
 fun Home(startScreen: Screens) {
     val navigationController = rememberNavController()
 
+    // Observe the authentication state to handle navigation accordingly.
+    val authState = XpeApp.appModule.authenticationManager.authState.collectAsStateWithLifecycle()
+
+    LaunchedEffect(authState.value) {
+        if (authState.value is AuthState.Unauthenticated && 
+            navigationController.currentDestination?.route != Screens.Login.name) {
+            navigationController.navigate(Screens.Login.name) {
+                popUpTo(0) { inclusive = true }
+            }
+        }
+    }
+
     NavHost(
         navController = navigationController,
         startDestination = startScreen.name,

app/src/main/java/com/xpeho/xpeapp/ui/viewModel/WordpressViewModel.kt

@@ -5,6 +5,7 @@
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.xpeho.xpeapp.XpeApp
 import com.xpeho.xpeapp.data.entity.AuthentificationBody
 import com.xpeho.xpeapp.data.model.AuthResult
 import com.xpeho.xpeapp.domain.AuthenticationManager
@@ -16,13 +17,23 @@
 ) : ViewModel() {
 
     var body: AuthentificationBody? by mutableStateOf(null)
-    var usernameInput: String by mutableStateOf("")
+    var usernameInput: String by mutableStateOf(getLastEmailSync())
     var passwordInput: String by mutableStateOf("")
     var usernameInError: Boolean by mutableStateOf(false)
     var passwordInError: Boolean by mutableStateOf(false)
 
     var wordpressState: WordpressUiState by mutableStateOf(WordpressUiState.EMPTY)
 
+    private fun getLastEmailSync(): String {
+        return try {
+            kotlinx.coroutines.runBlocking {
+                XpeApp.appModule.datastorePref.getLastEmail() ?: ""
+            }
+        } catch (e: Exception) {
+            ""
+        }
+    }
+
     fun onLogin() {
         viewModelScope.launch {
             usernameInError = false