Fix merging headers into config object

code-asher · code-asher · commit c67bca29653d · 2023-08-17T16:56:25.000-08:00
First, I replaced the wrong line, needed to replace the second one.

Secondly, seems you cannot actually spread like this because
config.headers actually has a bunch of functions on it.
diff --git a/src/extension.ts b/src/extension.ts
@@ -61,13 +61,10 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 
   // Add headers from the header command.
   axios.interceptors.request.use(async (config) => {
-    return {
-      ...config,
-      headers: {
-        ...(await storage.getHeaders()),
-        ...creds.headers,
-      },
-    }
+    Object.entries(await storage.getHeaders()).forEach(([key, value]) => {
+      config.headers[key] = value
+    })
+    return config
   })
 
   const myWorkspacesProvider = new WorkspaceProvider(WorkspaceQuery.Mine, storage)
diff --git a/src/storage.ts b/src/storage.ts
@@ -393,7 +393,7 @@ export class Storage {
     }
   }
 
-  public async getHeaders(url = this.getURL()): Promise<Record<string, string> | undefined> {
+  public async getHeaders(url = this.getURL()): Promise<Record<string, string>> {
     return getHeaders(url, vscode.workspace.getConfiguration().get("coder.headerCommand"), this)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ export class Storage {`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`
`396`		`- public async getHeaders(url = this.getURL()): Promise<Record<string, string> \| undefined> {`
	`396`	`+ public async getHeaders(url = this.getURL()): Promise<Record<string, string>> {`
`397`	`397`	`return getHeaders(url, vscode.workspace.getConfiguration().get("coder.headerCommand"), this)`
`398`	`398`	`}`
`399`	`399`	`}`