fix: use user-data-dir for storage (#94)

kylecarbs · web-flow · commit 8086c7bd4d33 · 2023-05-03T10:51:41.000-05:00
diff --git a/src/commands.ts b/src/commands.ts
@@ -217,7 +217,7 @@ export class Commands {
       if (agents.length === 1) {
         folderPath = agents[0].expanded_directory
         workspaceAgent = agents[0].name
-      } else {
+      } else if (agents.length > 0) {
         const agentQuickPick = vscode.window.createQuickPick()
         agentQuickPick.title = `Select an agent`
 
diff --git a/src/sshSupport.test.ts b/src/sshSupport.test.ts
@@ -3,6 +3,7 @@ import { sshSupportsSetEnv, sshVersionSupportsSetEnv } from "./sshSupport"
 
 const supports = {
   "OpenSSH_8.9p1 Ubuntu-3ubuntu0.1, OpenSSL 3.0.2 15 Mar 2022": true,
+  "OpenSSH_9.0p1, LibreSSL 3.3.6": true,
   "OpenSSH_7.6p1 Ubuntu-4ubuntu0.7, OpenSSL 1.0.2n 7 Dec 2017": false,
   "OpenSSH_7.4p1, OpenSSL 1.0.2k-fips  26 Jan 2017": false,
 }
diff --git a/src/sshSupport.ts b/src/sshSupport.ts
@@ -24,10 +24,12 @@ export function sshVersionSupportsSetEnv(sshVersionString: string): boolean {
       return false
     }
     // 7.8 is the first version that supports SetEnv
-    if (Number.parseInt(parts[0], 10) < 7) {
+    const major = Number.parseInt(parts[0], 10)
+    const minor = Number.parseInt(parts[1], 10)
+    if (major < 7) {
       return false
     }
-    if (Number.parseInt(parts[1], 10) < 8) {
+    if (major === 7 && minor < 8) {
       return false
     }
     return true
diff --git a/src/storage.ts b/src/storage.ts
@@ -264,7 +264,7 @@ export class Storage {
   }
 
   public getUserSettingsPath(): string {
-    return path.join(this.appDataDir(), "Code", "User", "settings.json")
+    return path.join(this.globalStorageUri.fsPath, "..", "..", "..", "User", "settings.json")
   }
 
   public getSessionTokenPath(): string {
@@ -292,19 +292,6 @@ export class Storage {
     })
   }
 
-  private appDataDir(): string {
-    switch (process.platform) {
-      case "darwin":
-        return `${os.homedir()}/Library/Application Support`
-      case "linux":
-        return `${os.homedir()}/.config`
-      case "win32":
-        return process.env.APPDATA || ""
-      default:
-        return "/var/local"
-    }
-  }
-
   private async updateURL(): Promise<void> {
     const url = this.getURL()
     axios.defaults.baseURL = url

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import { sshSupportsSetEnv, sshVersionSupportsSetEnv } from "./sshSupport"`
`3`	`3`
`4`	`4`	`const supports = {`
`5`	`5`	`"OpenSSH_8.9p1 Ubuntu-3ubuntu0.1, OpenSSL 3.0.2 15 Mar 2022": true,`
	`6`	`+ "OpenSSH_9.0p1, LibreSSL 3.3.6": true,`
`6`	`7`	`"OpenSSH_7.6p1 Ubuntu-4ubuntu0.7, OpenSSL 1.0.2n 7 Dec 2017": false,`
`7`	`8`	`"OpenSSH_7.4p1, OpenSSL 1.0.2k-fips 26 Jan 2017": false,`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,12 @@ export function sshVersionSupportsSetEnv(sshVersionString: string): boolean {`
`24`	`24`	`return false`
`25`	`25`	`}`
`26`	`26`	`// 7.8 is the first version that supports SetEnv`
`27`		`- if (Number.parseInt(parts[0], 10) < 7) {`
	`27`	`+ const major = Number.parseInt(parts[0], 10)`
	`28`	`+ const minor = Number.parseInt(parts[1], 10)`
	`29`	`+ if (major < 7) {`
`28`	`30`	`return false`
`29`	`31`	`}`
`30`		`- if (Number.parseInt(parts[1], 10) < 8) {`
	`32`	`+ if (major === 7 && minor < 8) {`
`31`	`33`	`return false`
`32`	`34`	`}`
`33`	`35`	`return true`