@@ -47,7 +47,7 @@ class ConnectStep(
4747 context.i18n.pnotr(" " )
4848 }
4949
50- if (CoderCliSetupContext .isNotReadyForAuth()) {
50+ if (context.settingsStore.requireTokenAuth && CoderCliSetupContext .isNotReadyForAuth()) {
5151 errorField.textState.update {
5252 context.i18n.pnotr(" URL and token were not properly configured. Please go back and provide a proper URL and token!" )
5353 }
@@ -67,7 +67,7 @@ class ConnectStep(
6767 return
6868 }
6969
70- if (! CoderCliSetupContext .hasToken()) {
70+ if (context.settingsStore.requireTokenAuth && ! CoderCliSetupContext .hasToken()) {
7171 errorField.textState.update { context.i18n.ptrl(" Token is required" ) }
7272 return
7373 }
@@ -77,7 +77,7 @@ class ConnectStep(
7777 val client = CoderRestClient (
7878 context,
7979 CoderCliSetupContext .url!! ,
80- CoderCliSetupContext .token!! ,
80+ if (context.settingsStore.requireTokenAuth) CoderCliSetupContext .token else null ,
8181 PluginManager .pluginInfo.version,
8282 )
8383 // allows interleaving with the back/cancel action
@@ -91,17 +91,17 @@ class ConnectStep(
9191 statusField.textState.update { (context.i18n.pnotr(progress)) }
9292 }
9393 // We only need to log in if we are using token-based auth.
94- if (client.token != null ) {
94+ if (context.settingsStore.requireTokenAuth ) {
9595 statusField.textState.update { (context.i18n.ptrl(" Configuring Coder CLI..." )) }
9696 // allows interleaving with the back/cancel action
9797 yield ()
98- cli.login(client.token)
98+ cli.login(client.token!! )
9999 }
100100 statusField.textState.update { (context.i18n.ptrl(" Successfully configured ${CoderCliSetupContext .url!! .host} ..." )) }
101101 // allows interleaving with the back/cancel action
102102 yield ()
103103 CoderCliSetupContext .reset()
104- CoderCliSetupWizardState .resetSteps ()
104+ CoderCliSetupWizardState .goToFirstStep ()
105105 onConnect(client, cli)
106106 } catch (ex: CancellationException ) {
107107 if (ex.message != USER_HIT_THE_BACK_BUTTON ) {
@@ -127,10 +127,14 @@ class ConnectStep(
127127 } finally {
128128 if (shouldAutoLogin.value) {
129129 CoderCliSetupContext .reset()
130- CoderCliSetupWizardState .resetSteps ()
130+ CoderCliSetupWizardState .goToFirstStep ()
131131 context.secrets.rememberMe = false
132132 } else {
133- CoderCliSetupWizardState .goToPreviousStep()
133+ if (context.settingsStore.requireTokenAuth) {
134+ CoderCliSetupWizardState .goToPreviousStep()
135+ } else {
136+ CoderCliSetupWizardState .goToFirstStep()
137+ }
134138 }
135139 }
136140 }
0 commit comments