fix: rework the exception handler for the connection step

fioan89 · fioan89 · commit 0df8c5930c98 · 2025-08-28T00:40:39.000+03:00
Calling onBack() in the exception handler doesn't make sense because:

- the coroutine is already interrupted by the exception
- onBack() is meant to handle user-initiated back navigation, not error recovery
- we still want the proper navigation logic but without the coroutine cancellation part
diff --git a/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt b/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt
@@ -110,12 +110,12 @@ class ConnectStep(
             } catch (ex: CancellationException) {
                 if (ex.message != USER_HIT_THE_BACK_BUTTON) {
                     notify("Connection to ${CoderCliSetupContext.url!!.host} was configured", ex)
-                    onBack()
+                    handleNavigation()
                     refreshWizard()
                 }
             } catch (ex: Exception) {
                 notify("Failed to configure ${CoderCliSetupContext.url!!.host}", ex)
-                onBack()
+                handleNavigation()
                 refreshWizard()
             }
         }
@@ -126,6 +126,26 @@ class ConnectStep(
         statusField.textState.update { context.i18n.pnotr(msg) }
     }
 
+    /**
+     * Handle navigation logic for both errors and back button
+     */
+    private fun handleNavigation() {
+        if (shouldAutoLogin.value) {
+            CoderCliSetupContext.reset()
+            if (jumpToMainPageOnError) {
+                context.popupPluginMainPage()
+            } else {
+                CoderCliSetupWizardState.goToFirstStep()
+            }
+        } else {
+            if (context.settingsStore.requireTokenAuth) {
+                CoderCliSetupWizardState.goToPreviousStep()
+            } else {
+                CoderCliSetupWizardState.goToFirstStep()
+            }
+        }
+    }
+
     override fun onNext(): Boolean {
         return false
     }
@@ -135,20 +155,7 @@ class ConnectStep(
             context.logger.info("Back button was pressed, cancelling in-progress connection setup...")
             signInJob?.cancel(CancellationException(USER_HIT_THE_BACK_BUTTON))
         } finally {
-            if (shouldAutoLogin.value) {
-                CoderCliSetupContext.reset()
-                if (jumpToMainPageOnError) {
-                    context.popupPluginMainPage()
-                } else {
-                    CoderCliSetupWizardState.goToFirstStep()
-                }
-            } else {
-                if (context.settingsStore.requireTokenAuth) {
-                    CoderCliSetupWizardState.goToPreviousStep()
-                } else {
-                    CoderCliSetupWizardState.goToFirstStep()
-                }
-            }
+            handleNavigation()
         }
     }
 }
