Skip to content

Commit

Permalink
fix: do not overwrite headers, call .set(k, v) instead. (#1304)
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesmbourne committed Mar 12, 2024
1 parent dd5c30f commit 938573a
Showing 1 changed file with 5 additions and 28 deletions.
33 changes: 5 additions & 28 deletions src/interceptor.ts
@@ -1,19 +1,17 @@
import { Request as AWS4Request, sign } from "aws4";
import axios, {
AxiosHeaderValue,
AxiosHeaders,
AxiosInstance,
AxiosRequestConfig,
AxiosRequestHeaders,
InternalAxiosRequestConfig,
Method,
} from "axios";

import { OutgoingHttpHeaders } from "http";
import { CredentialsProvider } from ".";
import { AssumeRoleCredentialsProvider } from "./credentials/assumeRoleCredentialsProvider";
import { isCredentialsProvider } from "./credentials/isCredentialsProvider";
import { SimpleCredentialsProvider } from "./credentials/simpleCredentialsProvider";
import { OutgoingHttpHeaders } from "http";

export interface InterceptorOptions {
/**
Expand Down Expand Up @@ -169,12 +167,10 @@ export const aws4Interceptor = <D = any>({
const resolvedCredentials = await credentialsProvider.getCredentials();
sign(signingOptions, resolvedCredentials);

const signedHeaders = signingOptions.headers;

if (signedHeaders) {
config.headers = AxiosHeaders.from(
outgoingHttpHeadersToAxiosHeaders(signedHeaders)
);
if (signingOptions.headers) {
for (const [key, value] of Object.entries(signingOptions.headers)) {
config.headers.set(key, value);
}
}

if (signingOptions.signQuery) {
Expand All @@ -190,25 +186,6 @@ export const aws4Interceptor = <D = any>({
};
};

// Type is not exported by axios
interface _RawAxiosHeaders {
[key: string]: AxiosHeaderValue;
}

const outgoingHttpHeadersToAxiosHeaders = (
headers: OutgoingHttpHeaders
): _RawAxiosHeaders => {
const axiosHeaders: _RawAxiosHeaders = {};

for (const [key, value] of Object.entries(headers)) {
if (value) {
axiosHeaders[key] = value;
}
}

return axiosHeaders;
};

const getTransformer = (config: AxiosRequestConfig) => {
const { transformRequest } = config;

Expand Down

0 comments on commit 938573a

Please sign in to comment.