Better fix for getting base URL

coder · code-asher · Aug 18, 2023 · Aug 4, 2023 · Aug 4, 2023 · Aug 18, 2023
commit 37118f9c4e4bd575b0d3e594d68929556bf5b914
diff --git a/src/error.ts b/src/error.ts
@@ -40,8 +40,8 @@ export class CertificateError extends Error {
 
   // maybeWrap returns a CertificateError if the code is a certificate error
   // otherwise it returns the original error.
-  static async maybeWrap<T>(err: T, address: string | undefined, logger: Logger): Promise<CertificateError | T> {
-    if (address && axios.isAxiosError(err)) {
+  static async maybeWrap<T>(err: T, address: string, logger: Logger): Promise<CertificateError | T> {
+    if (axios.isAxiosError(err)) {
       switch (err.code) {
         case X509_ERR_CODE.UNABLE_TO_VERIFY_LEAF_SIGNATURE:
           // "Unable to verify" can mean different things so we will attempt to

diff --git a/src/extension.ts b/src/extension.ts
@@ -46,7 +46,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
   axios.interceptors.response.use(
     (r) => r,
     async (err) => {
-      throw await CertificateError.maybeWrap(err, err?.config?.baseURL, storage)
+      throw await CertificateError.maybeWrap(err, axios.getUri(err.config), storage)
     },
   )