@verii/jwt 1.0.0-pre.1752076816 → 1.0.0-pre.1753171788

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@verii/jwt",
-  "version": "1.0.0-pre.1752076816",
-  "description": "Set of JWT related functions used in Velocity Foundation projects",
+  "version": "1.0.0-pre.1753171788",
+  "description": "Set of JWT related functions used in Verii projects",
   "repository": "https://github.com/LFDT-Verii/core",
   "main": "index.js",
   "publishConfig": {
@@ -16,14 +16,15 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@trust/keyto": "~2.0.0-alpha1",
-    "@verii/crypto": "1.0.0-pre.1752076816",
+    "@verii/crypto": "1.0.0-pre.1753171788",
+    "canonicalize": "^2.1.0",
     "date-fns": "~3.6.0",
     "jose": "~5.10.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@verii/sample-data": "1.0.0-pre.1752076816",
-    "@verii/test-regexes": "1.0.0-pre.1752076816",
+    "@verii/sample-data": "1.0.0-pre.1753171788",
+    "@verii/test-regexes": "1.0.0-pre.1753171788",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "14.2.1",
     "eslint-config-prettier": "8.10.0",
@@ -42,5 +43,5 @@
       "lib"
     ]
   },
-  "gitHead": "5885ce94149cc0102b2bc9cde18834293174bfaf"
+  "gitHead": "e6116b2410d04efa61841268ab1b378e1c1c6060"
 }

package/src/core.js

@@ -21,9 +21,14 @@ const {
   calculateJwkThumbprint,
   decodeJwt,
   decodeProtectedHeader,
+  base64url,
 } = require('jose');
+const canonicalize = require('canonicalize');
+
+const utf8Decoder = new TextDecoder('utf-8');
 const keyto = require('@trust/keyto');
 const { flow, isString, startsWith, split, omit } = require('lodash/fp');
+const { KeyAlgorithms } = require('@verii/crypto');
 const {
   setIssuedAt,
   setOptionalNotBefore,
@@ -35,8 +40,11 @@ const {
   setOptionalSubject,
 } = require('./jwt-fp');
 
+const keyAlgorithmToJoseAlg = (keyAlgorithm = KeyAlgorithms.SECP256K1) =>
+  keyAlgorithm === KeyAlgorithms.SECP256K1 ? 'ES256K' : keyAlgorithm;
+
 const toKeyObject = (key, header) => {
-  const alg = header?.alg ?? key.alg ?? 'ES256K';
+  const alg = keyAlgorithmToJoseAlg(header?.alg ?? key.alg);
   return importJWK(key, alg);
 };
 
@@ -132,6 +140,13 @@ const jwkFromStringified = (key, priv = true) => {
   return k.toJwk(priv ? 'private' : 'public');
 };
 
+const base64UrlToJwk = (base64String) => {
+  const buffer = base64url.decode(base64String);
+  return JSON.parse(utf8Decoder.decode(buffer));
+};
+
+const jwkToPublicBase64Url = (json) => base64url.encode(canonicalize(json));
+
 const jwkThumbprint = calculateJwkThumbprint;
 
 const jwtHeaderDecode = decodeProtectedHeader;
@@ -187,11 +202,13 @@ const toJwk = (key, priv = true) => {
 const prepAlgAndKey = async (keyOrSecret, optionsAlg) =>
   isString(keyOrSecret)
     ? {
-        alg: optionsAlg ?? DEFAULT_SYMMETRIC_ALG,
+        alg: keyAlgorithmToJoseAlg(optionsAlg ?? DEFAULT_SYMMETRIC_ALG),
         key: new TextEncoder().encode(keyOrSecret),
       }
     : {
-        alg: keyOrSecret.alg ?? optionsAlg ?? DEFAULT_ASYMMETRIC_ALG,
+        alg: keyAlgorithmToJoseAlg(
+          keyOrSecret.alg ?? optionsAlg ?? DEFAULT_ASYMMETRIC_ALG
+        ),
         key: await toKeyObject(keyOrSecret),
       };
 
@@ -211,4 +228,7 @@ module.exports = {
   stringifyJwk,
   tamperJwt,
   toJwk,
+  base64UrlToJwk,
+  jwkToPublicBase64Url,
+  keyAlgorithmToJoseAlg,
 };

package/src/docs.js

@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-const { omit } = require('lodash/fp');
+const { pick } = require('lodash/fp');
 const { jwkFromSecp256k1Key, jwtSign } = require('./core');
 
 const DEFAULT_NOT_BEFORE = '0s';
+const PUBLIC_JWK_PROPS = ['x', 'y', 'e', 'n', 'kty', 'crv', 'use'];
 
 const docJti = (doc, options) => (options?.jti != null ? {} : { jti: doc.id });
 
 const headerKey = (jwk, kid) =>
-  kid != null ? { kid } : { jwk: omit(['d'], jwk) };
+  kid != null ? { kid } : { jwk: pick(PUBLIC_JWK_PROPS, jwk) };
 
 const generateDocJwt = (doc, key, { kid, ...options } = {}) => {
   const jwk = key.kty != null ? key : jwkFromSecp256k1Key(key);

package/src/vc-mappers.js

@@ -17,11 +17,20 @@
 
 const { omit } = require('lodash/fp');
 const { getUnixTime } = require('date-fns/fp');
+const { keyAlgorithmToJoseAlg } = require('./core');
 
 // Using credential structure as defined at: https://w3c.github.io/vc-imp-guide/ conformant to JWS JSON Serialization
 // https://www.rfc-editor.org/rfc/rfc7515#section-7.2.1,
-const jsonLdToUnsignedVcJwtContent = (jsonldCredential, kid) => {
-  const header = { kid, typ: 'JWT' };
+const jsonLdToUnsignedVcJwtContent = (
+  jsonldCredential,
+  signatureAlgorithm,
+  kid
+) => {
+  const header = {
+    kid,
+    alg: keyAlgorithmToJoseAlg(signatureAlgorithm),
+    typ: 'JWT',
+  };
   const iat = getUnixTime(
     new Date(
       jsonldCredential.issued ?? jsonldCredential.issuanceDate ?? new Date()

package/src/verifiable-generators.js

@@ -21,7 +21,7 @@ const { getExpirationISODate, getIssuerId } = require('./vc-mappers');
 
 // Using credential structure as defined at: https://w3c.github.io/vc-imp-guide/
 // Using JWT structure as defined at: https://www.w3.org/TR/vc-data-model/#json-web-token
-const generateCredentialJwt = (credentialWrapper, key, kid) => {
+const generateCredentialJwt = (credentialWrapper, key, kid, alg) => {
   const credential = unwrap('vc', credentialWrapper);
   const payload = {
     vc: {
@@ -36,21 +36,22 @@ const generateCredentialJwt = (credentialWrapper, key, kid) => {
     payload.sub_jwk = credential.credentialSubject.jwk;
   }
 
-  const options = {
+  const opts = {
     ...docJti(credential),
     ...iatAndNbf(credential),
     ...issCredential(credential),
     ...exp(credential),
     ...sub(credential),
     kid,
+    alg,
   };
 
-  return generateDocJwt(payload, key, options);
+  return generateDocJwt(payload, key, opts);
 };
 
 // Using presentation structure as defined at: https://w3c.github.io/vc-imp-guide/
 // Using JWT structure as defined at: https://www.w3.org/TR/vc-data-model/#json-web-token
-const generatePresentationJwt = (presentationWrapper, key, kid) => {
+const generatePresentationJwt = (presentationWrapper, key, kid, alg) => {
   const presentation = unwrap('vp', presentationWrapper);
   const payload = {
     vp: {
@@ -67,6 +68,7 @@ const generatePresentationJwt = (presentationWrapper, key, kid) => {
     ...issPresentation(presentation),
     ...aud(presentation),
     kid,
+    alg,
   };
 
   return generateDocJwt(payload, key, options);