Skip to content
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.

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

[Release] v0.11.0 beta.0 #348

Merged
merged 24 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
217041f
fix: upgrade @types/jest from 29.5.3 to 29.5.4
snyk-bot Sep 13, 2023
d112c07
fix: upgrade @types/react from 18.2.20 to 18.2.21
snyk-bot Sep 13, 2023
d0bf1d5
Bump @chakra-ui/icons from 2.1.0 to 2.1.1
dependabot[bot] Sep 25, 2023
309ee9a
Bump jest-environment-jsdom from 27.5.1 to 29.7.0
dependabot[bot] Oct 5, 2023
0d84034
github-actions[bot] Oct 19, 2023
8c8f182
Bump react-bootstrap from 2.8.0 to 2.9.1
dependabot[bot] Oct 23, 2023
09acb18
Bump actions/setup-node from 3 to 4
dependabot[bot] Oct 24, 2023
7071e16
Merge pull request #335 from PagerDuty/dependabot/github_actions/deve…
gsreynolds Oct 30, 2023
17fde4d
Merge pull request #319 from PagerDuty/dependabot/npm_and_yarn/develo…
gsreynolds Oct 30, 2023
851d671
Merge pull request #317 from PagerDuty/dependabot/npm_and_yarn/develo…
gsreynolds Oct 30, 2023
adf2534
Bump i18next-parser from 8.6.0 to 8.9.0
dependabot[bot] Oct 31, 2023
97fd6fa
Bump @testing-library/jest-dom from 6.0.1 to 6.1.4
dependabot[bot] Oct 31, 2023
b9e0a9d
Merge pull request #334 from PagerDuty/dependabot/npm_and_yarn/develo…
gsreynolds Nov 1, 2023
25238cd
Merge pull request #337 from PagerDuty/dependabot/npm_and_yarn/develo…
gsreynolds Nov 1, 2023
b65fda5
Merge pull request #311 from PagerDuty/snyk-upgrade-c227f3d8178e7bc86…
gsreynolds Nov 1, 2023
9fdaaf1
Merge pull request #312 from PagerDuty/snyk-upgrade-a45fc9daffd416b47…
gsreynolds Nov 1, 2023
8ff3b6e
use body instead of url for code exchange post
martindstone Nov 9, 2023
bc65a0e
Merge pull request #343 from PagerDuty/oauth-update
gsreynolds Nov 10, 2023
c9c6cd5
Bump axios from 1.5.0 to 1.6.0
dependabot[bot] Nov 11, 2023
a69e45e
Merge pull request #336 from PagerDuty/dependabot/npm_and_yarn/develo…
gsreynolds Nov 16, 2023
d776343
Merge pull request #345 from PagerDuty/dependabot/npm_and_yarn/axios-…
gsreynolds Nov 16, 2023
1e1c106
Bump i18next from 23.4.6 to 23.7.6
dependabot[bot] Nov 16, 2023
feac4ec
Merge pull request #347 from PagerDuty/dependabot/npm_and_yarn/develo…
gsreynolds Nov 16, 2023
8349395
Publishing release v0.11.0-beta.0
gsreynolds Nov 16, 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
2 changes: 1 addition & 1 deletion .github/workflows/cd-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions
- name: Install Yarn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snyk-security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

# For Snyk Open Source you must first set up the development environment for your application's dependencies
# For example for Node
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions
- name: Node Version
Expand All @@ -38,7 +38,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions
- name: Node Version
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions
- name: Node Version
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "pd-live-react",
"homepage": "https://pagerduty.github.io/pd-live-react",
"version": "0.10.2-beta.0",
"version": "0.11.0-beta.0",
"private": true,
"dependencies": {
"@chakra-ui/icons": "^2.1.0",
"@chakra-ui/icons": "^2.1.1",
"@chakra-ui/react": "^2.8.0",
"@datadog/browser-rum": "^4.47.0",
"@emotion/react": "^11.11.1",
Expand All @@ -15,19 +15,19 @@
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@pagerduty/pdjs": "^2.2.3",
"@types/jest": "^29.5.3",
"@types/jest": "^29.5.4",
"@types/node": "^20.5.7",
"@types/react": "^18.2.20",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"axios": "^1.5.0",
"axios": "^1.6.0",
"bootstrap": "^4.6.2",
"bottleneck": "^2.19.5",
"chakra-react-select": "^4.7.0",
"date-fns": "^2.29.3",
"font-awesome": "^4.7.0",
"framer-motion": "^10.16.2",
"fuse.js": "^6.6.2",
"i18next": "^23.4.6",
"i18next": "^23.7.6",
"i18next-browser-languagedetector": "^7.1.0",
"immer": "^10.0.2",
"jsonpath-plus": "^7.2.0",
Expand All @@ -37,7 +37,7 @@
"moment": "^2.29.4",
"pretty-print-error": "^1.1.1",
"react": "^18",
"react-bootstrap": "^2.8.0",
"react-bootstrap": "^2.9.1",
"react-contextmenu": "^2.14.0",
"react-datepicker": "^4.16.0",
"react-dnd": "^16.0.1",
Expand Down Expand Up @@ -103,7 +103,7 @@
"@cypress/react": "^8.0.0",
"@faker-js/faker": "^8.0.2",
"@testing-library/dom": "^9.3.0",
"@testing-library/jest-dom": "^6.0.1",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^14.0.0",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.4.3",
Expand All @@ -130,11 +130,11 @@
"eslint-plugin-styled-components-a11y": "^2.1.31",
"genversion": "^3.1.1",
"gh-pages": "^6.0.0",
"i18next-parser": "^8.6.0",
"i18next-parser": "^8.9.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.6.3",
"jest-canvas-mock": "^2.5.2",
"jest-environment-jsdom": "^29.6.3",
"jest-environment-jsdom": "^29.7.0",
"jest-environment-node": "^29.6.3",
"jest-location-mock": "^1.0.10",
"jest-transformer-svg": "^2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/config/version.js

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

30 changes: 19 additions & 11 deletions src/util/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,31 @@ export const exchangeCodeForToken = async (
codeVerifier,
code,
) => {
// eslint-disable-next-line no-unused-vars
const postData = async (url, _data) => {
const postData = async (url, data) => {
const formData = new URLSearchParams(data); // Convert data to URL-encoded form data
const response = await fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded', // Set the content type
},
body: formData.toString(), // Convert the form data to a string
});
const json = response.json();
const json = await response.json(); // Parse the response JSON
return json;
};

const requestTokenUrl = 'https://identity.pagerduty.com/oauth/token?'
+ 'grant_type=authorization_code&'
+ `code=${code}&`
+ `redirect_uri=${redirectURL}&`
+ `client_id=${clientId}&`
+ `client_secret=${clientSecret}&`
+ `code_verifier=${codeVerifier}`;
const data = await postData(requestTokenUrl, {});
const requestTokenUrl = 'https://identity.pagerduty.com/oauth/token';
const formData = {
grant_type: 'authorization_code',
code,
redirect_uri: redirectURL,
client_id: clientId,
client_secret: clientSecret,
code_verifier: codeVerifier,
};

const data = await postData(requestTokenUrl, formData);

if (data.access_token) {
return data.access_token;
}
Expand Down
Loading