Skip to content

fix: correct code / type in getTokens call #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2023
Merged

fix: correct code / type in getTokens call #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abd3e66
fix(javascript-sdk): correct code / type in getTokens call
ryanbas21 Feb 16, 2023
41f28fe
chore(javascript-sdk): pr-review
ryanbas21 Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
branches:
- develop
- master
workflow_dispatch:
Copy link
Contributor Author

@ryanbas21 ryanbas21 Feb 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

allows this to be run wihtout a pr (mostly for me sanity checking or re reunning things or if we want to cut a release without a pr)

Copy link
Contributor

@daveadams56 daveadams56 Feb 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a look at the file separately as it looked odd - l shouldn't the workflow_dispatch key have a value, or some child keys indented below it? At first glance I assumed env: was a child of this but now seeing it without this review block in the way I don't quite understand how this is valid.

Copy link
Contributor Author

@ryanbas21 ryanbas21 Feb 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So we don't really pass any inputs into this workflow, so i don't think we need anything. Truthfully im not entirely sure we need this to begin with, i was adding it as a way of running CI without needing a PR up. so if you just need to sanity check things or something odd fails and you want to re run the branch

env:
NX_CLOUD_DISTRIBUTED_EXECUTION: true
jobs:
Expand Down Expand Up @@ -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 }}
Expand All @@ -75,18 +75,22 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_PUBLIC_KEY }}
Copy link
Contributor Author

@ryanbas21 ryanbas21 Feb 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

authenticate clone the repo

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
Copy link
Contributor Author

@ryanbas21 ryanbas21 Feb 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sign the commits. its locked to v5.2.0 as per our old discussion

with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
Copy link
Contributor Author

@ryanbas21 ryanbas21 Feb 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is my 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
Expand Down
38 changes: 10 additions & 28 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Copy link
Contributor Author

@ryanbas21 ryanbas21 Feb 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

satisfies operator and newer ts stuff

Copy link
Contributor

@daveadams56 daveadams56 Feb 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wondering we have something for this project like dependabot that we use (whether manual or automated), to identify which of these dependencies need updating and when?

Copy link
Contributor Author

@ryanbas21 ryanbas21 Feb 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we have dependabot but not configured or setup really like i did in the other repo

"webpack": "^5.64.1",
"webpack-cli": "^4.7.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/javascript-sdk/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"dryRun": true,
"push": true,
"tagPrefix": "v",
"postTargets": []
"postTargets": ["javascript-sdk:deploy", "javascript-sdk:github"]
},
"configurations": {
"beta": {
Expand All @@ -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"],
Copy link
Contributor

@daveadams56 daveadams56 Feb 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you able to explain what we're adding here, with javascript-sdk:github:beta and javascript-sdk:github? It's not obvious to me and would like to know more. Thanks.

Copy link
Contributor Author

@ryanbas21 ryanbas21 Feb 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its a post target, so after this runs, it will run that nx target.

"dryRun": false
}
}
Expand Down
3 changes: 2 additions & 1 deletion packages/javascript-sdk/src/token-manager/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down