diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index e51befc7c..9e207af86 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -4,6 +4,7 @@ on: branches: - develop - master + workflow_dispatch: env: NX_CLOUD_DISTRIBUTED_EXECUTION: true jobs: @@ -59,7 +60,6 @@ jobs: - run: npm ci if: steps.cache.outputs.cache-hit != 'true' env: - # PLAYWRIGHT_BROWSERS_PATH: 0 PLAYWRIGHT_SKIP_BROWSERS_DOWNLOAD: 1 - run: npm install @nrwl/nx-cloud - name: Start Nx Agent ${{ matrix.agent }} @@ -75,18 +75,22 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 + ssh-key: ${{ secrets.SSH_PUBLIC_KEY }} persist-credentials: false - - uses: webfactory/ssh-agent@v0.5.4 - with: - ssh-private-key: ${{ secrets.SSH_KEY }} - - name: Set git config username and email - run: git config user.email "ryan.basmajian@forgerock.com" && git config user.name "ryanbas21" - shell: bash - uses: actions/setup-node@v3 id: cache with: node-version: '16.x' scope: '@forgerock' + - name: Import GPG + uses: crazy-max/ghaction-import-gpg@v5.2.0 + with: + gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} + git_user_signingkey: true + git_commit_gpgsign: true + git_committer_email: 'ryan.basmajian@forgerock.com' + git_push_gpgsign: true + git_config_global: true - run: npm ci - run: npm install @nrwl/nx-cloud - run: npm run build diff --git a/package-lock.json b/package-lock.json index ab1bd92fe..d21fdb2ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@commitlint/config-conventional": "^17.4.2", "@commitlint/config-nx-scopes": "^17.4.2", "@commitlint/prompt": "^16.2.3", - "@jscutlery/semver": "2.29.3", + "@jscutlery/semver": "2.30.1", "@nrwl/angular": "15.6.3", "@nrwl/cli": "15.6.3", "@nrwl/eslint-plugin-nx": "15.6.3", @@ -5798,9 +5798,9 @@ } }, "node_modules/@jscutlery/semver": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/@jscutlery/semver/-/semver-2.29.3.tgz", - "integrity": "sha512-Vb1K8xsZtU2iz25/QcXm0JCTmLcX91mNqRf8/6Pp5vzaO0aKztDX4hHNIRBBo/5nCh4TVJk6QWp3CeUCGdoFNQ==", + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/@jscutlery/semver/-/semver-2.30.1.tgz", + "integrity": "sha512-Adnlu/kEOaikxNJLi3Ll4UfgEW4VG0dvf5zm7Ere7vT/udHhPs6CTO6B7PCFLzKsLgM0vqSrVk/nKYFWri83Ww==", "dev": true, "dependencies": { "chalk": "4.1.2", @@ -5808,7 +5808,7 @@ "conventional-recommended-bump": "^6.1.0", "detect-indent": "6.1.0", "inquirer": "8.2.5", - "rxjs": "7.6.0" + "rxjs": "7.8.0" }, "engines": { "node": ">=12.0.0" @@ -5901,15 +5901,6 @@ "node": ">=12.0.0" } }, - "node_modules/@jscutlery/semver/node_modules/rxjs": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz", - "integrity": "sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/@jscutlery/semver/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -34860,7 +34851,7 @@ }, "packages/javascript-sdk": { "name": "@forgerock/javascript-sdk", - "version": "3.4.1-beta.1", + "version": "3.4.0", "license": "MIT" }, "samples/angular-todo": { @@ -39013,9 +39004,9 @@ } }, "@jscutlery/semver": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/@jscutlery/semver/-/semver-2.29.3.tgz", - "integrity": "sha512-Vb1K8xsZtU2iz25/QcXm0JCTmLcX91mNqRf8/6Pp5vzaO0aKztDX4hHNIRBBo/5nCh4TVJk6QWp3CeUCGdoFNQ==", + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/@jscutlery/semver/-/semver-2.30.1.tgz", + "integrity": "sha512-Adnlu/kEOaikxNJLi3Ll4UfgEW4VG0dvf5zm7Ere7vT/udHhPs6CTO6B7PCFLzKsLgM0vqSrVk/nKYFWri83Ww==", "dev": true, "requires": { "chalk": "4.1.2", @@ -39023,7 +39014,7 @@ "conventional-recommended-bump": "^6.1.0", "detect-indent": "6.1.0", "inquirer": "8.2.5", - "rxjs": "7.6.0" + "rxjs": "7.8.0" }, "dependencies": { "ansi-styles": { @@ -39089,15 +39080,6 @@ "wrap-ansi": "^7.0.0" } }, - "rxjs": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz", - "integrity": "sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==", - "dev": true, - "requires": { - "tslib": "^2.1.0" - } - }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", diff --git a/package.json b/package.json index eafe204e2..fdcaf468e 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@commitlint/config-conventional": "^17.4.2", "@commitlint/config-nx-scopes": "^17.4.2", "@commitlint/prompt": "^16.2.3", - "@jscutlery/semver": "2.29.3", + "@jscutlery/semver": "2.30.1", "@nrwl/angular": "15.6.3", "@nrwl/cli": "15.6.3", "@nrwl/eslint-plugin-nx": "15.6.3", @@ -92,7 +92,7 @@ "ts-loader": "^8.0.17", "ts-node": "10.9.1", "typedoc": "^0.17.7", - "typescript": "4.8.4", + "typescript": "4.9.5", "webpack": "^5.64.1", "webpack-cli": "^4.7.2" }, diff --git a/packages/javascript-sdk/project.json b/packages/javascript-sdk/project.json index c90d202c5..0367afe3e 100644 --- a/packages/javascript-sdk/project.json +++ b/packages/javascript-sdk/project.json @@ -68,7 +68,7 @@ "dryRun": true, "push": true, "tagPrefix": "v", - "postTargets": [] + "postTargets": ["javascript-sdk:deploy", "javascript-sdk:github"] }, "configurations": { "beta": { @@ -81,7 +81,7 @@ "commitMessageFormat": "release: ${version} [skip ci]", "remote": "origin", "push": true, - "postTargets": ["javascript-sdk:deploy:beta"], + "postTargets": ["javascript-sdk:deploy:beta", "javascript-sdk:github:beta"], "dryRun": false } } diff --git a/packages/javascript-sdk/src/token-manager/index.ts b/packages/javascript-sdk/src/token-manager/index.ts index fd2086fa7..784ec364e 100644 --- a/packages/javascript-sdk/src/token-manager/index.ts +++ b/packages/javascript-sdk/src/token-manager/index.ts @@ -118,8 +118,9 @@ abstract class TokenManager { */ const verifier = PKCE.createVerifier(); const state = PKCE.createState(); + const { forceRenew, login, ...config } = options; const authorizeUrlOptions = { - ...options, + ...config, responseType: ResponseType.Code, state, verifier,