chore: separate autologin concerns

ConnectStep should not care if it was it is the first screen
in the login process (auto login) or not. Instead, the wizard
page should orchestrate the behavior of the back button depending
on whether it is auto login or not

Author: fioan89

src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt

@@ -379,7 +379,6 @@ class CoderRemoteProvider(
                     context, settingsPage, visibilityState,
                     url = newUrl,
                     credentials = credentials,
-                    jumpToMainPageOnError = true,
                     onConnect = onConnect.andThen(deferredLinkHandler(params, newUrl))
                         .andThen { _, _ ->
                             coderHeaderPage.isBusy.update { false }
@@ -642,4 +641,4 @@ class CoderRemoteProvider(
             LoadableState.Loading
         }
     }
-}
+}

src/main/kotlin/com/coder/toolbox/views/CoderSetupWizardPage.kt

@@ -21,14 +21,11 @@ class CoderSetupWizardPage private constructor(
     private val context: CoderToolboxContext,
     private val settingsPage: CoderSettingsPage,
     visibilityState: StateFlow<ProviderVisibilityState>,
-    initialAutoSetup: Boolean = false,
-    jumpToMainPageOnError: Boolean = false,
+    private var autoLogin: Boolean = false,
     onConnect: SuspendBiConsumer<CoderRestClient, CoderCLIManager>,
     onTokenRefreshed: (suspend (url: URL, oauthSessionCtx: CoderOAuthSessionContext) -> Unit)? = null
 ) : CoderPage(MutableStateFlow(context.i18n.ptrl("Setting up Coder")), false) {
     val model: WizardModel = WizardModel()
-
-    private val shouldAutoSetup = MutableStateFlow(initialAutoSetup)
     private val settingsAction = Action(context, "Settings") {
         context.ui.showUiPage(settingsPage)
     }
@@ -38,10 +35,8 @@ class CoderSetupWizardPage private constructor(
     private val connectStep = ConnectStep(
         context,
         model,
-        shouldAutoLogin = shouldAutoSetup,
-        jumpToMainPageOnError = jumpToMainPageOnError,
         visibilityState,
-        refreshWizard = this::displaySteps,
+        navigateBack = this::navigateBackFromConnect,
         onConnect = onConnect,
         onTokenRefreshed = onTokenRefreshed
     )
@@ -114,9 +109,6 @@ class CoderSetupWizardPage private constructor(
                         settingsAction,
                         Action(context, "Back", closesPage = false, actionBlock = {
                             connectStep.onBack()
-                            shouldAutoSetup.update {
-                                false
-                            }
                             displaySteps()
                         })
                     )
@@ -131,6 +123,20 @@ class CoderSetupWizardPage private constructor(
         model.goTo(WizardStep.CONNECT)
     }
 
+    private fun navigateBackFromConnect() {
+        if (autoLogin) {
+            autoLogin = false
+            model.clearFormData()
+            model.goToFirst()
+            return
+        }
+        if (context.settingsStore.requiresTokenAuth) {
+            model.goToPrevious()
+        } else {
+            model.goToFirst()
+        }
+    }
+
     /**
      * Cancels any in-flight work owned by this wizard. Called by the page router
      * when the wizard is being replaced (e.g. by a deep link to a different
@@ -170,14 +176,11 @@ class CoderSetupWizardPage private constructor(
             visibilityState: StateFlow<ProviderVisibilityState>,
             url: URL,
             credentials: Credentials,
-            initialAutoSetup: Boolean = true,
-            jumpToMainPageOnError: Boolean = false,
             onConnect: SuspendBiConsumer<CoderRestClient, CoderCLIManager>,
             onTokenRefreshed: (suspend (url: URL, oauthSessionCtx: CoderOAuthSessionContext) -> Unit)? = null,
         ): CoderSetupWizardPage = CoderSetupWizardPage(
             context, settingsPage, visibilityState,
-            initialAutoSetup = initialAutoSetup,
-            jumpToMainPageOnError = jumpToMainPageOnError,
+            autoLogin = true,
             onConnect = onConnect,
             onTokenRefreshed = onTokenRefreshed,
         ).apply {

src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt

@@ -30,10 +30,8 @@ private const val USER_HIT_THE_BACK_BUTTON = "User hit the back button"
 class ConnectStep(
     private val context: CoderToolboxContext,
     private val model: WizardModel,
-    private val shouldAutoLogin: StateFlow<Boolean>,
-    private val jumpToMainPageOnError: Boolean,
     visibilityState: StateFlow<ProviderVisibilityState>,
-    private val refreshWizard: () -> Unit,
+    private val navigateBack: () -> Unit,
     private val onConnect: SuspendBiConsumer<CoderRestClient, CoderCLIManager>,
     private val onTokenRefreshed: (suspend (url: URL, oauthSessionCtx: CoderOAuthSessionContext) -> Unit)? = null
 ) : WizardStep {
@@ -63,7 +61,7 @@ class ConnectStep(
 
         // Don't launch another connection attempt if one is already in progress.
         if (signInJob?.isActive == true) {
-            context.logger.info(">> ConnectStep: connection already in progress, skipping duplicate")
+            context.logger.info("Connection already in progress, skipping duplicate")
             return
         }
 
@@ -145,16 +143,11 @@ class ConnectStep(
                 // The provider's onConnect ran close() which clears the router; combined
                 // with client now being non-null this drops the wizard from getOverrideUiPage.
                 context.envPageManager.showPluginEnvironmentsPage()
-            } catch (ex: CancellationException) {
+            } catch (ex: Exception) {
                 if (ex.message != USER_HIT_THE_BACK_BUTTON) {
-                    errorReporter.report("Connection to $hostName was configured", ex)
-                    handleNavigation()
-                    refreshWizard()
+                    errorReporter.report("Failed to configure $hostName", ex)
                 }
-            } catch (ex: Exception) {
-                errorReporter.report("Failed to configure $hostName", ex)
-                handleNavigation()
-                refreshWizard()
+                navigateBack()
             }
         }
 
@@ -176,26 +169,6 @@ class ConnectStep(
         statusField.textState.update { context.i18n.pnotr(msg) }
     }
 
-    /**
-     * Handle navigation logic for both errors and back button
-     */
-    private fun handleNavigation() {
-        if (shouldAutoLogin.value) {
-            model.clearFormData()
-            if (jumpToMainPageOnError) {
-                context.popupPluginMainPage()
-            } else {
-                model.goToFirst()
-            }
-        } else {
-            if (context.settingsStore.requiresTokenAuth) {
-                model.goToPrevious()
-            } else {
-                model.goToFirst()
-            }
-        }
-    }
-
     override suspend fun onNext(): Boolean {
         return false
     }
@@ -205,7 +178,7 @@ class ConnectStep(
             context.logger.info("Back button was pressed, cancelling in-progress connection setup...")
             signInJob?.cancel(CancellationException(USER_HIT_THE_BACK_BUTTON))
         } finally {
-            handleNavigation()
+            navigateBack()
         }
     }