Add more logs around authenticating

code-asher · code-asher · commit fda6c445615d · 2023-03-30T09:12:49.000-08:00
Also rename the function since it loads all workspaces, not just one.
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -353,7 +353,7 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod
                 localWizardModel.token = token
             }
             if (!url.isNullOrBlank() && !token.isNullOrBlank()) {
-                loginAndLoadWorkspace(token, true)
+                loginAndLoadWorkspaces(token, true)
             }
         }
         updateWorkspaceActions()
@@ -451,10 +451,10 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod
         }
         // False so that subsequent authentication failures do not keep opening
         // the browser as it was already opened earlier.
-        loginAndLoadWorkspace(pastedToken, false)
+        loginAndLoadWorkspaces(pastedToken, false)
     }
 
-    private fun loginAndLoadWorkspace(token: String, openBrowser: Boolean) {
+    private fun loginAndLoadWorkspaces(token: String, openBrowser: Boolean) {
         LifetimeDefinition().launchUnderBackgroundProgress(CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.cli.downloader.dialog.title"), canBeCancelled = false, isIndeterminate = true) {
             this.indicator.apply {
                 text = "Authenticating..."
@@ -575,23 +575,28 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod
      * versions do not match.
      */
     private fun authenticate(token: String) {
+        logger.info("Authenticating...")
         coderClient.initClientSession(localWizardModel.coderURL.toURL(), token)
 
+        logger.info("Checking Coder version...")
         if (!CoderSemVer.isValidVersion(coderClient.buildVersion)) {
+            logger.warn("Got invalid version ${coderClient.buildVersion}")
             notificationBanner.apply {
                 component.isVisible = true
                 showWarning(CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.invalid.coder.version", coderClient.buildVersion))
             }
         } else {
             val coderVersion = CoderSemVer.parse(coderClient.buildVersion)
             if (!coderVersion.isInClosedRange(CoderSupportedVersions.minCompatibleCoderVersion, CoderSupportedVersions.maxCompatibleCoderVersion)) {
+                logger.warn("Running with incompatible version ${coderClient.buildVersion}")
                 notificationBanner.apply {
                     component.isVisible = true
                     showWarning(CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.unsupported.coder.version", coderClient.buildVersion))
                 }
             }
         }
 
+        logger.info("Authenticated successfully")
         appPropertiesService.setValue(CODER_URL_KEY, localWizardModel.coderURL)
         appPropertiesService.setValue(SESSION_TOKEN, token)
     }

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod`
`353`	`353`	`localWizardModel.token = token`
`354`	`354`	`}`
`355`	`355`	`if (!url.isNullOrBlank() && !token.isNullOrBlank()) {`
`356`		`- loginAndLoadWorkspace(token, true)`
	`356`	`+ loginAndLoadWorkspaces(token, true)`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`	`updateWorkspaceActions()`
`@@ -451,10 +451,10 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod`
`451`	`451`	`}`
`452`	`452`	`// False so that subsequent authentication failures do not keep opening`
`453`	`453`	`// the browser as it was already opened earlier.`
`454`		`- loginAndLoadWorkspace(pastedToken, false)`
	`454`	`+ loginAndLoadWorkspaces(pastedToken, false)`
`455`	`455`	`}`
`456`	`456`
`457`		`- private fun loginAndLoadWorkspace(token: String, openBrowser: Boolean) {`
	`457`	`+ private fun loginAndLoadWorkspaces(token: String, openBrowser: Boolean) {`
`458`	`458`	`LifetimeDefinition().launchUnderBackgroundProgress(CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.cli.downloader.dialog.title"), canBeCancelled = false, isIndeterminate = true) {`
`459`	`459`	`this.indicator.apply {`
`460`	`460`	`text = "Authenticating..."`
`@@ -575,23 +575,28 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod`
`575`	`575`	`* versions do not match.`
`576`	`576`	`*/`
`577`	`577`	`private fun authenticate(token: String) {`
	`578`	`+ logger.info("Authenticating...")`
`578`	`579`	`coderClient.initClientSession(localWizardModel.coderURL.toURL(), token)`
`579`	`580`
	`581`	`+ logger.info("Checking Coder version...")`
`580`	`582`	`if (!CoderSemVer.isValidVersion(coderClient.buildVersion)) {`
	`583`	`+ logger.warn("Got invalid version ${coderClient.buildVersion}")`
`581`	`584`	`notificationBanner.apply {`
`582`	`585`	`component.isVisible = true`
`583`	`586`	`showWarning(CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.invalid.coder.version", coderClient.buildVersion))`
`584`	`587`	`}`
`585`	`588`	`} else {`
`586`	`589`	`val coderVersion = CoderSemVer.parse(coderClient.buildVersion)`
`587`	`590`	`if (!coderVersion.isInClosedRange(CoderSupportedVersions.minCompatibleCoderVersion, CoderSupportedVersions.maxCompatibleCoderVersion)) {`
	`591`	`+ logger.warn("Running with incompatible version ${coderClient.buildVersion}")`
`588`	`592`	`notificationBanner.apply {`
`589`	`593`	`component.isVisible = true`
`590`	`594`	`showWarning(CoderGatewayBundle.message("gateway.connector.view.coder.workspaces.unsupported.coder.version", coderClient.buildVersion))`
`591`	`595`	`}`
`592`	`596`	`}`
`593`	`597`	`}`
`594`	`598`
	`599`	`+ logger.info("Authenticated successfully")`
`595`	`600`	`appPropertiesService.setValue(CODER_URL_KEY, localWizardModel.coderURL)`
`596`	`601`	`appPropertiesService.setValue(SESSION_TOKEN, token)`
`597`	`602`	`}`