fix: explicitly set accept: application/json again

panva · Oct 27, 2021 · 89cdbe2 · 89cdbe2
1 parent 0133dda
commit 89cdbe2
Show file tree

Hide file tree

Showing 11 changed files with 187 additions and 67 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -1356,11 +1356,14 @@ class BaseClient {
     }
 
     const response = await request.call(this, {
-      headers: initialAccessToken
-        ? {
-            Authorization: authorizationHeaderValue(initialAccessToken),
-          }
-        : undefined,
+      headers: {
+        Accept: 'application/json',
+        ...(initialAccessToken
+          ? {
+              Authorization: authorizationHeaderValue(initialAccessToken),
+            }
+          : undefined),
+      },
       responseType: 'json',
       json: metadata,
       url: this.issuer.registration_endpoint,
@@ -1380,7 +1383,10 @@ class BaseClient {
       method: 'GET',
       url: registrationClientUri,
       responseType: 'json',
-      headers: { Authorization: authorizationHeaderValue(registrationAccessToken) },
+      headers: {
+        Authorization: authorizationHeaderValue(registrationAccessToken),
+        Accept: 'application/json',
+      },
     });
     const responseBody = processResponse(response, { bearer: true });
 

diff --git a/lib/helpers/client.js b/lib/helpers/client.js
@@ -6,7 +6,6 @@ const { assertIssuerConfiguration } = require('./assert');
 const { random } = require('./generators');
 const now = require('./unix_timestamp');
 const request = require('./request');
-const instance = require('./weak_cache');
 const { keystores } = require('./weak_cache');
 const merge = require('./merge');
 
@@ -200,6 +199,14 @@ async function authenticatedPost(
       ...requestOpts,
       method: 'POST',
       url: targetUrl,
+      headers: {
+        ...(endpoint !== 'revocation'
+          ? {
+              Accept: 'application/json',
+            }
+          : undefined),
+        ...requestOpts.headers,
+      },
     },
     { mTLS, DPoP },
   );

diff --git a/lib/helpers/issuer.js b/lib/helpers/issuer.js
@@ -37,6 +37,9 @@ async function getKeyStore(reload = false) {
             method: 'GET',
             responseType: 'json',
             url: this.jwks_uri,
+            headers: {
+              Accept: 'application/json',
+            },
           })
           .finally(() => {
             inFlight.delete(this);

diff --git a/lib/issuer.js b/lib/issuer.js
@@ -90,6 +90,9 @@ class Issuer {
       url: webfingerUrl,
       responseType: 'json',
       searchParams: { resource, rel: 'http://openid.net/specs/connect/1.0/issuer' },
+      headers: {
+        Accept: 'application/json',
+      },
     });
     const body = processResponse(response);
 
@@ -142,6 +145,9 @@ class Issuer {
         method: 'GET',
         responseType: 'json',
         url: uri,
+        headers: {
+          Accept: 'application/json',
+        },
       });
       const body = processResponse(response);
       return new Issuer({
@@ -166,6 +172,9 @@ class Issuer {
       method: 'GET',
       responseType: 'json',
       url: wellKnownUri,
+      headers: {
+        Accept: 'application/json',
+      },
     });
     const body = processResponse(response);
     return new Issuer({