Merge pull request #155 from android/check_server_session

Check session ID validity with server before auto sign-in checks. Also disable passkey prompt after splash screen

Author: niharika2810

Shrine/app/src/main/java/com/authentication/shrine/repository/AuthRepository.kt

@@ -434,6 +434,29 @@ class AuthRepository @Inject constructor(
         return false
     }
 
+    /**
+     * Checks if session id is valid with server. Currently makes a getKeys() request
+     *
+     * @return True if the session id is valid, false otherwise.
+     */
+    suspend fun isSessionIdValid(): Boolean {
+        val sessionId = dataStore.read(SESSION_ID)
+        if (!sessionId.isNullOrBlank()) {
+            try {
+                val apiResult = authApiService.getKeys(
+                    cookie = sessionId.createCookieHeader(),
+                )
+                if (apiResult.isSuccessful) {
+                    return true
+                }
+            } catch (e: ApiException) {
+                Log.e(TAG, "Cannot call getKeys for isSessionIdValid")
+            }
+        }
+
+        return false
+    }
+
     /**
      * Sets the sign-in state.
      *

Shrine/app/src/main/java/com/authentication/shrine/ui/viewmodel/SplashViewModel.kt

@@ -42,15 +42,13 @@ class SplashViewModel @Inject constructor(
 
     init {
         viewModelScope.launch {
-            val startDestination = if (isSignedInThroughPassword()) {
-                if (isSignedInThroughPasskeys()) {
+            val startDestination =
+                if (isSessionIdValid()) {
                     ShrineAppDestinations.MainMenuRoute.name
                 } else {
-                    ShrineAppDestinations.CreatePasskeyRoute.name
+                    signOut()
+                    ShrineAppDestinations.AuthRoute.name
                 }
-            } else {
-                ShrineAppDestinations.AuthRoute.name
-            }
 
             _uiState.update {
                 SplashScreenState(
@@ -62,27 +60,21 @@ class SplashViewModel @Inject constructor(
     }
 
     /**
-     * Checks if the user is signed in using a password.
-     *
-     * This method checks if the user is signed in by calling the `isSignedIn()` method of the
-     * [AuthRepository].
+     * Checks if the session ID is valid with the server.
      *
-     * @return True if the user is signed in using a password, false otherwise.
+     * @return True if the session ID is valid, false otherwise.
      */
-    private suspend fun isSignedInThroughPassword(): Boolean {
-        return repository.isSignedInThroughPassword()
+    private suspend fun isSessionIdValid(): Boolean {
+        return repository.isSessionIdValid()
     }
 
     /**
-     * Checks if the user is signed in using passkeys.
-     *
-     * This method checks if the user is signed in through passkeys by calling the
-     * `isSignedInThroughPasskeys()` method of the [AuthRepository].
-     *
-     * @return True if the user is signed in using passkeys, false otherwise.
+     * Signs out the user.
      */
-    private suspend fun isSignedInThroughPasskeys(): Boolean {
-        return repository.isSignedInThroughPasskeys()
+    private fun signOut() {
+        viewModelScope.launch {
+            repository.signOut()
+        }
     }
 }