jose 4.14.2 → 4.14.4

package/README.md

@@ -129,4 +129,4 @@ Please note that certain algorithms may not be available depending on the runtim
 | Version | Security Fixes 🔑 | Other Bug Fixes 🐞 | New Features ⭐ |
 | ------- | --------- | -------- | -------- |
 | [v4.x](https://github.com/panva/jose/tree/v4.x) | ✅ | ✅ | ✅ |
-| [v3.x](https://github.com/panva/jose/tree/v3.x), [v2.x](https://github.com/panva/jose/tree/v2.x), [v1.x](https://github.com/panva/jose/tree/v1.x) | ✅ | ❌ | ❌ |
+| [v2.x](https://github.com/panva/jose/tree/v2.x) | ✅ | ❌ | ❌ |

package/dist/browser/jwks/remote.js

@@ -1,7 +1,11 @@
 import fetchJwks from '../runtime/fetch_jwks.js';
-import { isCloudflareWorkers } from '../runtime/env.js';
 import { JWKSInvalid, JWKSNoMatchingKey } from '../util/errors.js';
 import { isJWKSLike, LocalJWKSet } from './local.js';
+function isCloudflareWorkers() {
+    return (typeof WebSocketPair !== 'undefined' ||
+        (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers') ||
+        (typeof EdgeRuntime !== 'undefined' && EdgeRuntime === 'vercel'));
+}
 class RemoteJWKSet extends LocalJWKSet {
     constructor(url, options) {
         super({ keys: [] });

package/dist/browser/lib/crypto_key.js

@@ -1,4 +1,3 @@
-import { isCloudflareWorkers } from '../runtime/env.js';
 function unusable(name, prop = 'algorithm.name') {
     return new TypeError(`CryptoKey does not support this operation, its ${prop} must be ${name}`);
 }
@@ -73,11 +72,6 @@ export function checkSigCryptoKey(key, alg, ...usages) {
         }
         case 'EdDSA': {
             if (key.algorithm.name !== 'Ed25519' && key.algorithm.name !== 'Ed448') {
-                if (isCloudflareWorkers()) {
-                    if (isAlgorithm(key.algorithm, 'NODE-ED25519'))
-                        break;
-                    throw unusable('Ed25519, Ed448, or NODE-ED25519');
-                }
                 throw unusable('Ed25519 or Ed448');
             }
             break;

package/dist/browser/runtime/asn1.js

@@ -1,4 +1,3 @@
-import { isCloudflareWorkers } from './env.js';
 import crypto, { isCryptoKey } from './webcrypto.js';
 import invalidKeyInput from '../lib/invalid_key_input.js';
 import { encodeBase64, decodeBase64 } from './base64url.js';
@@ -57,7 +56,7 @@ const getNamedCurve = (keyData) => {
     }
 };
 const genericImport = async (replace, keyFormat, pem, alg, options) => {
-    var _a, _b;
+    var _a;
     let algorithm;
     let keyUsages;
     const keyData = new Uint8Array(atob(pem.replace(replace, ''))
@@ -115,18 +114,7 @@ const genericImport = async (replace, keyFormat, pem, alg, options) => {
         default:
             throw new JOSENotSupported('Invalid or unsupported "alg" (Algorithm) value');
     }
-    try {
-        return await crypto.subtle.importKey(keyFormat, keyData, algorithm, (_a = options === null || options === void 0 ? void 0 : options.extractable) !== null && _a !== void 0 ? _a : false, keyUsages);
-    }
-    catch (err) {
-        if (algorithm.name === 'Ed25519' &&
-            (err === null || err === void 0 ? void 0 : err.name) === 'NotSupportedError' &&
-            isCloudflareWorkers()) {
-            algorithm = { name: 'NODE-ED25519', namedCurve: 'NODE-ED25519' };
-            return await crypto.subtle.importKey(keyFormat, keyData, algorithm, (_b = options === null || options === void 0 ? void 0 : options.extractable) !== null && _b !== void 0 ? _b : false, keyUsages);
-        }
-        throw err;
-    }
+    return crypto.subtle.importKey(keyFormat, keyData, algorithm, (_a = options === null || options === void 0 ? void 0 : options.extractable) !== null && _a !== void 0 ? _a : false, keyUsages);
 };
 export const fromPKCS8 = (pem, alg, options) => {
     return genericImport(/(?:-----(?:BEGIN|END) PRIVATE KEY-----|\s)/g, 'pkcs8', pem, alg, options);

package/dist/browser/runtime/generate.js

@@ -1,4 +1,3 @@
-import { isCloudflareWorkers } from './env.js';
 import crypto from './webcrypto.js';
 import { JOSENotSupported } from '../util/errors.js';
 import random from './random.js';
@@ -51,7 +50,7 @@ function getModulusLengthOption(options) {
     return modulusLength;
 }
 export async function generateKeyPair(alg, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     let algorithm;
     let keyUsages;
     switch (alg) {
@@ -138,16 +137,5 @@ export async function generateKeyPair(alg, options) {
         default:
             throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
     }
-    try {
-        return (await crypto.subtle.generateKey(algorithm, (_c = options === null || options === void 0 ? void 0 : options.extractable) !== null && _c !== void 0 ? _c : false, keyUsages));
-    }
-    catch (err) {
-        if (algorithm.name === 'Ed25519' &&
-            (err === null || err === void 0 ? void 0 : err.name) === 'NotSupportedError' &&
-            isCloudflareWorkers()) {
-            algorithm = { name: 'NODE-ED25519', namedCurve: 'NODE-ED25519' };
-            return (await crypto.subtle.generateKey(algorithm, (_d = options === null || options === void 0 ? void 0 : options.extractable) !== null && _d !== void 0 ? _d : false, keyUsages));
-        }
-        throw err;
-    }
+    return (crypto.subtle.generateKey(algorithm, (_c = options === null || options === void 0 ? void 0 : options.extractable) !== null && _c !== void 0 ? _c : false, keyUsages));
 }

package/dist/browser/runtime/jwk_to_key.js

@@ -1,4 +1,3 @@
-import { isCloudflareWorkers } from './env.js';
 import crypto from './webcrypto.js';
 import { JOSENotSupported } from '../util/errors.js';
 import { decode as base64url } from './base64url.js';
@@ -139,17 +138,6 @@ const parse = async (jwk) => {
     const keyData = { ...jwk };
     delete keyData.alg;
     delete keyData.use;
-    try {
-        return await crypto.subtle.importKey('jwk', keyData, ...rest);
-    }
-    catch (err) {
-        if (algorithm.name === 'Ed25519' &&
-            (err === null || err === void 0 ? void 0 : err.name) === 'NotSupportedError' &&
-            isCloudflareWorkers()) {
-            rest[0] = { name: 'NODE-ED25519', namedCurve: 'NODE-ED25519' };
-            return await crypto.subtle.importKey('jwk', keyData, ...rest);
-        }
-        throw err;
-    }
+    return crypto.subtle.importKey('jwk', keyData, ...rest);
 };
 export default parse;

package/dist/browser/runtime/subtle_dsa.js

@@ -1,4 +1,3 @@
-import { isCloudflareWorkers } from './env.js';
 import { JOSENotSupported } from '../util/errors.js';
 export default function subtleDsa(alg, algorithm) {
     const hash = `SHA-${alg.slice(-3)}`;
@@ -20,9 +19,6 @@ export default function subtleDsa(alg, algorithm) {
         case 'ES512':
             return { hash, name: 'ECDSA', namedCurve: algorithm.namedCurve };
         case 'EdDSA':
-            if (isCloudflareWorkers() && algorithm.name === 'NODE-ED25519') {
-                return { name: 'NODE-ED25519', namedCurve: 'NODE-ED25519' };
-            }
             return { name: algorithm.name };
         default:
             throw new JOSENotSupported(`alg ${alg} is not supported either by JOSE or your javascript runtime`);

package/dist/node/cjs/jwks/remote.js

@@ -2,9 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRemoteJWKSet = void 0;
 const fetch_jwks_js_1 = require("../runtime/fetch_jwks.js");
-const env_js_1 = require("../runtime/env.js");
 const errors_js_1 = require("../util/errors.js");
 const local_js_1 = require("./local.js");
+function isCloudflareWorkers() {
+    return (typeof WebSocketPair !== 'undefined' ||
+        (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers') ||
+        (typeof EdgeRuntime !== 'undefined' && EdgeRuntime === 'vercel'));
+}
 class RemoteJWKSet extends local_js_1.LocalJWKSet {
     constructor(url, options) {
         super({ keys: [] });
@@ -48,7 +52,7 @@ class RemoteJWKSet extends local_js_1.LocalJWKSet {
         }
     }
     async reload() {
-        if (this._pendingFetch && (0, env_js_1.isCloudflareWorkers)()) {
+        if (this._pendingFetch && isCloudflareWorkers()) {
             this._pendingFetch = undefined;
         }
         this._pendingFetch || (this._pendingFetch = (0, fetch_jwks_js_1.default)(this._url, this._timeoutDuration, this._options)

package/dist/node/cjs/lib/crypto_key.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkEncCryptoKey = exports.checkSigCryptoKey = void 0;
-const env_js_1 = require("../runtime/env.js");
 function unusable(name, prop = 'algorithm.name') {
     return new TypeError(`CryptoKey does not support this operation, its ${prop} must be ${name}`);
 }
@@ -76,11 +75,6 @@ function checkSigCryptoKey(key, alg, ...usages) {
         }
         case 'EdDSA': {
             if (key.algorithm.name !== 'Ed25519' && key.algorithm.name !== 'Ed448') {
-                if ((0, env_js_1.isCloudflareWorkers)()) {
-                    if (isAlgorithm(key.algorithm, 'NODE-ED25519'))
-                        break;
-                    throw unusable('Ed25519, Ed448, or NODE-ED25519');
-                }
                 throw unusable('Ed25519 or Ed448');
             }
             break;

package/dist/node/esm/jwks/remote.js

@@ -1,7 +1,11 @@
 import fetchJwks from '../runtime/fetch_jwks.js';
-import { isCloudflareWorkers } from '../runtime/env.js';
 import { JWKSInvalid, JWKSNoMatchingKey } from '../util/errors.js';
 import { isJWKSLike, LocalJWKSet } from './local.js';
+function isCloudflareWorkers() {
+    return (typeof WebSocketPair !== 'undefined' ||
+        (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers') ||
+        (typeof EdgeRuntime !== 'undefined' && EdgeRuntime === 'vercel'));
+}
 class RemoteJWKSet extends LocalJWKSet {
     constructor(url, options) {
         super({ keys: [] });

package/dist/node/esm/lib/crypto_key.js

@@ -1,4 +1,3 @@
-import { isCloudflareWorkers } from '../runtime/env.js';
 function unusable(name, prop = 'algorithm.name') {
     return new TypeError(`CryptoKey does not support this operation, its ${prop} must be ${name}`);
 }
@@ -73,11 +72,6 @@ export function checkSigCryptoKey(key, alg, ...usages) {
         }
         case 'EdDSA': {
             if (key.algorithm.name !== 'Ed25519' && key.algorithm.name !== 'Ed448') {
-                if (isCloudflareWorkers()) {
-                    if (isAlgorithm(key.algorithm, 'NODE-ED25519'))
-                        break;
-                    throw unusable('Ed25519, Ed448, or NODE-ED25519');
-                }
                 throw unusable('Ed25519 or Ed448');
             }
             break;

package/dist/types/types.d.ts

@@ -29,11 +29,6 @@
  */
 export type KeyLike = { type: string }
 
-type JsonObject = { [Key in string]?: JsonValue }
-type JsonArray = JsonValue[]
-type JsonPrimitive = string | number | boolean | null
-type JsonValue = JsonPrimitive | JsonObject | JsonArray
-
 /**
  * JSON Web Key ({@link https://www.rfc-editor.org/rfc/rfc7517 JWK}). "RSA", "EC", "OKP", and "oct"
  * key types are supported.
@@ -77,7 +72,7 @@ export interface JWK {
   /** JWK "x5u" (X.509 URL) Parameter. */
   x5u?: string
 
-  [propName: string]: JsonValue | undefined
+  [propName: string]: unknown
 }
 
 /**
@@ -201,7 +196,7 @@ export interface JWSHeaderParameters extends JoseHeaderParameters {
   crit?: string[]
 
   /** Any other JWS Header member. */
-  [propName: string]: JsonValue | undefined
+  [propName: string]: unknown
 }
 
 /** Recognized JWE Key Management-related Header Parameters. */
@@ -309,7 +304,7 @@ export interface JWEHeaderParameters extends JoseHeaderParameters {
   zip?: string
 
   /** Any other JWE Header member. */
-  [propName: string]: JsonValue | undefined
+  [propName: string]: unknown
 }
 
 /** Shared Interface with a "crit" property for all sign, verify, encrypt and decrypt operations. */
@@ -483,7 +478,7 @@ export interface JWTPayload {
   iat?: number
 
   /** Any other JWT Claim Set member. */
-  [propName: string]: JsonValue | undefined
+  [propName: string]: unknown
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jose",
-  "version": "4.14.2",
+  "version": "4.14.4",
   "description": "'JSON Web Almost Everything' - JWA, JWS, JWE, JWT, JWK, JWKS for Node.js, Browser, Cloudflare Workers, Deno, Bun, and other Web-interoperable runtimes",
   "keywords": [
     "browser",
@@ -20,7 +20,6 @@
     "encrypt",
     "flattened",
     "general",
-    "isomorphic",
     "jose",
     "json web token",
     "jsonwebtoken",
@@ -43,11 +42,11 @@
     "sign",
     "signature",
     "spki",
-    "universal",
     "validate",
     "vercel",
     "verify",
     "webcrypto",
+    "workerd",
     "workers",
     "x509"
   ],

package/dist/browser/runtime/env.js

@@ -1,5 +0,0 @@
-export function isCloudflareWorkers() {
-    return (typeof WebSocketPair !== 'undefined' ||
-        (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers') ||
-        (typeof EdgeRuntime !== 'undefined' && EdgeRuntime === 'vercel'));
-}

package/dist/node/cjs/runtime/env.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCloudflareWorkers = void 0;
-function isCloudflareWorkers() {
-    return false;
-}
-exports.isCloudflareWorkers = isCloudflareWorkers;

package/dist/node/esm/runtime/env.js

@@ -1,3 +0,0 @@
-export function isCloudflareWorkers() {
-    return false;
-}