fix: transform to url only after we checked the validation result

fioan89 · fioan89 · commit 8623572270fe · 2025-07-25T18:28:36.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@
 
 - support for checking if CLI is signed
 - improved progress reporting while downloading the CLI
-- URL validation is stricter in the connection screen
+- URL validation is stricter in the connection screen and URI protocol handler
 
 ## 2.21.1 - 2025-06-26
 
diff --git a/src/main/kotlin/com/coder/gateway/util/URLExtensions.kt b/src/main/kotlin/com/coder/gateway/util/URLExtensions.kt
@@ -15,7 +15,6 @@ fun URL.withPath(path: String): URL = URL(
     if (path.startsWith("/")) path else "/$path",
 )
 
-
 fun String.validateStrictWebUrl(): WebUrlValidationResult = try {
     val uri = URI(this)
 
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -567,7 +567,6 @@ class CoderWorkspacesStepView :
         component.apply() // Force bindings to be filled.
         if (settings.requireTokenAuth) {
             val result = fields.coderURL.validateStrictWebUrl()
-            val newURL = fields.coderURL.toURL()
             if (result is WebUrlValidationResult.Invalid) {
                 tfUrlComment.apply {
                     this?.foreground = UIUtil.getErrorForeground()
@@ -576,6 +575,7 @@ class CoderWorkspacesStepView :
                 }
                 return
             }
+            val newURL = fields.coderURL.toURL()
             val pastedToken =
                 dialogUi.askToken(
                     newURL,

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ fun URL.withPath(path: String): URL = URL(`
`15`	`15`	`if (path.startsWith("/")) path else "/$path",`
`16`	`16`	`)`
`17`	`17`
`18`		`-`
`19`	`18`	`fun String.validateStrictWebUrl(): WebUrlValidationResult = try {`
`20`	`19`	`val uri = URI(this)`
`21`	`20`