Support owner param in link handler

code-asher · code-asher · commit c4b8cc8bb67b · 2024-10-04T14:44:23.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@
 
 ## Unreleased
 
+### Added
+
+- Support an "owner" parameter when launching an IDE from the dashboard. This
+  makes it possible to reliably connect to the right workspace in the case where
+  multiple users are using the same workspace name and the workspace filter is
+  configured to show multiple users' workspaces. This requires an updated
+  Gateway module that includes the new "owner" parameter.
+
 ## 2.15.0 - 2024-10-04
 
 ### Added
diff --git a/src/main/kotlin/com/coder/gateway/util/LinkHandler.kt b/src/main/kotlin/com/coder/gateway/util/LinkHandler.kt
@@ -52,10 +52,15 @@ open class LinkHandler(
         // TODO: Show a dropdown and ask for the workspace if missing.
         val workspaceName = parameters.workspace() ?: throw MissingArgumentException("Query parameter \"$WORKSPACE\" is missing")
 
+        // The owner was added to support getting into another user's workspace
+        // but may not exist if the Coder Gateway module is out of date.  If no
+        // owner is included, assume the current user.
+        val owner = (parameters.owner() ?: client.me.username).ifBlank { client.me.username }
+
         val workspaces = client.workspaces()
         val workspace =
             workspaces.firstOrNull {
-                it.name == workspaceName
+                it.ownerName == owner && it.name == workspaceName
             } ?: throw IllegalArgumentException("The workspace $workspaceName does not exist")
 
         when (workspace.latestBuild.status) {
diff --git a/src/main/kotlin/com/coder/gateway/util/LinkMap.kt b/src/main/kotlin/com/coder/gateway/util/LinkMap.kt
@@ -5,6 +5,7 @@ private const val TYPE = "type"
 const val URL = "url"
 const val TOKEN = "token"
 const val WORKSPACE = "workspace"
+const val OWNER = "owner"
 const val AGENT_NAME = "agent"
 const val AGENT_ID = "agent_id"
 private const val FOLDER = "folder"
@@ -24,6 +25,8 @@ fun Map<String, String>.token() = this[TOKEN]
 
 fun Map<String, String>.workspace() = this[WORKSPACE]
 
+fun Map<String, String>.owner() = this[OWNER]
+
 fun Map<String, String?>.agentName() = this[AGENT_NAME]
 
 fun Map<String, String?>.agentID() = this[AGENT_ID]
