review

Author: ethanndickson

src/api.ts

@@ -281,7 +281,7 @@ export async function waitForBuild(
   return updatedWorkspace
 }
 
-export async function fetchSSHConfig(restClient: Api, vsc: typeof vscode): Promise<SSHConfigResponse> {
+export async function fetchSSHConfig(restClient: Api): Promise<SSHConfigResponse> {
   try {
     const sshConfig = await restClient.getDeploymentSSHConfig()
     return {
@@ -302,10 +302,6 @@ export async function fetchSSHConfig(restClient: Api, vsc: typeof vscode): Promi
           ssh_config_options: {},
         }
       }
-      case 401: {
-        vsc.window.showErrorMessage("Your session expired...")
-        throw error
-      }
       default:
         throw error
     }

src/commands.ts

@@ -1,3 +1,4 @@
+import { isAxiosError } from "axios"
 import { Api } from "coder/site/src/api/api"
 import { getErrorMessage } from "coder/site/src/api/errors"
 import { User, Workspace, WorkspaceAgent } from "coder/site/src/api/typesGenerated"
@@ -574,16 +575,11 @@ export class Commands {
       let sshConfig
       try {
         // Fetch (or get defaults) for the SSH config.
-        sshConfig = await fetchSSHConfig(this.restClient, this.vscodeProposed)
+        sshConfig = await fetchSSHConfig(this.restClient)
       } catch (error) {
-        const message = getErrorMessage(error, "no response from the server")
-        this.storage.writeToCoderOutputChannel(`Failed to open workspace: ${message}`)
-        this.vscodeProposed.window.showErrorMessage("Failed to open workspace", {
-          detail: message,
-          modal: true,
-          useCustom: true,
+        return this.handleInitialRequestError(error, workspaceName, baseUrl, async () => {
+          await this.openWorkspace(baseUrl, workspaceOwner, workspaceName, workspaceAgent, folderPath, openRecent)
         })
-        return
       }
 
       const coderConnectAddr = await maybeCoderConnectAddr(
@@ -669,16 +665,18 @@ export class Commands {
       let sshConfig
       try {
         // Fetch (or get defaults) for the SSH config.
-        sshConfig = await fetchSSHConfig(this.restClient, this.vscodeProposed)
+        sshConfig = await fetchSSHConfig(this.restClient)
       } catch (error) {
-        const message = getErrorMessage(error, "no response from the server")
-        this.storage.writeToCoderOutputChannel(`Failed to open workspace: ${message}`)
-        this.vscodeProposed.window.showErrorMessage("Failed to open workspace", {
-          detail: message,
-          modal: true,
-          useCustom: true,
+        return this.handleInitialRequestError(error, workspaceName, baseUrl, async () => {
+          await this.openDevContainerInner(
+            baseUrl,
+            workspaceOwner,
+            workspaceName,
+            workspaceAgent,
+            devContainerName,
+            devContainerFolder,
+          )
         })
-        return
       }
 
       const coderConnectAddr = await maybeCoderConnectAddr(
@@ -710,4 +708,46 @@ export class Commands {
       newWindow,
     )
   }
+
+  private async handleInitialRequestError(
+    error: unknown,
+    workspaceName: string,
+    baseUrl: string,
+    retryCallback: () => Promise<void>,
+  ) {
+    if (!isAxiosError(error)) {
+      throw error
+    }
+    switch (error.response?.status) {
+      case 401: {
+        const result = await this.vscodeProposed.window.showInformationMessage(
+          "Your session expired...",
+          {
+            useCustom: true,
+            modal: true,
+            detail: `You must log in to access ${workspaceName}.`,
+          },
+          "Log In",
+        )
+        if (!result) {
+          // User declined to log in.
+          return
+        }
+        // Log in then try again
+        await vscode.commands.executeCommand("coder.login", baseUrl, undefined, undefined)
+        await retryCallback()
+        return
+      }
+      default: {
+        const message = getErrorMessage(error, "no response from the server")
+        this.storage.writeToCoderOutputChannel(`Failed to open workspace: ${message}`)
+        this.vscodeProposed.window.showErrorMessage("Failed to open workspace", {
+          detail: message,
+          modal: true,
+          useCustom: true,
+        })
+        return
+      }
+    }
+  }
 }

src/remote.ts

@@ -479,7 +479,7 @@ export class Remote {
     let sshConfigResponse: SSHConfigResponse
     try {
       this.storage.writeToCoderOutputChannel("Updating SSH config...")
-      sshConfigResponse = await fetchSSHConfig(workspaceRestClient, this.vscodeProposed)
+      sshConfigResponse = await fetchSSHConfig(workspaceRestClient)
       await this.updateSSHConfig(
         workspaceRestClient,
         parts.label,

src/util.ts

@@ -27,17 +27,11 @@ export const AuthorityPrefix = "coder-vscode"
 export function parseRemoteAuthority(authority: string): AuthorityParts | null {
   // The Dev Container authority looks like: vscode://attached-container+containerNameHex@ssh-remote+<ssh host name>
   // The SSH authority looks like: vscode://ssh-remote+<ssh host name>
-  const authorityParts = authority.split("@")
-  let containerNameHex = undefined
-  let sshAuthority
-  if (authorityParts.length === 1) {
-    sshAuthority = authorityParts[0]
-  } else if (authorityParts.length === 2 && authorityParts[0].includes("attached-container+")) {
-    sshAuthority = authorityParts[1]
-    containerNameHex = authorityParts[0].split("+")[1]
-  } else {
-    return null
-  }
+  const authorityURI = authority.startsWith("vscode://") ? authority : `vscode://${authority}`
+  const authorityParts = new URL(authorityURI)
+  const containerParts = authorityParts.username.split("+")
+  const containerNameHex = containerParts[1]
+  const sshAuthority = authorityParts.host
   const sshAuthorityParts = sshAuthority.split("+")
 
   // We create SSH host names in a format matching: