oauth4webapi 2.0.2 → 2.0.4

package/README.md

@@ -39,7 +39,7 @@ import * as oauth2 from 'oauth4webapi'
 **`example`** Deno import
 
 ```js
-import * as oauth2 from 'https://deno.land/x/oauth4webapi@v2.0.2/mod.ts'
+import * as oauth2 from 'https://deno.land/x/oauth4webapi@v2.0.4/mod.ts'
 ```
 
 - Authorization Code Flow - OpenID Connect [source](examples/code.ts), or plain OAuth 2 [source](examples/oauth.ts)

package/build/index.js

@@ -1,7 +1,7 @@
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'oauth4webapi';
-    const VERSION = 'v2.0.1';
+    const VERSION = 'v2.0.3';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 const encoder = new TextEncoder();
@@ -114,10 +114,6 @@ function isPublicKey(key) {
     return isCryptoKey(key) && key.type === 'public';
 }
 const SUPPORTED_JWS_ALGS = ['PS256', 'ES256', 'RS256', 'EdDSA'];
-function preserveBodyStream(response) {
-    assertReadableResponse(response);
-    return response.clone();
-}
 function processDpopNonce(response) {
     const url = new URL(response.url);
     if (response.headers.has('dpop-nonce')) {
@@ -205,9 +201,10 @@ export async function processDiscoveryResponse(expectedIssuerIdentifier, respons
     if (response.status !== 200) {
         throw new OPE('"response" is not a conform Authorization Server Metadata response');
     }
+    assertReadableResponse(response);
     let json;
     try {
-        json = await preserveBodyStream(response).json();
+        json = await response.json();
     }
     catch {
         throw new OPE('failed to parse "response" body as JSON');
@@ -484,13 +481,15 @@ async function dpopProofJwt(headers, options, url, htm, accessToken) {
     }, privateKey);
     headers.set('dpop', proof);
 }
-const jwkCache = Symbol();
+let jwkCache;
 async function publicJwk(key) {
-    if (key[jwkCache]) {
-        return key[jwkCache];
+    jwkCache || (jwkCache = new WeakMap());
+    if (jwkCache.has(key)) {
+        return jwkCache.get(key);
     }
     const { kty, e, n, x, y, crv } = await crypto.subtle.exportKey('jwk', key);
-    const jwk = (key[jwkCache] = { kty, e, n, x, y, crv });
+    const jwk = { kty, e, n, x, y, crv };
+    jwkCache.set(key, jwk);
     return jwk;
 }
 export async function pushedAuthorizationRequest(as, client, parameters, options) {
@@ -590,9 +589,10 @@ export async function processPushedAuthorizationResponse(as, client, response) {
         }
         throw new OPE('"response" is not a conform Pushed Authorization Request Endpoint response');
     }
+    assertReadableResponse(response);
     let json;
     try {
-        json = await preserveBodyStream(response).json();
+        json = await response.json();
     }
     catch {
         throw new OPE('failed to parse "response" body as JSON');
@@ -648,30 +648,31 @@ export async function userInfoRequest(as, client, accessToken, options) {
     }
     return protectedResourceRequest(accessToken, 'GET', url, headers, null, options);
 }
-const jwksCache = Symbol();
+let jwksCache;
 async function getPublicSigKeyFromIssuerJwksUri(as, options, header) {
     const { alg, kid } = header;
     checkSupportedJwsAlg(alg);
     let jwks;
     let age;
-    if (as[jwksCache]) {
+    jwksCache || (jwksCache = new WeakMap());
+    if (jwksCache.has(as)) {
         ;
-        ({ jwks, age } = as[jwksCache]);
+        ({ jwks, age } = jwksCache.get(as));
         if (age >= 300) {
-            as[jwksCache] = undefined;
+            jwksCache.delete(as);
             return getPublicSigKeyFromIssuerJwksUri(as, options, header);
         }
     }
     else {
         jwks = await jwksRequest(as, options).then(processJwksResponse);
         age = 0;
-        as[jwksCache] = {
+        jwksCache.set(as, {
             jwks,
             iat: epochTime(),
             get age() {
                 return epochTime() - this.iat;
             },
-        };
+        });
     }
     let kty;
     switch (alg.slice(0, 2)) {
@@ -714,7 +715,7 @@ async function getPublicSigKeyFromIssuerJwksUri(as, options, header) {
     const { 0: jwk, length } = candidates;
     if (!length) {
         if (age >= 60) {
-            as[jwksCache] = undefined;
+            jwksCache.delete(as);
             return getPublicSigKeyFromIssuerJwksUri(as, options, header);
         }
         throw new OPE('error when selecting a JWT verification key, no applicable keys found');
@@ -743,7 +744,8 @@ export async function processUserInfoResponse(as, client, expectedSubject, respo
     }
     let json;
     if (getContentType(response) === 'application/jwt') {
-        const { claims } = await validateJwt(await preserveBodyStream(response).text(), checkSigningAlgorithm.bind(undefined, client.userinfo_signed_response_alg, as.userinfo_signing_alg_values_supported), noSignatureCheck)
+        assertReadableResponse(response);
+        const { claims } = await validateJwt(await response.text(), checkSigningAlgorithm.bind(undefined, client.userinfo_signed_response_alg, as.userinfo_signing_alg_values_supported), noSignatureCheck)
             .then(validateOptionalAudience.bind(undefined, client.client_id))
             .then(validateOptionalIssuer.bind(undefined, as.issuer));
         json = claims;
@@ -752,8 +754,9 @@ export async function processUserInfoResponse(as, client, expectedSubject, respo
         if (client.userinfo_signed_response_alg) {
             throw new OPE('JWT UserInfo Response expected');
         }
+        assertReadableResponse(response);
         try {
-            json = await preserveBodyStream(response).json();
+            json = await response.json();
         }
         catch {
             throw new OPE('failed to parse "response" body as JSON');
@@ -832,9 +835,10 @@ async function processGenericAccessTokenResponse(as, client, response, ignoreIdT
         }
         throw new OPE('"response" is not a conform Token Endpoint response');
     }
+    assertReadableResponse(response);
     let json;
     try {
-        json = await preserveBodyStream(response).json();
+        json = await response.json();
     }
     catch {
         throw new OPE('failed to parse "response" body as JSON');
@@ -1100,7 +1104,8 @@ export async function processIntrospectionResponse(as, client, response) {
     }
     let json;
     if (getContentType(response) === 'application/token-introspection+jwt') {
-        const { claims } = await validateJwt(await preserveBodyStream(response).text(), checkSigningAlgorithm.bind(undefined, client.introspection_signed_response_alg, as.introspection_signing_alg_values_supported), noSignatureCheck)
+        assertReadableResponse(response);
+        const { claims } = await validateJwt(await response.text(), checkSigningAlgorithm.bind(undefined, client.introspection_signed_response_alg, as.introspection_signing_alg_values_supported), noSignatureCheck)
             .then(checkJwtType.bind(undefined, 'token-introspection+jwt'))
             .then(validatePresence.bind(undefined, ['aud', 'iat', 'iss']))
             .then(validateIssuer.bind(undefined, as.issuer))
@@ -1111,8 +1116,9 @@ export async function processIntrospectionResponse(as, client, response) {
         }
     }
     else {
+        assertReadableResponse(response);
         try {
-            json = await preserveBodyStream(response).json();
+            json = await response.json();
         }
         catch {
             throw new OPE('failed to parse "response" body as JSON');
@@ -1149,9 +1155,10 @@ async function processJwksResponse(response) {
     if (response.status !== 200) {
         throw new OPE('"response" is not a conform JSON Web Key Set response');
     }
+    assertReadableResponse(response);
     let json;
     try {
-        json = await preserveBodyStream(response).json();
+        json = await response.json();
     }
     catch {
         throw new OPE('failed to parse "response" body as JSON');
@@ -1169,8 +1176,9 @@ async function processJwksResponse(response) {
 }
 async function handleOAuthBodyError(response) {
     if (response.status > 399 && response.status < 500) {
+        assertReadableResponse(response);
         try {
-            const json = await preserveBodyStream(response).json();
+            const json = await response.json();
             if (isJsonObject(json) && typeof json.error === 'string' && json.error.length) {
                 if (json.error_description !== undefined && typeof json.error_description !== 'string') {
                     delete json.error_description;
@@ -1458,9 +1466,10 @@ export async function processDeviceAuthorizationResponse(as, client, response) {
         }
         throw new OPE('"response" is not a conform Device Authorization Endpoint response');
     }
+    assertReadableResponse(response);
     let json;
     try {
-        json = await preserveBodyStream(response).json();
+        json = await response.json();
     }
     catch {
         throw new OPE('failed to parse "response" body as JSON');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth4webapi",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "OAuth 2 / OpenID Connect for Web Platform API JavaScript runtimes",
   "keywords": [
     "auth",
@@ -52,7 +52,6 @@
     "docs": "patch-package && typedoc",
     "format": "npm run _format -- --write",
     "format-check": "npm run _format -- --check",
-    "prepack": "npm run format && npm run docs && ./examples/.update-diffs.sh && git diff --quiet && npm run test && npm run build",
     "tap:browsers": "./tap/.browsers.sh",
     "tap:bun": "./tap/.bun.sh",
     "tap:deno": "./tap/.deno.sh",
@@ -63,21 +62,21 @@
     "test": "bash -c 'source .node_flags.sh && ava'"
   },
   "devDependencies": {
-    "@esbuild-kit/esm-loader": "^2.5.0",
+    "@esbuild-kit/esm-loader": "^2.5.1",
     "@types/node": "^18.11.9",
     "@types/qunit": "^2.19.3",
     "ava": "^5.1.0",
     "edge-runtime": "^2.0.2",
-    "esbuild": "^0.15.14",
-    "jose": "^4.11.0",
+    "esbuild": "^0.15.15",
+    "jose": "^4.11.1",
     "patch-package": "^6.5.0",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.0",
     "prettier-plugin-jsdoc": "^0.4.2",
     "qunit": "^2.19.3",
     "timekeeper": "^2.2.0",
-    "typedoc": "^0.23.20",
+    "typedoc": "^0.23.21",
     "typedoc-plugin-markdown": "^3.13.6",
-    "typescript": "^4.8.4",
-    "undici": "^5.12.0"
+    "typescript": "^4.9.3",
+    "undici": "^5.13.0"
   }
 }