Skip to content

Commit 9e21ce9

Browse files
fioan89fioan89
committed
Impl: merge auth step with workspaces step
- simplifies the flows - allows users to quickly change the hostname - provides information about who provided the workspaces
1 parent 76f855a commit 9e21ce9

File tree

5 files changed

+150
-32
lines changed

5 files changed

+150
-32
lines changed

‎CHANGELOG.md‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,39 @@
11
<!-- Keep a Changelog guide -> https://keepachangelog.com -->
22

3-
# coder-gateway Changelog
4-
5-
## [Unreleased]
6-
7-
## [2.0.1]
3+
# coder-gateway Changelog
4+
5+
## [Unreleased]
6+
7+
### Changed
8+
9+
- the authentication view is now merged with the "Coder Workspaces" view allowing users to quickly change the host
10+
11+
## [2.0.1]
12+
813
### Fixed
14+
915
- `Recent Coder Workspaces` label overlaps with the search bar in the `Connections` view
1016
- working workspaces are now listed when there are issues with resolving agents
1117
- list only workspaces owned by the logged user
12-
13-
18+
1419
### Changed
20+
1521
- links to documentation now point to the latest Coder OSS
1622
- simplified main action link text from `Connect to Coder Workspaces` to `Connect to Coder`
17-
- minimum supported Gateway build is now 222.3739.24
18-
19-
## [2.0.0]
20-
### Added
23+
- minimum supported Gateway build is now 222.3739.24
24+
25+
## [2.0.0]
26+
### Added
2127
- support for Gateway 2022.2
2228

2329

24-
25-
### Changed
30+
31+
### Changed
2632
- Java 17 is now required to run the plugin
27-
- adapted the code to the new SSH API provided by Gateway
28-
29-
## [1.0.0]
30-
### Added
33+
- adapted the code to the new SSH API provided by Gateway
34+
35+
## [1.0.0]
36+
### Added
3137
- initial scaffold for Gateway plugin
3238
- browser based authentication on Coder environments
3339
- REST client for Coder V2 public API

‎src/main/kotlin/com/coder/gateway/views/CoderGatewayConnectorWizardView.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.coder.gateway.views
22

33
import com.coder.gateway.models.CoderWorkspacesWizardModel
4-
import com.coder.gateway.views.steps.CoderAuthStepView
54
import com.coder.gateway.views.steps.CoderLocateRemoteProjectStepView
65
import com.coder.gateway.views.steps.CoderWorkspacesStepView
76
import com.coder.gateway.views.steps.CoderWorkspacesWizardStep
@@ -29,7 +28,6 @@ class CoderGatewayConnectorWizardView(private val recentWorkspacesReset: () -> U
2928
private fun setupWizard() {
3029
background = WelcomeScreenUIManager.getMainAssociatedComponentBackground()
3130

32-
registerStep(CoderAuthStepView { next() })
3331
registerStep(CoderWorkspacesStepView())
3432
registerStep(CoderLocateRemoteProjectStepView {
3533
nextButton.isVisible = false

‎src/main/kotlin/com/coder/gateway/views/steps/CoderAuthStepView.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class CoderAuthStepView(private val nextAction: () -> Unit) : CoderWorkspacesWiz
5454
}
5555
}.topGap(TopGap.SMALL).bottomGap(BottomGap.MEDIUM)
5656
row {
57-
cell(ComponentPanelBuilder.createCommentComponent(CoderGatewayBundle.message("gateway.connector.view.login.comment.text"), false, -1, true))
57+
cell(ComponentPanelBuilder.createCommentComponent(CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.comment"), false, -1, true))
5858
}
5959
row {
6060
browserLink(CoderGatewayBundle.message("gateway.connector.view.login.documentation.action"), "https://coder.com/docs/coder-oss/latest/workspaces")
@@ -72,7 +72,7 @@ class CoderAuthStepView(private val nextAction: () -> Unit) : CoderWorkspacesWiz
7272
background = WelcomeScreenUIManager.getMainAssociatedComponentBackground()
7373
}
7474

75-
override val nextActionText = CoderGatewayBundle.message("gateway.connector.view.coder.auth.next.text")
75+
override val nextActionText = CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.connect.text")
7676
override val previousActionText = IdeBundle.message("button.back")
7777

7878
override fun onInit(wizardModel: CoderWorkspacesWizardModel) {
@@ -99,7 +99,7 @@ class CoderAuthStepView(private val nextAction: () -> Unit) : CoderWorkspacesWiz
9999
model.token = pastedToken
100100
model.buildVersion = coderClient.buildVersion
101101

102-
val authTask = object : Task.Modal(null, CoderGatewayBundle.message("gateway.connector.view.login.cli.downloader.dialog.title"), false) {
102+
val authTask = object : Task.Modal(null, CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.cli.downloader.dialog.title"), false) {
103103
override fun run(pi: ProgressIndicator) {
104104

105105
pi.apply {

‎src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt‎

Lines changed: 120 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,35 @@ import com.coder.gateway.icons.CoderIcons
55
import com.coder.gateway.models.CoderWorkspacesWizardModel
66
import com.coder.gateway.models.WorkspaceAgentModel
77
import com.coder.gateway.sdk.Arch
8+
import com.coder.gateway.sdk.CoderCLIManager
89
import com.coder.gateway.sdk.CoderRestClientService
910
import com.coder.gateway.sdk.OS
11+
import com.coder.gateway.sdk.ex.AuthenticationResponseException
12+
import com.coder.gateway.sdk.getOS
13+
import com.coder.gateway.sdk.toURL
1014
import com.coder.gateway.sdk.v2.models.ProvisionerJobStatus
1115
import com.coder.gateway.sdk.v2.models.Workspace
1216
import com.coder.gateway.sdk.v2.models.WorkspaceBuildTransition
17+
import com.coder.gateway.sdk.withPath
18+
import com.intellij.ide.BrowserUtil
1319
import com.intellij.ide.IdeBundle
1420
import com.intellij.openapi.Disposable
1521
import com.intellij.openapi.application.ApplicationManager
22+
import com.intellij.openapi.application.ModalityState
23+
import com.intellij.openapi.application.invokeAndWaitIfNeeded
1624
import com.intellij.openapi.diagnostic.Logger
25+
import com.intellij.openapi.progress.ProgressIndicator
26+
import com.intellij.openapi.progress.ProgressManager
27+
import com.intellij.openapi.progress.Task
28+
import com.intellij.openapi.ui.panel.ComponentPanelBuilder
1729
import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeScreenUIManager
30+
import com.intellij.ui.AppIcon
31+
import com.intellij.ui.components.JBTextField
32+
import com.intellij.ui.components.dialog
1833
import com.intellij.ui.dsl.builder.BottomGap
34+
import com.intellij.ui.dsl.builder.RightGap
1935
import com.intellij.ui.dsl.builder.TopGap
36+
import com.intellij.ui.dsl.builder.bindText
2037
import com.intellij.ui.dsl.builder.panel
2138
import com.intellij.ui.dsl.gridLayout.HorizontalAlign
2239
import com.intellij.ui.dsl.gridLayout.VerticalAlign
@@ -31,6 +48,7 @@ import kotlinx.coroutines.Dispatchers
3148
import kotlinx.coroutines.cancel
3249
import kotlinx.coroutines.launch
3350
import kotlinx.coroutines.withContext
51+
import org.zeroturnaround.exec.ProcessExecutor
3452
import java.awt.Color
3553
import java.awt.Component
3654
import java.awt.Dimension
@@ -43,10 +61,9 @@ import javax.swing.table.TableCellRenderer
4361

4462
class CoderWorkspacesStepView : CoderWorkspacesWizardStep, Disposable {
4563
private val cs = CoroutineScope(Dispatchers.Main)
46-
64+
private var wizardModel = CoderWorkspacesWizardModel()
4765
private val coderClient: CoderRestClientService = ApplicationManager.getApplication().getService(CoderRestClientService::class.java)
4866

49-
5067
private var listTableModelOfWorkspaces = ListTableModel<WorkspaceAgentModel>(WorkspaceIconColumnInfo(""), WorkspaceNameColumnInfo("Name"), WorkspaceTemplateNameColumnInfo("Template"), WorkspaceStatusColumnInfo("Status"))
5168
private var tableOfWorkspaces = TableView(listTableModelOfWorkspaces).apply {
5269
rowSelectionAllowed = true
@@ -62,16 +79,31 @@ class CoderWorkspacesStepView : CoderWorkspacesWizardStep, Disposable {
6279
setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
6380
}
6481

65-
private lateinit var wizard: CoderWorkspacesWizardModel
66-
6782
override val component = panel {
6883
indent {
6984
row {
70-
label(CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.choose.text")).applyToComponent {
85+
label(CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.header.text")).applyToComponent {
7186
font = JBFont.h3().asBold()
7287
icon = CoderIcons.LOGO_16
7388
}
89+
}.topGap(TopGap.SMALL).bottomGap(BottomGap.MEDIUM)
90+
row {
91+
cell(ComponentPanelBuilder.createCommentComponent(CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.comment"), false, -1, true))
92+
}
93+
row {
94+
browserLink(CoderGatewayBundle.message("gateway.connector.view.login.documentation.action"), "https://coder.com/docs/coder-oss/latest/workspaces")
7495
}.bottomGap(BottomGap.MEDIUM)
96+
row(CoderGatewayBundle.message("gateway.connector.view.login.url.label")) {
97+
textField().resizableColumn().horizontalAlign(HorizontalAlign.FILL).gap(RightGap.SMALL).bindText(wizardModel::coderURL).applyToComponent {
98+
addActionListener {
99+
loginAndLoadWorkspace()
100+
}
101+
}
102+
button(CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.connect.text")) {
103+
loginAndLoadWorkspace()
104+
}
105+
cell()
106+
}
75107
row {
76108
scrollCell(tableOfWorkspaces).resizableColumn().horizontalAlign(HorizontalAlign.FILL).verticalAlign(VerticalAlign.FILL)
77109
cell()
@@ -84,7 +116,89 @@ class CoderWorkspacesStepView : CoderWorkspacesWizardStep, Disposable {
84116
override val nextActionText = CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.next.text")
85117

86118
override fun onInit(wizardModel: CoderWorkspacesWizardModel) {
87-
wizard = wizardModel
119+
}
120+
121+
private fun loginAndLoadWorkspace() {
122+
// force bindings to be filled
123+
component.apply()
124+
125+
BrowserUtil.browse(wizardModel.coderURL.toURL().withPath("/login?redirect=%2Fcli-auth"))
126+
val pastedToken = askToken()
127+
128+
if (pastedToken.isNullOrBlank()) {
129+
return
130+
}
131+
try {
132+
coderClient.initClientSession(wizardModel.coderURL.toURL(), pastedToken)
133+
} catch (e: AuthenticationResponseException) {
134+
CoderAuthStepView.logger.error("Could not authenticate on ${wizardModel.coderURL}. Reason $e")
135+
return
136+
}
137+
wizardModel.apply {
138+
token = pastedToken
139+
buildVersion = coderClient.buildVersion
140+
}
141+
142+
val authTask = object : Task.Modal(null, CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.cli.downloader.dialog.title"), false) {
143+
override fun run(pi: ProgressIndicator) {
144+
145+
pi.apply {
146+
isIndeterminate = false
147+
text = "Downloading coder cli..."
148+
fraction = 0.1
149+
}
150+
151+
val cliManager = CoderCLIManager(wizardModel.coderURL.toURL(), wizardModel.buildVersion)
152+
val cli = cliManager.download() ?: throw IllegalStateException("Could not download coder binary")
153+
if (getOS() != OS.WINDOWS) {
154+
pi.fraction = 0.4
155+
val chmodOutput = ProcessExecutor().command("chmod", "+x", cli.toAbsolutePath().toString()).readOutput(true).execute().outputUTF8()
156+
CoderAuthStepView.logger.info("chmod +x ${cli.toAbsolutePath()} $chmodOutput")
157+
}
158+
pi.apply {
159+
text = "Configuring coder cli..."
160+
fraction = 0.5
161+
}
162+
163+
val loginOutput = ProcessExecutor().command(cli.toAbsolutePath().toString(), "login", wizardModel.coderURL, "--token", wizardModel.token).readOutput(true).execute().outputUTF8()
164+
CoderAuthStepView.logger.info("coder-cli login output: $loginOutput")
165+
pi.fraction = 0.8
166+
val sshConfigOutput = ProcessExecutor().command(cli.toAbsolutePath().toString(), "config-ssh", "--yes", "--use-previous-options").readOutput(true).execute().outputUTF8()
167+
CoderAuthStepView.logger.info("Result of `${cli.toAbsolutePath()} config-ssh --yes --use-previous-options`: $sshConfigOutput")
168+
pi.fraction = 1.0
169+
}
170+
}
171+
172+
wizardModel.apply {
173+
coderURL = wizardModel.coderURL
174+
token = wizardModel.token
175+
}
176+
ProgressManager.getInstance().run(authTask)
177+
loadWorkspaces()
178+
}
179+
180+
private fun askToken(): String? {
181+
return invokeAndWaitIfNeeded(ModalityState.any()) {
182+
lateinit var sessionTokenTextField: JBTextField
183+
184+
val panel = panel {
185+
row {
186+
label(CoderGatewayBundle.message("gateway.connector.view.login.token.label"))
187+
sessionTokenTextField = textField().applyToComponent {
188+
minimumSize = Dimension(320, -1)
189+
}.component
190+
}
191+
}
192+
193+
AppIcon.getInstance().requestAttention(null, true)
194+
if (!dialog(CoderGatewayBundle.message("gateway.connector.view.login.token.dialog"), panel = panel, focusedComponent = sessionTokenTextField).showAndGet()) {
195+
return@invokeAndWaitIfNeeded null
196+
}
197+
return@invokeAndWaitIfNeeded sessionTokenTextField.text
198+
}
199+
}
200+
201+
private fun loadWorkspaces() {
88202
cs.launch {
89203
val workspaceList = withContext(Dispatchers.IO) {
90204
try {

‎src/main/resources/messages/CoderGatewayBundle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ gateway.connector.title=Coder
22
gateway.connector.description=Connects to a Coder Workspace dev environment so that you can develop from anywhere
33
gateway.connector.action.text=Connect to Coder
44
gateway.connector.view.login.header.text=Coder Workspaces
5-
gateway.connector.view.login.comment.text=Self-hosted developer workspaces in the cloud or on premise. Coder Workspaces empower developers with secure, consistent, and fast developer workspaces.
65
gateway.connector.view.login.documentation.action=Explore Coder Workspaces
76
gateway.connector.view.login.url.label=Url:
87
gateway.connector.view.login.token.dialog=Paste your token here:
98
gateway.connector.view.login.token.label=Session Token:
10-
gateway.connector.view.coder.auth.next.text=Connect
11-
gateway.connector.view.login.cli.downloader.dialog.title=Authenticate and setup coder
9+
gateway.connector.view.coder.workspaces.header.text=Coder Workspaces
10+
gateway.connector.view.coder.workspaces.comment=Self-hosted developer workspaces in the cloud or on premise. Coder Workspaces empower developers with secure, consistent, and fast developer workspaces.
11+
gateway.connector.view.coder.workspaces.connect.text=Connect
12+
gateway.connector.view.coder.workspaces.cli.downloader.dialog.title=Authenticate and setup coder
1213
gateway.connector.view.coder.workspaces.next.text=Select IDE and Project
13-
gateway.connector.view.coder.workspaces.choose.text=Choose a workspace
1414
gateway.connector.view.coder.remoteproject.loading.text=Retrieving products...
1515
gateway.connector.view.coder.remoteproject.ide.error.text=Could not retrieve any IDE for workspace {0} because an error was encountered
1616
gateway.connector.view.coder.remoteproject.next.text=Download and Start IDE

0 commit comments

Comments
 (0)