-
Couldn't load subscription status.
- Fork 2.7k
Update axios #8082
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
Open
sameerag
wants to merge
12
commits into
dev
Choose a base branch
from
update-axios
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Update axios #8082
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
70efcca
Update axios
sameerag f64a584
Merge branch 'dev' into update-axios
sameerag 77e3fe1
Update package lock json
sameerag 68fd2d6
Merge branch 'dev' into update-axios
sameerag 6aacba3
Merge branch 'dev' into update-axios
sameerag 3a3363a
revert e2e samples update
sameerag 49341f2
Update package-lock
sameerag 6a56eca
Merge branch 'dev' into update-axios
sameerag 0a07c4a
Merge branch 'dev' into update-axios
sameerag 653da3d
Merge branch 'dev' into update-axios
sameerag 3dc5350
Merge branch 'update-axios' of https://github.com/AzureAD/microsoft-a…
sameerag 8d0c30d
Merge branch 'dev' into update-axios
sameerag File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,29 @@ | ||
| { | ||
| "name": "electron-test-app", | ||
| "version": "1.0.0", | ||
| "description": "A sample Electron application that uses msal-node to acquire tokens", | ||
| "main": "App.ts", | ||
| "private": true, | ||
| "scripts": { | ||
| "build": "tsc", | ||
| "start": "npm run build && electron dist/app.js", | ||
| "build:package": "cd ../../../lib/msal-common && npm run build && cd ../msal-node && npm run build", | ||
| "start:build": "npm run build:package && npm start" | ||
| }, | ||
| "keywords": [ | ||
| "msal-node", | ||
| "electron", | ||
| "javascript" | ||
| ], | ||
| "author": "", | ||
| "license": "MIT", | ||
| "devDependencies": { | ||
| "babel": "^6.23.0", | ||
| "electron": "^22.3.25", | ||
| "typescript": "^4.1.2" | ||
| }, | ||
| "dependencies": { | ||
| "@azure/msal-node": "^3.0.0", | ||
| "axios": "^1.9.0" | ||
| } | ||
| "name": "electron-test-app", | ||
| "version": "1.0.0", | ||
| "description": "A sample Electron application that uses msal-node to acquire tokens", | ||
| "main": "App.ts", | ||
| "private": true, | ||
| "scripts": { | ||
| "build": "tsc", | ||
| "start": "npm run build && electron dist/app.js", | ||
| "build:package": "cd ../../../lib/msal-common && npm run build && cd ../msal-node && npm run build", | ||
| "start:build": "npm run build:package && npm start" | ||
| }, | ||
| "keywords": [ | ||
| "msal-node", | ||
| "electron", | ||
| "javascript" | ||
| ], | ||
| "author": "", | ||
| "license": "MIT", | ||
| "devDependencies": { | ||
| "babel": "^6.23.0", | ||
| "electron": "^22.3.25", | ||
| "typescript": "^4.1.2" | ||
| }, | ||
| "dependencies": { | ||
| "@azure/msal-node": "^3.0.0", | ||
| "axios": "^1.12.0" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 32 additions & 32 deletions
64
samples/msal-node-samples/auth-code-distributed-cache/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,34 @@ | ||
| { | ||
| "name": "msal-node-webapp", | ||
| "version": "1.0.0", | ||
| "description": "", | ||
| "main": "app.js", | ||
| "scripts": { | ||
| "clean": "rimraf ./build", | ||
| "build": "npm run clean && tsc", | ||
| "start": "node src/app.ts", | ||
| "dev": "ts-node src/app.ts", | ||
| "dev:watch": "nodemon src/app.ts -e ts,json --exec 'npm run dev'" | ||
| }, | ||
| "author": "", | ||
| "license": "ISC", | ||
| "devDependencies": { | ||
| "@types/express": "^4.17.17", | ||
| "@types/express-session": "^1.17.6", | ||
| "@types/node": "^18.14.1", | ||
| "nodemon": "^2.0.20", | ||
| "rimraf": "^4.1.2", | ||
| "ts-node": "^10.9.1", | ||
| "typescript": "^4.9.5" | ||
| }, | ||
| "dependencies": { | ||
| "@azure/msal-node": "^1.15.0", | ||
| "axios": "^1.9.0", | ||
| "connect-redis": "^7.0.0", | ||
| "dotenv": "^16.5.0", | ||
| "express": "^4.20.0", | ||
| "express-session": "^1.17.3", | ||
| "hbs": "^4.2.0", | ||
| "redis": "^4.6.5" | ||
| } | ||
| "name": "msal-node-webapp", | ||
| "version": "1.0.0", | ||
| "description": "", | ||
| "main": "app.js", | ||
| "scripts": { | ||
| "clean": "rimraf ./build", | ||
| "build": "npm run clean && tsc", | ||
| "start": "node src/app.ts", | ||
| "dev": "ts-node src/app.ts", | ||
| "dev:watch": "nodemon src/app.ts -e ts,json --exec 'npm run dev'" | ||
| }, | ||
| "author": "", | ||
| "license": "ISC", | ||
| "devDependencies": { | ||
| "@types/express": "^4.17.17", | ||
| "@types/express-session": "^1.17.6", | ||
| "@types/node": "^18.14.1", | ||
| "nodemon": "^2.0.20", | ||
| "rimraf": "^4.1.2", | ||
| "ts-node": "^10.9.1", | ||
| "typescript": "^4.9.5" | ||
| }, | ||
| "dependencies": { | ||
| "@azure/msal-node": "^1.15.0", | ||
| "axios": "^1.12.0", | ||
| "connect-redis": "^7.0.0", | ||
| "dotenv": "^16.5.0", | ||
| "express": "^4.20.0", | ||
| "express-session": "^1.17.3", | ||
| "hbs": "^4.2.0", | ||
| "redis": "^4.6.5" | ||
| } | ||
| } |
56 changes: 28 additions & 28 deletions
56
samples/msal-node-samples/client-credentials-distributed-cache/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,30 @@ | ||
| { | ||
| "name": "msal-node-daemon", | ||
| "version": "1.0.0", | ||
| "description": "", | ||
| "main": "index.js", | ||
| "scripts": { | ||
| "clean": "rimraf ./build", | ||
| "build": "npm run clean && tsc", | ||
| "start": "node src", | ||
| "dev": "ts-node src", | ||
| "dev:watch": "nodemon src -e ts, json --exec 'npm run dev'" | ||
| }, | ||
| "author": "", | ||
| "license": "ISC", | ||
| "devDependencies": { | ||
| "@types/node": "^18.14.1", | ||
| "nodemon": "^2.0.20", | ||
| "rimraf": "^4.1.2", | ||
| "ts-node": "^10.9.1", | ||
| "typescript": "^4.9.5" | ||
| }, | ||
| "dependencies": { | ||
| "@azure/msal-node": "^3.0.0", | ||
| "axios": "^1.9.0", | ||
| "dotenv": "^16.5.0", | ||
| "open": "^8.4.2", | ||
| "redis": "^4.6.5", | ||
| "yargs": "^17.7.1" | ||
| } | ||
| "name": "msal-node-daemon", | ||
| "version": "1.0.0", | ||
| "description": "", | ||
| "main": "index.js", | ||
| "scripts": { | ||
| "clean": "rimraf ./build", | ||
| "build": "npm run clean && tsc", | ||
| "start": "node src", | ||
| "dev": "ts-node src", | ||
| "dev:watch": "nodemon src -e ts, json --exec 'npm run dev'" | ||
| }, | ||
| "author": "", | ||
| "license": "ISC", | ||
| "devDependencies": { | ||
| "@types/node": "^18.14.1", | ||
| "nodemon": "^2.0.20", | ||
| "rimraf": "^4.1.2", | ||
| "ts-node": "^10.9.1", | ||
| "typescript": "^4.9.5" | ||
| }, | ||
| "dependencies": { | ||
| "@azure/msal-node": "^3.0.0", | ||
| "axios": "^1.12.0", | ||
| "dotenv": "^16.5.0", | ||
| "open": "^8.4.2", | ||
| "redis": "^4.6.5", | ||
| "yargs": "^17.7.1" | ||
| } | ||
| } |
62 changes: 31 additions & 31 deletions
62
samples/msal-node-samples/on-behalf-of-distributed-cache/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,33 @@ | ||
| { | ||
| "name": "msal-node-webapi", | ||
| "version": "1.0.0", | ||
| "description": "", | ||
| "main": "app.js", | ||
| "scripts": { | ||
| "clean": "rimraf ./build", | ||
| "build": "npm run clean && tsc", | ||
| "start": "node src/app.ts", | ||
| "dev": "ts-node src/app.ts", | ||
| "dev:watch": "nodemon src/app.ts -e ts,json --exec 'npm run dev'" | ||
| }, | ||
| "author": "", | ||
| "license": "ISC", | ||
| "devDependencies": { | ||
| "@types/express": "^4.17.17", | ||
| "@types/jsonwebtoken": "^9.0.1", | ||
| "@types/node": "^18.14.1", | ||
| "nodemon": "^2.0.20", | ||
| "rimraf": "^4.1.2", | ||
| "ts-node": "^10.9.1", | ||
| "typescript": "^4.9.5" | ||
| }, | ||
| "dependencies": { | ||
| "@azure/msal-node": "^3.0.0", | ||
| "axios": "^1.9.0", | ||
| "dotenv": "^16.5.0", | ||
| "express": "^4.20.0", | ||
| "jsonwebtoken": "^9.0.0", | ||
| "jwks-rsa": "^3.0.1", | ||
| "redis": "^4.6.5" | ||
| } | ||
| "name": "msal-node-webapi", | ||
| "version": "1.0.0", | ||
| "description": "", | ||
| "main": "app.js", | ||
| "scripts": { | ||
| "clean": "rimraf ./build", | ||
| "build": "npm run clean && tsc", | ||
| "start": "node src/app.ts", | ||
| "dev": "ts-node src/app.ts", | ||
| "dev:watch": "nodemon src/app.ts -e ts,json --exec 'npm run dev'" | ||
| }, | ||
| "author": "", | ||
| "license": "ISC", | ||
| "devDependencies": { | ||
| "@types/express": "^4.17.17", | ||
| "@types/jsonwebtoken": "^9.0.1", | ||
| "@types/node": "^18.14.1", | ||
| "nodemon": "^2.0.20", | ||
| "rimraf": "^4.1.2", | ||
| "ts-node": "^10.9.1", | ||
| "typescript": "^4.9.5" | ||
| }, | ||
| "dependencies": { | ||
| "@azure/msal-node": "^3.0.0", | ||
| "axios": "^1.12.0", | ||
| "dotenv": "^16.5.0", | ||
| "express": "^4.20.0", | ||
| "jsonwebtoken": "^9.0.0", | ||
| "jwks-rsa": "^3.0.1", | ||
| "redis": "^4.6.5" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,30 @@ | ||
| { | ||
| "name": "msal-node-silent-flow", | ||
| "version": "1.0.0", | ||
| "description": "sample app for msal-node", | ||
| "main": "index.js", | ||
| "private": true, | ||
| "scripts": { | ||
| "start": "node index.js", | ||
| "test:e2e": "jest", | ||
| "test:agc": "jest --testMatch [ '**/test/**/*agc*.spec.ts' ]", | ||
| "build:package": "cd ../../.. && npm run build:all --workspace=lib/msal-node" | ||
| }, | ||
| "author": "Microsoft", | ||
| "license": "MIT", | ||
| "dependencies": { | ||
| "@azure/msal-node": "^3.0.0", | ||
| "axios": "^1.9.0", | ||
| "dotenv": "^16.5.0", | ||
| "express": "^4.20.0", | ||
| "express-handlebars": "^5.3.5", | ||
| "express-promise-router": "^4.0.1" | ||
| }, | ||
| "devDependencies": { | ||
| "@types/jest": "^29.5.0", | ||
| "e2e-test-utils": "file:../../e2eTestUtils", | ||
| "jest": "^29.5.0", | ||
| "jest-junit": "^16.0.0", | ||
| "ts-jest": "^29.1.0" | ||
| } | ||
| "name": "msal-node-silent-flow", | ||
| "version": "1.0.0", | ||
| "description": "sample app for msal-node", | ||
| "main": "index.js", | ||
| "private": true, | ||
| "scripts": { | ||
| "start": "node index.js", | ||
| "test:e2e": "jest", | ||
| "test:agc": "jest --testMatch [ '**/test/**/*agc*.spec.ts' ]", | ||
| "build:package": "cd ../../.. && npm run build:all --workspace=lib/msal-node" | ||
| }, | ||
| "author": "Microsoft", | ||
| "license": "MIT", | ||
| "dependencies": { | ||
| "@azure/msal-node": "^3.0.0", | ||
| "axios": "^1.12.0", | ||
| "dotenv": "^16.5.0", | ||
| "express": "^4.20.0", | ||
| "express-handlebars": "^5.3.5", | ||
| "express-promise-router": "^4.0.1" | ||
| }, | ||
| "devDependencies": { | ||
| "@types/jest": "^29.5.0", | ||
| "e2e-test-utils": "file:../../e2eTestUtils", | ||
| "jest": "^29.5.0", | ||
| "jest-junit": "^16.0.0", | ||
| "ts-jest": "^29.1.0" | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A reference to the local package is intentional here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. The change was not intentional, co-pilot suggestion I believe. Will revert this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a good catch, how do we prevent reverting this in the future?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
May be a lint rule?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add one? There's going to be a CVE asking folks to move to 4.25.1 when we moved the e2e tests and our lint rules to file references. We really shouldn't regress this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a devDependency on samples, we shouldn't be opening a CVE or pushing folks to upgrade for this. We should still avoid regressing this for our own sake though