jose 4.11.2 → 4.11.4

package/README.md

@@ -38,7 +38,7 @@ const jose = require('jose')
 
 **`example`** Deno import
 ```js
-import * as jose from 'https://deno.land/x/jose@v4.11.2/index.ts'
+import * as jose from 'https://deno.land/x/jose@v4.11.4/index.ts'
 ```
 
 - JSON Web Tokens (JWT)

package/dist/browser/lib/crypto_key.js

@@ -71,13 +71,13 @@ export function checkSigCryptoKey(key, alg, ...usages) {
                 throw unusable(`SHA-${expected}`, 'algorithm.hash');
             break;
         }
-        case isCloudflareWorkers() && 'EdDSA': {
-            if (!isAlgorithm(key.algorithm, 'NODE-ED25519'))
-                throw unusable('NODE-ED25519');
-            break;
-        }
         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

@@ -57,7 +57,7 @@ const getNamedCurve = (keyData) => {
     }
 };
 const genericImport = async (replace, keyFormat, pem, alg, options) => {
-    var _a;
+    var _a, _b;
     let algorithm;
     let keyUsages;
     const keyData = new Uint8Array(atob(pem.replace(replace, ''))
@@ -108,12 +108,6 @@ const genericImport = async (replace, keyFormat, pem, alg, options) => {
             keyUsages = isPublic ? [] : ['deriveBits'];
             break;
         }
-        case isCloudflareWorkers() && 'EdDSA': {
-            const namedCurve = getNamedCurve(keyData).toUpperCase();
-            algorithm = { name: `NODE-${namedCurve}`, namedCurve: `NODE-${namedCurve}` };
-            keyUsages = isPublic ? ['verify'] : ['sign'];
-            break;
-        }
         case 'EdDSA':
             algorithm = { name: getNamedCurve(keyData) };
             keyUsages = isPublic ? ['verify'] : ['sign'];
@@ -121,7 +115,18 @@ const genericImport = async (replace, keyFormat, pem, alg, options) => {
         default:
             throw new JOSENotSupported('Invalid or unsupported "alg" (Algorithm) value');
     }
-    return crypto.subtle.importKey(keyFormat, keyData, algorithm, (_a = options === null || options === void 0 ? void 0 : options.extractable) !== null && _a !== void 0 ? _a : false, keyUsages);
+    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;
+    }
 };
 export const fromPKCS8 = (pem, alg, options) => {
     return genericImport(/(?:-----(?:BEGIN|END) PRIVATE KEY-----|\s)/g, 'pkcs8', pem, alg, options);

package/dist/browser/runtime/generate.js

@@ -51,7 +51,7 @@ function getModulusLengthOption(options) {
     return modulusLength;
 }
 export async function generateKeyPair(alg, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let algorithm;
     let keyUsages;
     switch (alg) {
@@ -101,17 +101,6 @@ export async function generateKeyPair(alg, options) {
             algorithm = { name: 'ECDSA', namedCurve: 'P-521' };
             keyUsages = ['sign', 'verify'];
             break;
-        case isCloudflareWorkers() && 'EdDSA':
-            switch (options === null || options === void 0 ? void 0 : options.crv) {
-                case undefined:
-                case 'Ed25519':
-                    algorithm = { name: 'NODE-ED25519', namedCurve: 'NODE-ED25519' };
-                    keyUsages = ['sign', 'verify'];
-                    break;
-                default:
-                    throw new JOSENotSupported('Invalid or unsupported crv option provided');
-            }
-            break;
         case 'EdDSA':
             keyUsages = ['sign', 'verify'];
             const crv = (_a = options === null || options === void 0 ? void 0 : options.crv) !== null && _a !== void 0 ? _a : 'Ed25519';
@@ -149,5 +138,16 @@ export async function generateKeyPair(alg, options) {
         default:
             throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
     }
-    return (crypto.subtle.generateKey(algorithm, (_c = options === null || options === void 0 ? void 0 : options.extractable) !== null && _c !== void 0 ? _c : false, keyUsages));
+    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;
+    }
 }

package/dist/browser/runtime/jwk_to_key.js

@@ -99,19 +99,6 @@ function subtleMapping(jwk) {
             }
             break;
         }
-        case isCloudflareWorkers() && 'OKP':
-            if (jwk.alg !== 'EdDSA') {
-                throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
-            }
-            switch (jwk.crv) {
-                case 'Ed25519':
-                    algorithm = { name: 'NODE-ED25519', namedCurve: 'NODE-ED25519' };
-                    keyUsages = jwk.d ? ['sign'] : ['verify'];
-                    break;
-                default:
-                    throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
-            }
-            break;
         case 'OKP': {
             switch (jwk.alg) {
                 case 'EdDSA':
@@ -149,6 +136,17 @@ const parse = async (jwk) => {
     const keyData = { ...jwk };
     delete keyData.alg;
     delete keyData.use;
-    return crypto.subtle.importKey('jwk', keyData, ...rest);
+    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;
+    }
 };
 export default parse;

package/dist/browser/runtime/subtle_dsa.js

@@ -19,10 +19,10 @@ export default function subtleDsa(alg, algorithm) {
         case 'ES384':
         case 'ES512':
             return { hash, name: 'ECDSA', namedCurve: algorithm.namedCurve };
-        case isCloudflareWorkers() && 'EdDSA':
-            const { namedCurve } = algorithm;
-            return { name: namedCurve, 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/lib/crypto_key.js

@@ -74,13 +74,13 @@ function checkSigCryptoKey(key, alg, ...usages) {
                 throw unusable(`SHA-${expected}`, 'algorithm.hash');
             break;
         }
-        case (0, env_js_1.isCloudflareWorkers)() && 'EdDSA': {
-            if (!isAlgorithm(key.algorithm, 'NODE-ED25519'))
-                throw unusable('NODE-ED25519');
-            break;
-        }
         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/lib/crypto_key.js

@@ -71,13 +71,13 @@ export function checkSigCryptoKey(key, alg, ...usages) {
                 throw unusable(`SHA-${expected}`, 'algorithm.hash');
             break;
         }
-        case isCloudflareWorkers() && 'EdDSA': {
-            if (!isAlgorithm(key.algorithm, 'NODE-ED25519'))
-                throw unusable('NODE-ED25519');
-            break;
-        }
         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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jose",
-  "version": "4.11.2",
+  "version": "4.11.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",
@@ -83,7 +83,8 @@
     "!dist/**/*.min.js",
     "!dist/node/webcrypto/**/*",
     "!dist/types/runtime/*",
-    "!dist/types/lib/*"
+    "!dist/types/lib/*",
+    "!dist/deno/**/*"
   ],
   "deno": "./dist/browser/index.js"
 }