oauth4webapi 2.0.3 → 2.0.5

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.3/mod.ts'
+import * as oauth2 from 'https://deno.land/x/oauth4webapi@v2.0.5/mod.ts'
 ```
 
 - Authorization Code Flow - OpenID Connect [source](examples/code.ts), or plain OAuth 2 [source](examples/oauth.ts)

package/build/index.d.ts

@@ -1,9 +1,9 @@
-declare type JsonObject = {
+type JsonObject = {
     [Key in string]?: JsonValue;
 };
-declare type JsonArray = JsonValue[];
-declare type JsonPrimitive = string | number | boolean | null;
-declare type JsonValue = JsonPrimitive | JsonObject | JsonArray;
+type JsonArray = JsonValue[];
+type JsonPrimitive = string | number | boolean | null;
+type JsonValue = JsonPrimitive | JsonObject | JsonArray;
 /**
  * Interface to pass an asymmetric private key and, optionally, its associated JWK Key ID to be
  * added as a `kid` JOSE Header Parameter.
@@ -41,7 +41,7 @@ export interface PrivateKey {
  * @see [OpenID Connect Core 1.0](https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication)
  * @see [OAuth Token Endpoint Authentication Methods](https://www.iana.org/assignments/oauth-parameters/oauth-parameters.xhtml#token-endpoint-auth-method)
  */
-export declare type ClientAuthenticationMethod = 'client_secret_basic' | 'client_secret_post' | 'private_key_jwt' | 'none';
+export type ClientAuthenticationMethod = 'client_secret_basic' | 'client_secret_post' | 'private_key_jwt' | 'none';
 /**
  * Supported JWS `alg` Algorithm identifiers.
  *
@@ -84,7 +84,7 @@ export declare type ClientAuthenticationMethod = 'client_secret_basic' | 'client
  * }
  * ```
  */
-export declare type JWSAlgorithm = 'PS256' | 'ES256' | 'RS256' | 'EdDSA';
+export type JWSAlgorithm = 'PS256' | 'ES256' | 'RS256' | 'EdDSA';
 /**
  * Authorization Server Metadata
  *
@@ -1014,7 +1014,7 @@ declare class CallbackParameters extends URLSearchParams {
  * @see [RFC 9207 - OAuth 2.0 Authorization Server Issuer Identification](https://www.rfc-editor.org/rfc/rfc9207.html)
  */
 export declare function validateAuthResponse(as: AuthorizationServer, client: Client, parameters: URLSearchParams | URL, expectedState?: string | typeof expectNoState | typeof skipStateCheck): CallbackParameters | OAuth2Error;
-declare type ReturnTypes = TokenEndpointResponse | OAuth2TokenEndpointResponse | OpenIDTokenEndpointResponse | ClientCredentialsGrantResponse | DeviceAuthorizationResponse | IntrospectionResponse | OAuth2Error | PushedAuthorizationResponse | URLSearchParams | UserInfoResponse;
+type ReturnTypes = TokenEndpointResponse | OAuth2TokenEndpointResponse | OpenIDTokenEndpointResponse | ClientCredentialsGrantResponse | DeviceAuthorizationResponse | IntrospectionResponse | OAuth2Error | PushedAuthorizationResponse | URLSearchParams | UserInfoResponse;
 export interface DeviceAuthorizationRequestOptions extends HttpRequestOptions, AuthenticatedRequestOptions {
 }
 /**

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.3';
+    const VERSION = 'v2.0.4';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 const encoder = new TextEncoder();
@@ -481,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) {
@@ -646,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)) {
@@ -712,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');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth4webapi",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "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.16.1",
+    "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"
   }
 }