Merge branch 'feat/codecov' of https://github.com/cre8/sd-jwt-js into…

… feat/codecov
cre8 · Feb 21, 2024 · 3377fc8 · 3377fc8
2 parents 4e309f0 + 940f066
commit 3377fc8
Show file tree

Hide file tree

Showing 57 changed files with 271 additions and 175 deletions.
diff --git a/.github/workflows/build-test-publish-on-push-cached.yaml b/.github/workflows/build-test-publish-on-push-cached.yaml
@@ -60,7 +60,7 @@ jobs:
           cache: 'pnpm'
       - name: 'Run node'
         run: pnpm test
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage-artifacts
           path: coverage/
@@ -73,7 +73,7 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: coverage-artifacts
           path: coverage
@@ -115,18 +115,18 @@ jobs:
       - test
       # - lint
     env:
-      NPM_TOKEN: ${{secrets.NPM_TOKEN}}
-      NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-      GH_TOKEN: ${{secrets.GH_TOKEN}}
-      GITHUB_TOKEN: ${{secrets.GH_TOKEN}}
-      GH_USER: ${{secrets.GH_USER}}
-      GH_EMAIL: ${{secrets.GH_EMAIL}}
+      NPM_TOKEN: ${{secrets.NPM_TOKEN }}
+      NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN }}
+      GH_TOKEN: ${{secrets.GITHUB_TOKEN }}
+      GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }}
+      GH_USER: github-actions
+      GH_EMAIL: [email protected]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{secrets.GH_TOKEN}}
+          token: ${{secrets.GITHUB_TOKEN }}
       - uses: pnpm/action-setup@v3
         with:
           version: 8
@@ -147,16 +147,16 @@ jobs:
 
       - name: 'Setup git coordinates'
         run: |
-          git remote set-url origin https://${{secrets.GH_USER}}:${{secrets.GH_TOKEN}}@github.com/${{ github.repository }}.git
+          git remote set-url origin https://${{github.actor}}:${{secrets.GITHUB_TOKEN}}@github.com/${{ github.repository }}.git
           git config user.name $GH_USER
           git config user.email $GH_EMAIL
 
       - name: 'Setup npm registry'
         run: |
-          echo "@veramo:registry=https://registry.npmjs.org/" > .npmrc
+          echo "@bcrl:registry=https://registry.npmjs.org/" > .npmrc
           echo "registry=https://registry.npmjs.org/" >> .npmrc
           echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
-          npm whoami
+        # npm whoami
 
       - name: 'Publish @latest when on main'
         if: github.ref == 'refs/heads/main'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.1.0](https://github.com/openwallet-foundation-labs/sd-jwt-js/compare/v2.0.1...v2.1.0) (2024-02-21)
+
+
+### Bug Fixes
+
+* add correct urls ([edb6bbb](https://github.com/openwallet-foundation-labs/sd-jwt-js/commit/edb6bbb0cd73c4b0ec6d650af12b31dadd1b5142))
+* test ci ([9940152](https://github.com/openwallet-foundation-labs/sd-jwt-js/commit/9940152227b384baff0a0db9448adf5555a887d9))
+* the bytes of the output of the hash function must be base64url-encoded. ([#57](https://github.com/openwallet-foundation-labs/sd-jwt-js/issues/57)) ([025786b](https://github.com/openwallet-foundation-labs/sd-jwt-js/commit/025786bd76415195e5daff0c5f2270ece31bd963))
+
+
+### Features
+
+* Apply lerna to move src to core ([#67](https://github.com/openwallet-foundation-labs/sd-jwt-js/issues/67)) ([c4d555c](https://github.com/openwallet-foundation-labs/sd-jwt-js/commit/c4d555c3ca61e83eb4703cd8cda75a9c261e2915))
+* use tsup as a bundler ([#62](https://github.com/openwallet-foundation-labs/sd-jwt-js/issues/62)) ([e1ae323](https://github.com/openwallet-foundation-labs/sd-jwt-js/commit/e1ae323023031e3defea20ec8ce9c56c2f1a7ea6))
+
+
+
+
+
+
 ## [2.0.3](https://github.com/openwallet-foundation-labs/sd-jwt-js/compare/v2.0.2...v2.0.3) (2024-02-20)
 
 

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -2,8 +2,8 @@
 
 | Maintainer        | GitHub ID        | LFID      | Email                 | Chat ID     | Company Affiliation | Scope     |
 | ----------------- | ---------------- | --------- | --------------------- | ----------- | ------------------- | --------- |
-| Ace               | pensivej         | -         | Ace@hopae.io          | Ace         | Hopae Inc.          | sd-jwt-js |
-| Gavin             | zustkeeper       | -         | Gavin@hopae.io        | Gavin       | Hopae Inc.          | sd-jwt-js |
+| Ace               | pensivej         | -         | Ace@bcrl.io           | Ace         | Hopae Inc.          | sd-jwt-js |
+| Gavin             | zustkeeper       | -         | Gavin@bcrl.io         | Gavin       | Hopae Inc.          | sd-jwt-js |
 | Lukas             | lukasjhan        | Lukas.Han | [email protected] | lukas.j.han | Hopae Inc.          | sd-jwt-js |
 | Berend Sliedrecht | berendsliedrecht | beri14    | [email protected]  | -           | Animo Solutions     | sd-jwt-js |
 

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ By adhering to these design principles, "Selective Disclosure for JWT" aims to s
 To install this project, run the following command:
 
 ```bash
-npm install @hopae/sd-jwt
+npm install @bcrl/sd-jwt
 ```
 
 Ensure you have Node.js installed as a prerequisite.
@@ -53,7 +53,7 @@ Ensure you have Node.js installed as a prerequisite.
 Here's a basic example of how to use this library:
 
 ```jsx
-import sdjwt, { DisclosureFrame } from '@hopae/sd-jwt';
+import sdjwt, { DisclosureFrame } from '@bcrl/sd-jwt';
 
 // Issuer defines the claims object with the user's information
 const claims = {

diff --git a/docs/index.html b/docs/index.html
@@ -73,7 +73,7 @@ <h2 class="text-2xl font-bold mb-4">Installation</h2>
       </p>
       <p class="mb-4">
         <div class="bg-gray-800 text-blue-200 font-mono text-sm p-4 rounded-lg overflow-x-auto my-6">
-          <pre>$ npm install @hopae/sd-jwt</pre>
+          <pre>$ npm install @bcrl/sd-jwt</pre>
         </div>
       </p>
       <div class="flex justify-center items-center gap-4 pb-6">

diff --git a/examples/core-example/all.ts b/examples/core-example/all.ts
@@ -1,5 +1,5 @@
-import { SDJwtInstance } from '@hopae/sd-jwt-core';
-import { DisclosureFrame } from '@hopae/sd-jwt-type';
+import { SDJwtInstance } from '@bcrl/sd-jwt-core';
+import { DisclosureFrame } from '@bcrl/sd-jwt-type';
 import { createSignerVerifier, digest, generateSalt } from './utils';
 
 (async () => {

diff --git a/examples/core-example/basic.ts b/examples/core-example/basic.ts
@@ -1,5 +1,5 @@
-import { SDJwtInstance } from '@hopae/sd-jwt-core';
-import { DisclosureFrame } from '@hopae/sd-jwt-type';
+import { SDJwtInstance } from '@bcrl/sd-jwt-core';
+import { DisclosureFrame } from '@bcrl/sd-jwt-type';
 import { createSignerVerifier, digest, generateSalt } from './utils';
 
 (async () => {

diff --git a/examples/core-example/custom.ts b/examples/core-example/custom.ts
@@ -1,5 +1,5 @@
-import { SDJwtInstance } from '@hopae/sd-jwt-core';
-import { DisclosureFrame } from '@hopae/sd-jwt-type';
+import { SDJwtInstance } from '@bcrl/sd-jwt-core';
+import { DisclosureFrame } from '@bcrl/sd-jwt-type';
 import { createSignerVerifier, digest, generateSalt } from './utils';
 
 (async () => {

diff --git a/examples/core-example/custom_header.ts b/examples/core-example/custom_header.ts
@@ -1,5 +1,5 @@
-import { SDJwtInstance } from '@hopae/sd-jwt-core';
-import { DisclosureFrame } from '@hopae/sd-jwt-type';
+import { SDJwtInstance } from '@bcrl/sd-jwt-core';
+import { DisclosureFrame } from '@bcrl/sd-jwt-type';
 import { createSignerVerifier, digest, generateSalt } from './utils';
 
 (async () => {

diff --git a/examples/core-example/decode.ts b/examples/core-example/decode.ts
@@ -1,4 +1,4 @@
-import { SDJwtInstance } from '@hopae/sd-jwt-core';
+import { SDJwtInstance } from '@bcrl/sd-jwt-core';
 import { createSignerVerifier, digest, generateSalt } from './utils';
 
 (async () => {

diff --git a/examples/core-example/decoy.ts b/examples/core-example/decoy.ts
@@ -1,5 +1,5 @@
-import { SDJwtInstance } from '@hopae/sd-jwt-core';
-import { DisclosureFrame } from '@hopae/sd-jwt-type';
+import { SDJwtInstance } from '@bcrl/sd-jwt-core';
+import { DisclosureFrame } from '@bcrl/sd-jwt-type';
 import { createSignerVerifier, digest, generateSalt } from './utils';
 
 (async () => {

diff --git a/examples/core-example/kb.ts b/examples/core-example/kb.ts
@@ -1,5 +1,5 @@
-import { SDJwtInstance } from '@hopae/sd-jwt-core';
-import { DisclosureFrame } from '@hopae/sd-jwt-type';
+import { SDJwtInstance } from '@bcrl/sd-jwt-core';
+import { DisclosureFrame } from '@bcrl/sd-jwt-type';
 import { createSignerVerifier, digest, generateSalt } from './utils';
 
 (async () => {

diff --git a/examples/core-example/package.json b/examples/core-example/package.json
@@ -23,7 +23,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@hopae/sd-jwt-core": "workspace:*",
-    "@hopae/sd-jwt-type": "workspace:*"
+    "@bcrl/sd-jwt-core": "workspace:*",
+    "@bcrl/sd-jwt-type": "workspace:*"
   }
 }
diff --git a/examples/core-example/sdjwtobject.ts b/examples/core-example/sdjwtobject.ts
@@ -1,5 +1,5 @@
-import { SDJwtInstance } from '@hopae/sd-jwt-core';
-import { DisclosureFrame } from '@hopae/sd-jwt-type';
+import { SDJwtInstance } from '@bcrl/sd-jwt-core';
+import { DisclosureFrame } from '@bcrl/sd-jwt-type';
 import { createSignerVerifier, digest, generateSalt } from './utils';
 
 (async () => {

diff --git a/examples/core-example/utils.ts b/examples/core-example/utils.ts
@@ -1,5 +1,5 @@
 import Crypto from 'crypto';
-import { Signer, Verifier } from '@hopae/sd-jwt-type';
+import { Signer, Verifier } from '@bcrl/sd-jwt-type';
 
 export const createSignerVerifier = () => {
   const { privateKey, publicKey } = Crypto.generateKeyPairSync('ed25519');

diff --git a/examples/decode-example/decode.ts b/examples/decode-example/decode.ts
@@ -1,5 +1,5 @@
-import { decodeSdJwt, getClaims } from '@hopae/sd-jwt-decode';
-import { digest } from '@hopae/sd-jwt-node-crypto';
+import { decodeSdJwt, getClaims } from '@bcrl/sd-jwt-decode';
+import { digest } from '@bcrl/sd-jwt-node-crypto';
 
 (async () => {
   const sdjwt =

diff --git a/examples/decode-example/package.json b/examples/decode-example/package.json
@@ -16,8 +16,8 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@hopae/sd-jwt-decode": "workspace:*",
-    "@hopae/sd-jwt-type": "workspace:*",
-    "@hopae/sd-jwt-node-crypto": "workspace:*"
+    "@bcrl/sd-jwt-decode": "workspace:*",
+    "@bcrl/sd-jwt-type": "workspace:*",
+    "@bcrl/sd-jwt-node-crypto": "workspace:*"
   }
 }
diff --git a/examples/present-example/package.json b/examples/present-example/package.json
@@ -16,9 +16,9 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@hopae/sd-jwt-present": "workspace:*",
-    "@hopae/sd-jwt-decode": "workspace:*",
-    "@hopae/sd-jwt-type": "workspace:*",
-    "@hopae/sd-jwt-node-crypto": "workspace:*"
+    "@bcrl/sd-jwt-present": "workspace:*",
+    "@bcrl/sd-jwt-decode": "workspace:*",
+    "@bcrl/sd-jwt-type": "workspace:*",
+    "@bcrl/sd-jwt-node-crypto": "workspace:*"
   }
 }
diff --git a/examples/present-example/present.ts b/examples/present-example/present.ts
@@ -1,6 +1,6 @@
-import { present, presentableKeys } from '@hopae/sd-jwt-present';
-import { decodeSdJwt, getClaims } from '@hopae/sd-jwt-decode';
-import { digest } from '@hopae/sd-jwt-node-crypto';
+import { present, presentableKeys } from '@bcrl/sd-jwt-present';
+import { decodeSdJwt, getClaims } from '@bcrl/sd-jwt-decode';
+import { digest } from '@bcrl/sd-jwt-node-crypto';
 
 (async () => {
   const sdjwt =

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "npmClient": "pnpm",
   "exact": true,
   "message": "chore(release): %s",
@@ -9,7 +9,8 @@
   ],
   "command": {
     "publish": {
-      "conventionalCommits": true
+      "conventionalCommits": true,
+      "access": "public"
     }
   }
 }
diff --git a/package.json b/package.json
@@ -1,15 +1,19 @@
 {
-  "name": "@hopae/sd-jwt",
+  "name": "@bcrl/sd-jwt",
   "version": "2.0.1",
   "description": "sd-jwt draft 7 implementation in typescript",
   "scripts": {
     "build": "lerna run build --stream",
     "lint": "lerna run lint --stream",
     "test": "vitest run --coverage",
     "clean": "lerna clean -y",
-    "publish:latest": "lerna publish --conventional-commits --include-merged-tags --create-release github --yes --dist-tag latest",
-    "publish:next": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid next --pre-dist-tag next --yes",
-    "publish:unstable": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes"
+    "publish:latest": "lerna publish --no-private --conventional-commits --include-merged-tags --create-release github --yes --dist-tag latest",
+    "publish:next": "lerna publish --no-private --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid next --pre-dist-tag next --yes",
+    "publish:unstable": "lerna publish --no-private --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
   },
   "keywords": [
     "sd-jwt",

diff --git a/packages/broswer-crypto/CHANGELOG.md b/packages/broswer-crypto/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.1.0](https://github.com/openwallet-foundation-labs/sd-jwt-js/compare/v2.0.1...v2.1.0) (2024-02-21)
+
+**Note:** Version bump only for package @bcrl/sd-jwt-browser-crypto
+
+
+
+
+
+
 ## [2.0.3](https://github.com/openwallet-foundation-labs/sd-jwt-js/compare/v2.0.2...v2.0.3) (2024-02-20)
 
-**Note:** Version bump only for package @hopae/sd-jwt-browser-crypto
+**Note:** Version bump only for package @bcrl/sd-jwt-browser-crypto
diff --git a/packages/broswer-crypto/package.json b/packages/broswer-crypto/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@hopae/sd-jwt-browser-crypto",
-  "version": "2.0.3",
+  "name": "@bcrl/sd-jwt-browser-crypto",
+  "version": "2.1.0",
   "description": "sd-jwt draft 7 implementation in typescript",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.1.0](https://github.com/openwallet-foundation-labs/sd-jwt-js/compare/v2.0.1...v2.1.0) (2024-02-21)
+
+
+### Features
+
+* Apply lerna to move src to core ([#67](https://github.com/openwallet-foundation-labs/sd-jwt-js/issues/67)) ([c4d555c](https://github.com/openwallet-foundation-labs/sd-jwt-js/commit/c4d555c3ca61e83eb4703cd8cda75a9c261e2915))
+
+
+
+
+
+
 ## [2.0.3](https://github.com/openwallet-foundation-labs/sd-jwt-js/compare/v2.0.2...v2.0.3) (2024-02-20)
 
-**Note:** Version bump only for package @hopae/sd-jwt-core
+**Note:** Version bump only for package @bcrl/sd-jwt-core
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@hopae/sd-jwt-core",
-  "version": "2.0.3",
+  "name": "@bcrl/sd-jwt-core",
+  "version": "2.1.0",
   "description": "sd-jwt draft 7 implementation in typescript",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -36,12 +36,12 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@hopae/sd-jwt-node-crypto": "2.0.3"
+    "@bcrl/sd-jwt-node-crypto": "2.1.0"
   },
   "dependencies": {
-    "@hopae/sd-jwt-decode": "2.0.3",
-    "@hopae/sd-jwt-type": "2.0.3",
-    "@hopae/sd-jwt-util": "2.0.3"
+    "@bcrl/sd-jwt-decode": "2.1.0",
+    "@bcrl/sd-jwt-type": "2.1.0",
+    "@bcrl/sd-jwt-util": "2.1.0"
   },
   "tsup": {
     "entry": [

diff --git a/packages/core/src/decoy.ts b/packages/core/src/decoy.ts
@@ -1,5 +1,5 @@
-import { HasherAndAlg, SaltGenerator } from '@hopae/sd-jwt-type';
-import { Uint8ArrayToBase64Url } from '@hopae/sd-jwt-util';
+import { HasherAndAlg, SaltGenerator } from '@bcrl/sd-jwt-type';
+import { Uint8ArrayToBase64Url } from '@bcrl/sd-jwt-util';
 
 // This function creates a decoy value that can be used to obscure SD JWT payload.
 // The value is basically a hash of a random salt. So the value is not predictable.

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,4 +1,4 @@
-import { SDJWTException } from '@hopae/sd-jwt-util';
+import { SDJWTException } from '@bcrl/sd-jwt-util';
 import { Jwt } from './jwt';
 import { KBJwt } from './kbjwt';
 import { SDJwt, pack } from './sdjwt';
@@ -9,7 +9,7 @@ import {
   SDJWTCompact,
   SDJWTConfig,
   SD_JWT_TYP,
-} from '@hopae/sd-jwt-type';
+} from '@bcrl/sd-jwt-type';
 
 export * from './sdjwt';
 export * from './kbjwt';

diff --git a/packages/core/src/jwt.ts b/packages/core/src/jwt.ts
@@ -1,6 +1,6 @@
-import { Base64urlEncode, SDJWTException } from '@hopae/sd-jwt-util';
-import { Base64urlString, Signer, Verifier } from '@hopae/sd-jwt-type';
-import { decodeJwt } from '@hopae/sd-jwt-decode';
+import { Base64urlEncode, SDJWTException } from '@bcrl/sd-jwt-util';
+import { Base64urlString, Signer, Verifier } from '@bcrl/sd-jwt-type';
+import { decodeJwt } from '@bcrl/sd-jwt-decode';
 
 export type JwtData<
   Header extends Record<string, any>,