More bug fixes (#64)

* Fix Google auth redirect * Improve back navigation for deep links
Ivy-Apps · Dec 5, 2024 · 8603037 · 8603037
1 parent 61f37fb
commit 8603037
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/composeApp/src/commonMain/kotlin/navigation/Navigation.kt b/composeApp/src/commonMain/kotlin/navigation/Navigation.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import ui.screen.NotFoundPage
+import ui.screen.home.HomeScreen
 
 class Navigation(
     private val systemNavigation: SystemNavigation,
@@ -27,6 +28,8 @@ class Navigation(
     }
 
     fun navigateBack() {
-        systemNavigation.navigateBack()
+        if (!systemNavigation.navigateBack()) {
+            navigateTo(HomeScreen())
+        }
     }
 }
diff --git a/composeApp/src/commonMain/kotlin/navigation/SystemNavigation.kt b/composeApp/src/commonMain/kotlin/navigation/SystemNavigation.kt
@@ -10,7 +10,7 @@ interface SystemNavigation {
     val currentRoute: StateFlow<Route>
     fun navigateTo(screen: Screen)
     fun replaceWith(screen: Screen)
-    fun navigateBack()
+    fun navigateBack(): Boolean
 }
 
 @Immutable

diff --git a/composeApp/src/commonMain/kotlin/navigation/redirects/GoogleAuthRedirect.kt b/composeApp/src/commonMain/kotlin/navigation/redirects/GoogleAuthRedirect.kt
@@ -13,6 +13,7 @@ class GoogleAuthRedirect(
     private val platform: Platform,
     private val sessionManager: SessionManager,
     private val analytics: Analytics,
+    private val navigation: Navigation,
 ) : Redirect {
     override val name = "GoogleAuth"
 
@@ -24,6 +25,7 @@ class GoogleAuthRedirect(
                 source = Source.Intro,
                 event = "continue_with_google"
             )
+            navigation.replaceWith(HomeScreen())
             return true
         }
         return false

diff --git a/composeApp/src/jsMain/kotlin/navigation/SystemNavigation.js.kt b/composeApp/src/jsMain/kotlin/navigation/SystemNavigation.js.kt
@@ -44,9 +44,12 @@ class WebSystemNavigation : SystemNavigation {
         return "${route.path}$params"
     }
 
-    override fun navigateBack() {
+    override fun navigateBack(): Boolean {
+        if (window.window.length <= 1) return false
+
         window.history.back() // Let the browser handle back navigation
         // No need to call emitCurrentRoute() here; the listener will handle it
+        return true
     }
 
     private fun emitCurrentRoute() {

diff --git a/server/src/main/kotlin/ivy/learn/api/GoogleAuthenticationApi.kt b/server/src/main/kotlin/ivy/learn/api/GoogleAuthenticationApi.kt
@@ -33,13 +33,15 @@ class GoogleAuthenticationApi(
                 .mapLeft(ServerError::Unknown)
                 .bind()
             val sessionToken = auth.session.token.value
-            val frontEndUrl = if (serverMode.devMode) {
-                IvyUrls.devFrontEnd
+            val frontendAuthRedirectUrl = if (serverMode.devMode) {
+                IvyUrls.devFrontendAuthRedirect
             } else {
-                IvyUrls.frontEnd
+                IvyUrls.frontendAuthRedirect
             }
-            logger.info("User '${auth.user.email}' logged on $frontEndUrl.")
-            call.respondRedirect("${frontEndUrl}?${IvyConstants.PARAM_SESSION_TOKEN}=$sessionToken")
+            logger.info("User '${auth.user.email}' logged on $frontendAuthRedirectUrl.")
+            call.respondRedirect(
+                "${frontendAuthRedirectUrl}?${IvyConstants.PARAM_SESSION_TOKEN}=$sessionToken"
+            )
         }
     }
 

diff --git a/shared/src/commonMain/kotlin/ivy/IvyUrls.kt b/shared/src/commonMain/kotlin/ivy/IvyUrls.kt
@@ -3,6 +3,6 @@ package ivy
 object IvyUrls {
     const val tos = "https://github.com/Ivy-Apps/legal/blob/main/ivy-learn-tos.md"
     const val privacy = "https://github.com/Ivy-Apps/legal/blob/main/ivy-learn-privacy.md"
-    const val frontEnd = "https://ivylearn.app"
-    const val devFrontEnd = "http://localhost:8080/"
+    const val frontendAuthRedirect = "https://ivylearn.app/intro"
+    const val devFrontendAuthRedirect = "http://localhost:8080/intro"
 }