From 32e5e0b1f04f9d0272cd828a2fb3379111013e99 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 28 May 2022 08:15:04 +0000 Subject: [PATCH 1/3] chore: update lockfile --- pnpm-lock.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3ebe8c531..efde4e3a9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,7 +23,7 @@ importers: packages/browser: specifiers: '@jest/types': ^27.5.1 - '@logto/js': ^0.1.7 + '@logto/js': ^0.1.10 '@silverhand/eslint-config': ^0.14.0 '@silverhand/essentials': ^1.1.6 '@silverhand/ts-config': ^0.14.0 @@ -69,7 +69,7 @@ importers: packages/browser-sample: specifiers: - '@logto/browser': ^0.1.7 + '@logto/browser': ^0.1.10 '@parcel/core': ^2.3.2 '@parcel/transformer-sass': ^2.3.2 '@silverhand/eslint-config': ^0.14.0 @@ -156,7 +156,7 @@ importers: packages/react: specifiers: '@jest/types': ^27.5.1 - '@logto/browser': ^0.1.7 + '@logto/browser': ^0.1.10 '@silverhand/eslint-config': ^0.14.0 '@silverhand/eslint-config-react': ^0.14.0 '@silverhand/essentials': ^1.1.6 @@ -198,7 +198,7 @@ importers: packages/react-sample: specifiers: - '@logto/react': ^0.1.9 + '@logto/react': ^0.1.10 '@parcel/core': ^2.3.2 '@parcel/transformer-sass': ^2.3.2 '@silverhand/eslint-config': ^0.14.0 @@ -246,7 +246,7 @@ importers: packages/vue: specifiers: '@jest/types': ^27.5.1 - '@logto/browser': ^0.1.7 + '@logto/browser': ^0.1.10 '@silverhand/eslint-config': ^0.14.0 '@silverhand/ts-config': ^0.14.0 '@types/jest': ^27.4.1 @@ -278,7 +278,7 @@ importers: packages/vue-sample: specifiers: - '@logto/vue': ^0.1.9 + '@logto/vue': ^0.1.10 '@rushstack/eslint-patch': ^1.1.0 '@types/node': ^16.11.27 '@vitejs/plugin-vue': ^2.3.1 From 71cb40098b384f81d85cdd2df9bc5816d3f4d75c Mon Sep 17 00:00:00 2001 From: Charles Zhao Date: Sat, 28 May 2022 19:31:31 +0800 Subject: [PATCH 2/3] refactor(js): improve error data type in callback URI verification --- packages/js/src/utils/callback-uri.test.ts | 4 ++-- packages/js/src/utils/callback-uri.ts | 16 +++++++++------- packages/js/src/utils/errors.test.ts | 4 +++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/js/src/utils/callback-uri.test.ts b/packages/js/src/utils/callback-uri.test.ts index b14885483..b4e4df779 100644 --- a/packages/js/src/utils/callback-uri.test.ts +++ b/packages/js/src/utils/callback-uri.test.ts @@ -1,5 +1,5 @@ import { verifyAndParseCodeFromCallbackUri } from './callback-uri'; -import { LogtoError } from './errors'; +import { LogtoError, OidcError } from './errors'; const code = 'some_code'; const state = 'some_state'; @@ -23,7 +23,7 @@ describe('verifyAndParseCodeFromCallbackUri', () => { test('callback uri, containing error parameter, should throw', () => { const callbackUrl = `http://localhost:3000/callback?code=${code}&state=${state}&error=${error}`; expect(() => verifyAndParseCodeFromCallbackUri(callbackUrl, redirectUri, state)).toMatchError( - new LogtoError('callback_uri_verification.error_found', { error, errorDescription: null }) + new LogtoError('callback_uri_verification.error_found', new OidcError(error)) ); }); diff --git a/packages/js/src/utils/callback-uri.ts b/packages/js/src/utils/callback-uri.ts index bb7ab32a4..11d8bd391 100644 --- a/packages/js/src/utils/callback-uri.ts +++ b/packages/js/src/utils/callback-uri.ts @@ -1,5 +1,7 @@ +import { conditional } from '@silverhand/essentials'; + import { QueryKey } from '../consts'; -import { LogtoError } from './errors'; +import { LogtoError, OidcError } from './errors'; export const parseUriParameters = (uri: string) => { const [, queryString = ''] = uri.split('?'); @@ -18,14 +20,14 @@ export const verifyAndParseCodeFromCallbackUri = ( } const uriParameters = parseUriParameters(callbackUri); - const error = uriParameters.get(QueryKey.Error); - const errorDescription = uriParameters.get(QueryKey.ErrorDescription); + const error = conditional(uriParameters.get(QueryKey.Error)); + const errorDescription = conditional(uriParameters.get(QueryKey.ErrorDescription)); if (error) { - throw new LogtoError('callback_uri_verification.error_found', { - error, - errorDescription, - }); + throw new LogtoError( + 'callback_uri_verification.error_found', + new OidcError(error, errorDescription) + ); } const stateFromCallbackUri = uriParameters.get(QueryKey.State); diff --git a/packages/js/src/utils/errors.test.ts b/packages/js/src/utils/errors.test.ts index dd930d945..649807ece 100644 --- a/packages/js/src/utils/errors.test.ts +++ b/packages/js/src/utils/errors.test.ts @@ -1,3 +1,4 @@ +import { OidcError } from '.'; import { LogtoError, LogtoErrorCode, LogtoRequestError } from './errors'; describe('LogtoError', () => { @@ -15,10 +16,11 @@ describe('LogtoError', () => { const code: LogtoErrorCode = 'callback_uri_verification'; const error = 'error_value'; const errorDescription = 'error_description_content'; - const logtoError = new LogtoError(code, { error, errorDescription }); + const logtoError = new LogtoError(code, new OidcError(error, errorDescription)); expect(logtoError).toHaveProperty('code', code); expect(logtoError).toHaveProperty('message', code); expect(logtoError).toHaveProperty('data', { error, errorDescription }); + expect(logtoError.data).toBeInstanceOf(OidcError); }); }); From fb6df238f56049607af2c3b88bee07ba2aa45dae Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 28 May 2022 14:30:16 +0000 Subject: [PATCH 3/3] release: v0.1.11 --- CHANGELOG.md | 8 ++++++++ lerna.json | 2 +- packages/browser-sample/CHANGELOG.md | 8 ++++++++ packages/browser-sample/package.json | 4 ++-- packages/browser/CHANGELOG.md | 8 ++++++++ packages/browser/package.json | 4 ++-- packages/js/CHANGELOG.md | 8 ++++++++ packages/js/package.json | 2 +- packages/react-sample/CHANGELOG.md | 8 ++++++++ packages/react-sample/package.json | 4 ++-- packages/react/CHANGELOG.md | 8 ++++++++ packages/react/package.json | 4 ++-- packages/vue-sample/CHANGELOG.md | 8 ++++++++ packages/vue-sample/package.json | 4 ++-- packages/vue/CHANGELOG.md | 8 ++++++++ packages/vue/package.json | 4 ++-- 16 files changed, 78 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1786ceddc..4f99db43e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [0.1.11](https://github.com/logto-io/js/compare/v0.1.10...v0.1.11) (2022-05-28) + +**Note:** Version bump only for package root + + + + + ### [0.1.10](https://github.com/logto-io/js/compare/v0.1.9...v0.1.10) (2022-05-28) diff --git a/lerna.json b/lerna.json index fbebeb8c1..9275cb744 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.1.10", + "version": "0.1.11", "npmClient": "pnpm", "useWorkspaces": true, "changelogPreset": "conventionalcommits" diff --git a/packages/browser-sample/CHANGELOG.md b/packages/browser-sample/CHANGELOG.md index 70e3c60d1..e9d9970e0 100644 --- a/packages/browser-sample/CHANGELOG.md +++ b/packages/browser-sample/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [0.1.11](https://github.com/logto-io/js/compare/v0.1.10...v0.1.11) (2022-05-28) + +**Note:** Version bump only for package @logto/browser-sample + + + + + ### [0.1.10](https://github.com/logto-io/js/compare/v0.1.9...v0.1.10) (2022-05-28) **Note:** Version bump only for package @logto/browser-sample diff --git a/packages/browser-sample/package.json b/packages/browser-sample/package.json index a89ca2428..830bdcf21 100644 --- a/packages/browser-sample/package.json +++ b/packages/browser-sample/package.json @@ -1,6 +1,6 @@ { "name": "@logto/browser-sample", - "version": "0.1.10", + "version": "0.1.11", "license": "MIT", "private": true, "scripts": { @@ -12,7 +12,7 @@ "stylelint": "stylelint \"src/**/*.scss\"" }, "dependencies": { - "@logto/browser": "^0.1.10" + "@logto/browser": "^0.1.11" }, "devDependencies": { "@parcel/core": "^2.3.2", diff --git a/packages/browser/CHANGELOG.md b/packages/browser/CHANGELOG.md index 341c975d7..a7e35d668 100644 --- a/packages/browser/CHANGELOG.md +++ b/packages/browser/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [0.1.11](https://github.com/logto-io/js/compare/v0.1.10...v0.1.11) (2022-05-28) + +**Note:** Version bump only for package @logto/browser + + + + + ### [0.1.10](https://github.com/logto-io/js/compare/v0.1.9...v0.1.10) (2022-05-28) **Note:** Version bump only for package @logto/browser diff --git a/packages/browser/package.json b/packages/browser/package.json index ad0d4efdf..90cd050cd 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -1,6 +1,6 @@ { "name": "@logto/browser", - "version": "0.1.10", + "version": "0.1.11", "main": "./lib/index.js", "exports": "./lib/index.js", "typings": "./lib/index.d.ts", @@ -24,7 +24,7 @@ "prepack": "pnpm test" }, "dependencies": { - "@logto/js": "^0.1.10", + "@logto/js": "^0.1.11", "@silverhand/essentials": "^1.1.6", "jose": "^4.5.0", "lodash.get": "^4.4.2", diff --git a/packages/js/CHANGELOG.md b/packages/js/CHANGELOG.md index 921355b1b..810ef9e6e 100644 --- a/packages/js/CHANGELOG.md +++ b/packages/js/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [0.1.11](https://github.com/logto-io/js/compare/v0.1.10...v0.1.11) (2022-05-28) + +**Note:** Version bump only for package @logto/js + + + + + ### [0.1.10](https://github.com/logto-io/js/compare/v0.1.9...v0.1.10) (2022-05-28) diff --git a/packages/js/package.json b/packages/js/package.json index aa22d94e1..9597f2b75 100644 --- a/packages/js/package.json +++ b/packages/js/package.json @@ -1,6 +1,6 @@ { "name": "@logto/js", - "version": "0.1.10", + "version": "0.1.11", "main": "./lib/index.js", "exports": "./lib/index.js", "typings": "./lib/index.d.ts", diff --git a/packages/react-sample/CHANGELOG.md b/packages/react-sample/CHANGELOG.md index 5e9270d95..332e1dcbe 100644 --- a/packages/react-sample/CHANGELOG.md +++ b/packages/react-sample/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [0.1.11](https://github.com/logto-io/js/compare/v0.1.10...v0.1.11) (2022-05-28) + +**Note:** Version bump only for package @logto/react-sample + + + + + ### [0.1.10](https://github.com/logto-io/js/compare/v0.1.9...v0.1.10) (2022-05-28) **Note:** Version bump only for package @logto/react-sample diff --git a/packages/react-sample/package.json b/packages/react-sample/package.json index f9a0d4acf..90327636c 100644 --- a/packages/react-sample/package.json +++ b/packages/react-sample/package.json @@ -1,6 +1,6 @@ { "name": "@logto/react-sample", - "version": "0.1.10", + "version": "0.1.11", "license": "MIT", "private": true, "scripts": { @@ -13,7 +13,7 @@ "stylelint": "stylelint \"src/**/*.scss\"" }, "dependencies": { - "@logto/react": "^0.1.10", + "@logto/react": "^0.1.11", "react": "^17.0.2", "react-dom": "^17.0.2", "react-router-dom": "^6.2.2" diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 8f3544c71..95c551054 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [0.1.11](https://github.com/logto-io/js/compare/v0.1.10...v0.1.11) (2022-05-28) + +**Note:** Version bump only for package @logto/react + + + + + ### [0.1.10](https://github.com/logto-io/js/compare/v0.1.9...v0.1.10) (2022-05-28) **Note:** Version bump only for package @logto/react diff --git a/packages/react/package.json b/packages/react/package.json index 32fb29092..e03cda9b9 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@logto/react", - "version": "0.1.10", + "version": "0.1.11", "main": "./lib/index.js", "exports": "./lib/index.js", "typings": "./lib/index.d.ts", @@ -24,7 +24,7 @@ "prepack": "pnpm test" }, "dependencies": { - "@logto/browser": "^0.1.10", + "@logto/browser": "^0.1.11", "@silverhand/essentials": "^1.1.6" }, "devDependencies": { diff --git a/packages/vue-sample/CHANGELOG.md b/packages/vue-sample/CHANGELOG.md index b9fca1f18..41b85163f 100644 --- a/packages/vue-sample/CHANGELOG.md +++ b/packages/vue-sample/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [0.1.11](https://github.com/logto-io/js/compare/v0.1.10...v0.1.11) (2022-05-28) + +**Note:** Version bump only for package @logto/vue-sample + + + + + ### [0.1.10](https://github.com/logto-io/js/compare/v0.1.9...v0.1.10) (2022-05-28) **Note:** Version bump only for package @logto/vue-sample diff --git a/packages/vue-sample/package.json b/packages/vue-sample/package.json index 0f574f24e..7cd226f43 100644 --- a/packages/vue-sample/package.json +++ b/packages/vue-sample/package.json @@ -1,6 +1,6 @@ { "name": "@logto/vue-sample", - "version": "0.1.10", + "version": "0.1.11", "license": "MIT", "private": true, "scripts": { @@ -12,7 +12,7 @@ "lint": "eslint --ext .vue,.ts src" }, "dependencies": { - "@logto/vue": "^0.1.10", + "@logto/vue": "^0.1.11", "vue": "^3.2.35", "vue-router": "^4.0.14" }, diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index 7768d88ff..002e6b1bf 100644 --- a/packages/vue/CHANGELOG.md +++ b/packages/vue/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [0.1.11](https://github.com/logto-io/js/compare/v0.1.10...v0.1.11) (2022-05-28) + +**Note:** Version bump only for package @logto/vue + + + + + ### [0.1.10](https://github.com/logto-io/js/compare/v0.1.9...v0.1.10) (2022-05-28) **Note:** Version bump only for package @logto/vue diff --git a/packages/vue/package.json b/packages/vue/package.json index 6a6c42acd..75ddb2307 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@logto/vue", - "version": "0.1.10", + "version": "0.1.11", "main": "./lib/index.js", "exports": "./lib/index.js", "typings": "./lib/index.d.ts", @@ -24,7 +24,7 @@ "prepack": "pnpm test" }, "dependencies": { - "@logto/browser": "^0.1.10" + "@logto/browser": "^0.1.11" }, "devDependencies": { "@jest/types": "^27.5.1",