Avoid comparing URLs

code-asher · code-asher · commit f875d9138dc2 · 2024-03-18T14:40:37.000-08:00
diff --git a/src/main/kotlin/com/coder/gateway/CoderRemoteConnectionHandle.kt b/src/main/kotlin/com/coder/gateway/CoderRemoteConnectionHandle.kt
@@ -206,7 +206,7 @@ class CoderRemoteConnectionHandle {
                     BrowserUtil.browse(getTokenUrl)
                 } else {
                     val (u, t) = settings.readConfig(settings.coderConfigDir)
-                    if (url == u?.toURL() && !t.isNullOrBlank() && t != existingToken) {
+                    if (url.toString() == u && !t.isNullOrBlank() && t != existingToken) {
                         logger.info("Injecting token for $url from CLI config")
                         return Pair(t, TokenSource.CONFIG)
                     }
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -462,7 +462,7 @@ class CoderWorkspacesStepView : CoderWizardStep<CoderWorkspacesStepSelection>(
             newURL,
             // If this is a new URL there is no point in trying to use the same
             // token.
-            if (oldURL == newURL) fields.token else null,
+            if (oldURL.toString() == newURL.toString()) fields.token else null,
             isRetry,
             fields.useExistingToken,
             settings,

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ class CoderRemoteConnectionHandle {`
`206`	`206`	`BrowserUtil.browse(getTokenUrl)`
`207`	`207`	`} else {`
`208`	`208`	`val (u, t) = settings.readConfig(settings.coderConfigDir)`
`209`		`- if (url == u?.toURL() && !t.isNullOrBlank() && t != existingToken) {`
	`209`	`+ if (url.toString() == u && !t.isNullOrBlank() && t != existingToken) {`
`210`	`210`	`logger.info("Injecting token for $url from CLI config")`
`211`	`211`	`return Pair(t, TokenSource.CONFIG)`
`212`	`212`	`}`