refactor: remove unused code

fioan89 · fioan89 · commit 2672f74c2003 · 2025-04-08T20:55:40.000+03:00
- close page property is no longer needed by the wizard steps
- getToken was moved into the context
diff --git a/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt b/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt
@@ -41,7 +41,6 @@ class ConnectStep(
     )
 
     override val nextButtonTitle: LocalizableString? = null
-    override val closesWizard: Boolean = false
 
     override fun onVisible() {
         val url = context.deploymentUrl?.first?.toURL()
diff --git a/src/main/kotlin/com/coder/toolbox/views/SignInStep.kt b/src/main/kotlin/com/coder/toolbox/views/SignInStep.kt
@@ -29,8 +29,6 @@ class SignInStep(private val context: CoderToolboxContext) : WizardStep {
 
     override val nextButtonTitle: LocalizableString? = context.i18n.ptrl("Sign In")
 
-    override val closesWizard: Boolean = false
-
     override fun onVisible() {
         urlField.textState.update {
             context.deploymentUrl?.first ?: ""
diff --git a/src/main/kotlin/com/coder/toolbox/views/TokenStep.kt b/src/main/kotlin/com/coder/toolbox/views/TokenStep.kt
@@ -1,7 +1,6 @@
 package com.coder.toolbox.views
 
 import com.coder.toolbox.CoderToolboxContext
-import com.coder.toolbox.settings.SettingSource
 import com.coder.toolbox.util.toURL
 import com.coder.toolbox.util.withPath
 import com.coder.toolbox.views.state.AuthWizardState
@@ -34,15 +33,14 @@ class TokenStep(private val context: CoderToolboxContext) : WizardStep {
         RowGroup.RowField(errorField)
     )
     override val nextButtonTitle: LocalizableString? = context.i18n.ptrl("Connect")
-    override val closesWizard: Boolean = false
 
     override fun onVisible() {
         tokenField.textState.update {
-            getToken(context.deploymentUrl?.first)?.first ?: ""
+            context.getToken(context.deploymentUrl?.first)?.first ?: ""
         }
         descriptionField.textState.update {
             context.i18n.pnotr(
-                getToken(context.deploymentUrl?.first)?.second?.description("token")
+                context.getToken(context.deploymentUrl?.first)?.second?.description("token")
                     ?: "No existing token for ${context.deploymentUrl} found."
             )
         }
@@ -66,23 +64,4 @@ class TokenStep(private val context: CoderToolboxContext) : WizardStep {
     override fun onBack() {
         AuthWizardState.goToPreviousStep()
     }
-
-    /**
-     * Try to find a token.
-     *
-     * Order of preference:
-     *
-     * 1. Last used token, if it was for this deployment.
-     * 2. Token on disk for this deployment.
-     * 3. Global token for Coder, if it matches the deployment.
-     */
-    private fun getToken(deploymentURL: String?): Pair<String, SettingSource>? = context.secrets.lastToken.let {
-        if (it.isNotBlank() && context.secrets.lastDeploymentURL == deploymentURL) {
-            it to SettingSource.LAST_USED
-        } else {
-            if (deploymentURL != null) {
-                context.settingsStore.token(deploymentURL.toURL())
-            } else null
-        }
-    }
 }
diff --git a/src/main/kotlin/com/coder/toolbox/views/WizardStep.kt b/src/main/kotlin/com/coder/toolbox/views/WizardStep.kt
@@ -6,7 +6,6 @@ import com.jetbrains.toolbox.api.ui.components.RowGroup
 interface WizardStep {
     val panel: RowGroup
     val nextButtonTitle: LocalizableString?
-    val closesWizard: Boolean
 
     /**
      * Callback when step is visible

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ class ConnectStep(`
`41`	`41`	`)`
`42`	`42`
`43`	`43`	`override val nextButtonTitle: LocalizableString? = null`
`44`		`- override val closesWizard: Boolean = false`
`45`	`44`
`46`	`45`	`override fun onVisible() {`
`47`	`46`	`val url = context.deploymentUrl?.first?.toURL()`