@@ -47,7 +47,7 @@ class ConnectStep(
47
47
context.i18n.pnotr(" " )
48
48
}
49
49
50
- if (CoderCliSetupContext .isNotReadyForAuth()) {
50
+ if (context.settingsStore.requireTokenAuth && CoderCliSetupContext .isNotReadyForAuth()) {
51
51
errorField.textState.update {
52
52
context.i18n.pnotr(" URL and token were not properly configured. Please go back and provide a proper URL and token!" )
53
53
}
@@ -67,7 +67,7 @@ class ConnectStep(
67
67
return
68
68
}
69
69
70
- if (! CoderCliSetupContext .hasToken()) {
70
+ if (context.settingsStore.requireTokenAuth && ! CoderCliSetupContext .hasToken()) {
71
71
errorField.textState.update { context.i18n.ptrl(" Token is required" ) }
72
72
return
73
73
}
@@ -77,7 +77,7 @@ class ConnectStep(
77
77
val client = CoderRestClient (
78
78
context,
79
79
CoderCliSetupContext .url!! ,
80
- CoderCliSetupContext .token!! ,
80
+ if (context.settingsStore.requireTokenAuth) CoderCliSetupContext .token else null ,
81
81
PluginManager .pluginInfo.version,
82
82
)
83
83
// allows interleaving with the back/cancel action
@@ -91,17 +91,17 @@ class ConnectStep(
91
91
statusField.textState.update { (context.i18n.pnotr(progress)) }
92
92
}
93
93
// We only need to log in if we are using token-based auth.
94
- if (client.token != null ) {
94
+ if (context.settingsStore.requireTokenAuth ) {
95
95
statusField.textState.update { (context.i18n.ptrl(" Configuring Coder CLI..." )) }
96
96
// allows interleaving with the back/cancel action
97
97
yield ()
98
- cli.login(client.token)
98
+ cli.login(client.token!! )
99
99
}
100
100
statusField.textState.update { (context.i18n.ptrl(" Successfully configured ${CoderCliSetupContext .url!! .host} ..." )) }
101
101
// allows interleaving with the back/cancel action
102
102
yield ()
103
103
CoderCliSetupContext .reset()
104
- CoderCliSetupWizardState .resetSteps ()
104
+ CoderCliSetupWizardState .goToFirstStep ()
105
105
onConnect(client, cli)
106
106
} catch (ex: CancellationException ) {
107
107
if (ex.message != USER_HIT_THE_BACK_BUTTON ) {
@@ -127,10 +127,14 @@ class ConnectStep(
127
127
} finally {
128
128
if (shouldAutoLogin.value) {
129
129
CoderCliSetupContext .reset()
130
- CoderCliSetupWizardState .resetSteps ()
130
+ CoderCliSetupWizardState .goToFirstStep ()
131
131
context.secrets.rememberMe = false
132
132
} else {
133
- CoderCliSetupWizardState .goToPreviousStep()
133
+ if (context.settingsStore.requireTokenAuth) {
134
+ CoderCliSetupWizardState .goToPreviousStep()
135
+ } else {
136
+ CoderCliSetupWizardState .goToFirstStep()
137
+ }
134
138
}
135
139
}
136
140
}
0 commit comments