Rename SelfSignedCertificateError to CertificateError

code-asher · code-asher · commit 5f03ca3ed146 · 2023-08-01T14:35:37.000-08:00
This class will handle various certificate errors.
diff --git a/src/commands.ts b/src/commands.ts
@@ -3,7 +3,7 @@ import { getAuthenticatedUser, getWorkspaces, updateWorkspaceVersion } from "cod
 import { Workspace, WorkspaceAgent } from "coder/site/src/api/typesGenerated"
 import * as vscode from "vscode"
 import { extractAgents } from "./api-helper"
-import { SelfSignedCertificateError } from "./error"
+import { CertificateError } from "./error"
 import { Remote } from "./remote"
 import { Storage } from "./storage"
 import { OpenableTreeItem } from "./workspacesProvider"
@@ -62,8 +62,8 @@ export class Commands {
               if (axios.isAxiosError(err) && err.response?.data) {
                 message = err.response.data.detail
               }
-              if (err instanceof SelfSignedCertificateError) {
-                err.showInsecureNotification()
+              if (err instanceof CertificateError) {
+                err.showNotification()
 
                 return {
                   message: err.message,
@@ -199,8 +199,8 @@ export class Commands {
             quickPick.busy = false
           })
           .catch((ex) => {
-            if (ex instanceof SelfSignedCertificateError) {
-              ex.showInsecureNotification()
+            if (ex instanceof CertificateError) {
+              ex.showNotification()
             }
             return
           })
diff --git a/src/error.ts b/src/error.ts
@@ -1,6 +1,6 @@
 import * as vscode from "vscode"
 
-export class SelfSignedCertificateError extends Error {
+export class CertificateError extends Error {
   public static Notification =
     "Your Coder deployment is using a self-signed certificate. VS Code uses a version of Electron that does not support registering self-signed intermediate certificates with extensions."
   public static ActionAllowInsecure = "Allow Insecure"
@@ -20,17 +20,17 @@ export class SelfSignedCertificateError extends Error {
     vscode.window.showInformationMessage(CertificateError.InsecureMessage)
   }
 
-  public async showInsecureNotification(): Promise<void> {
+  public async showNotification(): Promise<void> {
     const value = await vscode.window.showErrorMessage(
-      SelfSignedCertificateError.Notification,
-      SelfSignedCertificateError.ActionAllowInsecure,
-      SelfSignedCertificateError.ActionViewMoreDetails,
+      CertificateError.Notification,
+      CertificateError.ActionAllowInsecure,
+      CertificateError.ActionViewMoreDetails,
     )
-    if (value === SelfSignedCertificateError.ActionViewMoreDetails) {
+    if (value === CertificateError.ActionViewMoreDetails) {
       await this.viewMoreDetails()
       return
     }
-    if (value === SelfSignedCertificateError.ActionAllowInsecure) {
+    if (value === CertificateError.ActionAllowInsecure) {
       return this.allowInsecure()
     }
   }
diff --git a/src/extension.ts b/src/extension.ts
@@ -5,7 +5,7 @@ import * as https from "https"
 import * as module from "module"
 import * as vscode from "vscode"
 import { Commands } from "./commands"
-import { SelfSignedCertificateError } from "./error"
+import { CertificateError } from "./error"
 import { Remote } from "./remote"
 import { Storage } from "./storage"
 import { WorkspaceQuery, WorkspaceProvider } from "./workspacesProvider"
@@ -49,7 +49,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
       if (err) {
         const msg = err.toString() as string
         if (msg.indexOf("unable to verify the first certificate") !== -1) {
-          throw new SelfSignedCertificateError(msg)
+          throw new CertificateError(msg)
         }
       }
 
@@ -144,23 +144,23 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
   try {
     await remote.setup(vscodeProposed.env.remoteAuthority)
   } catch (ex) {
-    if (ex instanceof SelfSignedCertificateError) {
+    if (ex instanceof CertificateError) {
       const prompt = await vscodeProposed.window.showErrorMessage(
         "Failed to open workspace",
         {
-          detail: SelfSignedCertificateError.Notification,
+          detail: CertificateError.Notification,
           modal: true,
           useCustom: true,
         },
-        SelfSignedCertificateError.ActionAllowInsecure,
-        SelfSignedCertificateError.ActionViewMoreDetails,
+        CertificateError.ActionAllowInsecure,
+        CertificateError.ActionViewMoreDetails,
       )
-      if (prompt === SelfSignedCertificateError.ActionAllowInsecure) {
+      if (prompt === CertificateError.ActionAllowInsecure) {
         await ex.allowInsecure(storage)
         await remote.reloadWindow()
         return
       }
-      if (prompt === SelfSignedCertificateError.ActionViewMoreDetails) {
+      if (prompt === CertificateError.ActionViewMoreDetails) {
         await ex.viewMoreDetails()
         return
       }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import * as vscode from "vscode"`
`2`	`2`
`3`		`-export class SelfSignedCertificateError extends Error {`
	`3`	`+export class CertificateError extends Error {`
`4`	`4`	`public static Notification =`
`5`	`5`	`"Your Coder deployment is using a self-signed certificate. VS Code uses a version of Electron that does not support registering self-signed intermediate certificates with extensions."`
`6`	`6`	`public static ActionAllowInsecure = "Allow Insecure"`
`@@ -20,17 +20,17 @@ export class SelfSignedCertificateError extends Error {`
`20`	`20`	`vscode.window.showInformationMessage(CertificateError.InsecureMessage)`
`21`	`21`	`}`
`22`	`22`
`23`		`- public async showInsecureNotification(): Promise<void> {`
	`23`	`+ public async showNotification(): Promise<void> {`
`24`	`24`	`const value = await vscode.window.showErrorMessage(`
`25`		`- SelfSignedCertificateError.Notification,`
`26`		`- SelfSignedCertificateError.ActionAllowInsecure,`
`27`		`- SelfSignedCertificateError.ActionViewMoreDetails,`
	`25`	`+ CertificateError.Notification,`
	`26`	`+ CertificateError.ActionAllowInsecure,`
	`27`	`+ CertificateError.ActionViewMoreDetails,`
`28`	`28`	`)`
`29`		`- if (value === SelfSignedCertificateError.ActionViewMoreDetails) {`
	`29`	`+ if (value === CertificateError.ActionViewMoreDetails) {`
`30`	`30`	`await this.viewMoreDetails()`
`31`	`31`	`return`
`32`	`32`	`}`
`33`		`- if (value === SelfSignedCertificateError.ActionAllowInsecure) {`
	`33`	`+ if (value === CertificateError.ActionAllowInsecure) {`
`34`	`34`	`return this.allowInsecure()`
`35`	`35`	`}`
`36`	`36`	`}`