From 2252d61593e9150b9ce9515512cc5bfe1a171ad9 Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Thu, 29 Jun 2023 16:19:30 +0400 Subject: [PATCH 1/9] Change version from develop --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 158dd8ec..03fb718a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@cheqd/credential-service", - "version": "2.4.0-develop.4", + "version": "2.4.0", "description": "cheqd Credential Service Backend", "source": "src/index.ts", "main": "dist/index.js", From e2e57e65fb80beb2a680d2970c3ad2d51f7f0fe4 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 29 Jun 2023 12:29:38 +0000 Subject: [PATCH 2/9] chore(release): 2.4.0 [skip ci] ## [2.4.0](https://github.com/cheqd/credential-service/compare/2.3.1...2.4.0) (2023-06-29) ### Features * Add "authenticated" user roles and permissions, and amend API definitions [DEV-2684] ([#267](https://github.com/cheqd/credential-service/issues/267)) ([2a6b30f](https://github.com/cheqd/credential-service/commit/2a6b30f93dba29f1738f298e535303437a9a1971)) ### Bug Fixes * Fix bug where credential-service expects config variables with authentication and external DB disabled [DEV-2843] ([#276](https://github.com/cheqd/credential-service/issues/276)) ([4008bdf](https://github.com/cheqd/credential-service/commit/4008bdfcc0e372af4b31a914e121c561da3ed63c)) * Fix for the order of auth handlers ([#275](https://github.com/cheqd/credential-service/issues/275)) ([6d3bb77](https://github.com/cheqd/credential-service/commit/6d3bb778c7e9884e66058941431da9a898025333)) * Fix local storage instantiating ([#269](https://github.com/cheqd/credential-service/issues/269)) ([6ec820f](https://github.com/cheqd/credential-service/commit/6ec820f83c6d1c9b0a34e0bde10bcec25a51c5ef)) --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90ca7989..e70c8332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [2.4.0](https://github.com/cheqd/credential-service/compare/2.3.1...2.4.0) (2023-06-29) + + +### Features + +* Add "authenticated" user roles and permissions, and amend API definitions [DEV-2684] ([#267](https://github.com/cheqd/credential-service/issues/267)) ([2a6b30f](https://github.com/cheqd/credential-service/commit/2a6b30f93dba29f1738f298e535303437a9a1971)) + + +### Bug Fixes + +* Fix bug where credential-service expects config variables with authentication and external DB disabled [DEV-2843] ([#276](https://github.com/cheqd/credential-service/issues/276)) ([4008bdf](https://github.com/cheqd/credential-service/commit/4008bdfcc0e372af4b31a914e121c561da3ed63c)) +* Fix for the order of auth handlers ([#275](https://github.com/cheqd/credential-service/issues/275)) ([6d3bb77](https://github.com/cheqd/credential-service/commit/6d3bb778c7e9884e66058941431da9a898025333)) +* Fix local storage instantiating ([#269](https://github.com/cheqd/credential-service/issues/269)) ([6ec820f](https://github.com/cheqd/credential-service/commit/6ec820f83c6d1c9b0a34e0bde10bcec25a51c5ef)) + ## [2.4.0-develop.4](https://github.com/cheqd/credential-service/compare/2.4.0-develop.3...2.4.0-develop.4) (2023-06-28) ## [2.4.0-develop.3](https://github.com/cheqd/credential-service/compare/2.4.0-develop.2...2.4.0-develop.3) (2023-06-27) From 02ded9e88e22fb5fb8b89f12c06207583abb8464 Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Thu, 29 Jun 2023 17:52:42 +0400 Subject: [PATCH 3/9] chore: Run release process --- example.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example.env b/example.env index 74e49c50..eed93edc 100644 --- a/example.env +++ b/example.env @@ -17,8 +17,8 @@ LOGTO_DEFAULT_RESOURCE_URL='http://localhost:8787' LOGTO_ENDPOINT='http://localhost:3001' LOGTO_APP_ID='ldfsr...rq432' LOGTO_APP_SECRET='sdf...sdf' -LOGTO_M2M_APP_ID="aaaa.....ddddd" -LOGTO_M2M_APP_SECRET="aaaa.....ddddd" +LOGTO_M2M_APP_ID="aaaa...ddddd" +LOGTO_M2M_APP_SECRET="aaaa...ddddd" LOGTO_MANAGEMENT_API="https://default.logto.app/api" COOKIE_SECRET='sdf...sdf' From 84ed8ed5cddd42d6bfd42f048cd9847604ea43a2 Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Thu, 29 Jun 2023 18:12:09 +0400 Subject: [PATCH 4/9] Debugging --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 875eb30b..059897cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -123,6 +123,10 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=min + + - name: Debug if fails + if: failure() + uses: mxschmitt/action-tmate@v3 - name: Push image to GitHub Container Registry run: docker image push --all-tags ghcr.io/${{ env.IMAGE_NAME }} From 8635c8e386bd70af132f31e76014091898bedfd4 Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Thu, 29 Jun 2023 18:33:30 +0400 Subject: [PATCH 5/9] Return back conventionalcommits version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03fb718a..7e244bf4 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "@typescript-eslint/eslint-plugin": "^5.60.1", "@typescript-eslint/parser": "^5.60.1", "buffer": "6.0.3", - "conventional-changelog-conventionalcommits": "^6.1.0", + "conventional-changelog-conventionalcommits": "^5.0.0", "eslint": "^8.43.0", "eslint-config-prettier": "^8.8.0", "eslint-config-typescript": "^3.0.0", From 2c650e91a97c2b27fc33d0e983308149b668c35c Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Thu, 29 Jun 2023 18:37:56 +0400 Subject: [PATCH 6/9] Fix package-lock.json --- package-lock.json | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad868db6..f839df04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@cheqd/credential-service", - "version": "2.4.0-develop.2", + "version": "2.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@cheqd/credential-service", - "version": "2.4.0-develop.2", + "version": "2.4.0", "license": "Apache-2.0", "dependencies": { "@cheqd/did-provider-cheqd": "3.3.1", @@ -65,7 +65,7 @@ "@typescript-eslint/eslint-plugin": "^5.60.1", "@typescript-eslint/parser": "^5.60.1", "buffer": "6.0.3", - "conventional-changelog-conventionalcommits": "^6.1.0", + "conventional-changelog-conventionalcommits": "^5.0.0", "eslint": "^8.43.0", "eslint-config-prettier": "^8.8.0", "eslint-config-typescript": "^3.0.0", @@ -13479,15 +13479,17 @@ } }, "node_modules/conventional-changelog-conventionalcommits": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-6.1.0.tgz", - "integrity": "sha512-3cS3GEtR78zTfMzk0AizXKKIdN4OvSh7ibNz6/DPbhWWQu7LqE/8+/GqSodV+sywUR2gpJAdP/1JFf4XtN7Zpw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-5.0.0.tgz", + "integrity": "sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==", "dev": true, "dependencies": { - "compare-func": "^2.0.0" + "compare-func": "^2.0.0", + "lodash": "^4.17.15", + "q": "^1.5.1" }, "engines": { - "node": ">=14" + "node": ">=10" } }, "node_modules/conventional-changelog-writer": { @@ -27314,6 +27316,16 @@ "node": ">=6.0.0" } }, + "node_modules/q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", + "dev": true, + "engines": { + "node": ">=0.6.0", + "teleport": ">=0.2.0" + } + }, "node_modules/qrcode": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.3.tgz", From 2352114e191499ffbc37e456ab8539c2f7fbbcb3 Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Fri, 30 Jun 2023 11:19:35 +0400 Subject: [PATCH 7/9] fix: Fix building image for release --- .github/workflows/release.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 059897cf..4edf8fba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -115,7 +115,7 @@ jobs: uses: docker/build-push-action@v4 with: context: . - file: Dockerfile + file: docker/Dockerfile platforms: linux/amd64 load: true target: runner @@ -123,10 +123,6 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=min - - - name: Debug if fails - if: failure() - uses: mxschmitt/action-tmate@v3 - name: Push image to GitHub Container Registry run: docker image push --all-tags ghcr.io/${{ env.IMAGE_NAME }} From f4945f9a7f6d858a039e92a7604aa425e8504458 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 30 Jun 2023 07:26:14 +0000 Subject: [PATCH 8/9] chore(release): 2.4.1 [skip ci] ## [2.4.1](https://github.com/cheqd/credential-service/compare/2.4.0...2.4.1) (2023-06-30) ### Bug Fixes * Fix building image for release ([2352114](https://github.com/cheqd/credential-service/commit/2352114e191499ffbc37e456ab8539c2f7fbbcb3)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e70c8332..76f71b08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.4.1](https://github.com/cheqd/credential-service/compare/2.4.0...2.4.1) (2023-06-30) + + +### Bug Fixes + +* Fix building image for release ([2352114](https://github.com/cheqd/credential-service/commit/2352114e191499ffbc37e456ab8539c2f7fbbcb3)) + ## [2.4.0](https://github.com/cheqd/credential-service/compare/2.3.1...2.4.0) (2023-06-29) diff --git a/package.json b/package.json index 7e244bf4..ef47f79b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@cheqd/credential-service", - "version": "2.4.0", + "version": "2.4.1", "description": "cheqd Credential Service Backend", "source": "src/index.ts", "main": "dist/index.js", From 183847f5f1f05077db4e35e72db64da17781e167 Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Fri, 30 Jun 2023 17:54:51 +0400 Subject: [PATCH 9/9] Back-merge from the main branch --- package-lock.json | 28 ++++++++-------------------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index f839df04..d4793b2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@cheqd/credential-service", - "version": "2.4.0", + "version": "2.4.0-develop.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@cheqd/credential-service", - "version": "2.4.0", + "version": "2.4.0-develop.4", "license": "Apache-2.0", "dependencies": { "@cheqd/did-provider-cheqd": "3.3.1", @@ -65,7 +65,7 @@ "@typescript-eslint/eslint-plugin": "^5.60.1", "@typescript-eslint/parser": "^5.60.1", "buffer": "6.0.3", - "conventional-changelog-conventionalcommits": "^5.0.0", + "conventional-changelog-conventionalcommits": "^6.1.0", "eslint": "^8.43.0", "eslint-config-prettier": "^8.8.0", "eslint-config-typescript": "^3.0.0", @@ -13479,17 +13479,15 @@ } }, "node_modules/conventional-changelog-conventionalcommits": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-5.0.0.tgz", - "integrity": "sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-6.1.0.tgz", + "integrity": "sha512-3cS3GEtR78zTfMzk0AizXKKIdN4OvSh7ibNz6/DPbhWWQu7LqE/8+/GqSodV+sywUR2gpJAdP/1JFf4XtN7Zpw==", "dev": true, "dependencies": { - "compare-func": "^2.0.0", - "lodash": "^4.17.15", - "q": "^1.5.1" + "compare-func": "^2.0.0" }, "engines": { - "node": ">=10" + "node": ">=14" } }, "node_modules/conventional-changelog-writer": { @@ -27316,16 +27314,6 @@ "node": ">=6.0.0" } }, - "node_modules/q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", - "dev": true, - "engines": { - "node": ">=0.6.0", - "teleport": ">=0.2.0" - } - }, "node_modules/qrcode": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.3.tgz", diff --git a/package.json b/package.json index ef47f79b..158dd8ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@cheqd/credential-service", - "version": "2.4.1", + "version": "2.4.0-develop.4", "description": "cheqd Credential Service Backend", "source": "src/index.ts", "main": "dist/index.js", @@ -99,7 +99,7 @@ "@typescript-eslint/eslint-plugin": "^5.60.1", "@typescript-eslint/parser": "^5.60.1", "buffer": "6.0.3", - "conventional-changelog-conventionalcommits": "^5.0.0", + "conventional-changelog-conventionalcommits": "^6.1.0", "eslint": "^8.43.0", "eslint-config-prettier": "^8.8.0", "eslint-config-typescript": "^3.0.0",