Commitc4b8cc8

committed

Support owner param in link handler

1 parenteed4676 commitc4b8cc8Copy full SHA for c4b8cc8

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,14 @@`
`4`	`4`
`5`	`5`	`##Unreleased`
`6`	`6`
	`7`	`+###Added`
	`8`	`+`
	`9`	`+- Support an "owner" parameter when launching an IDE from the dashboard. This`
	`10`	`+ makes it possible to reliably connect to the right workspace in the case where`
	`11`	`+ multiple users are using the same workspace name and the workspace filter is`
	`12`	`+ configured to show multiple users' workspaces. This requires an updated`
	`13`	`+ Gateway module that includes the new "owner" parameter.`
	`14`	`+`
`7`	`15`	`##2.15.0 - 2024-10-04`
`8`	`16`
`9`	`17`	`###Added`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,15 @@ open class LinkHandler(`
`52`	`52`	`// TODO: Show a dropdown and ask for the workspace if missing.`
`53`	`53`	`val workspaceName= parameters.workspace()?:throwMissingArgumentException("Query parameter\"$WORKSPACE\" is missing")`
`54`	`54`
	`55`	`+// The owner was added to support getting into another user's workspace`
	`56`	`+// but may not exist if the Coder Gateway module is out of date. If no`
	`57`	`+// owner is included, assume the current user.`
	`58`	`+val owner= (parameters.owner()?: client.me.username).ifBlank { client.me.username }`
	`59`	`+`
`55`	`60`	`val workspaces= client.workspaces()`
`56`	`61`	`val workspace=`
`57`	`62`	`workspaces.firstOrNull {`
`58`		`- it.name== workspaceName`
	`63`	`+ it.ownerName== owner&& it.name== workspaceName`
`59`	`64`	`}?:throwIllegalArgumentException("The workspace$workspaceName does not exist")`
`60`	`65`
`61`	`66`	`when (workspace.latestBuild.status) {`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ private const val TYPE = "type"`
`5`	`5`	`constvalURL="url"`
`6`	`6`	`constvalTOKEN="token"`
`7`	`7`	`constvalWORKSPACE="workspace"`
	`8`	`+constvalOWNER="owner"`
`8`	`9`	`constvalAGENT_NAME="agent"`
`9`	`10`	`constvalAGENT_ID="agent_id"`
`10`	`11`	`privateconstvalFOLDER="folder"`
`@@ -24,6 +25,8 @@ fun Map<String, String>.token() = this[TOKEN]`
`24`	`25`
`25`	`26`	`funMap<String,String>.workspace()=this[WORKSPACE]`
`26`	`27`
	`28`	`+funMap<String,String>.owner()=this[OWNER]`
	`29`	`+`
`27`	`30`	`funMap<String,String?>.agentName()=this[AGENT_NAME]`
`28`	`31`
`29`	`32`	`funMap<String,String?>.agentID()=this[AGENT_ID]`

Comments

(0)