Skip to content

Commit

Permalink
Merge branch 'dev' into client_credentials_regression_test
Browse files Browse the repository at this point in the history
  • Loading branch information
Robbie-Microsoft authored Sep 12, 2023
2 parents 64b41f3 + 2bc6389 commit 345a21f
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 12 deletions.
10 changes: 5 additions & 5 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
/samples/msal-node-samples/ @sameerag @tnorling @hectormmg @peterzenz @bgavrilMS @robbie-microsoft
/extensions/msal-node-extensions/ @sameerag @tnorling @hectormmg @peterzenz

# MSAL Node Confidential Client Regression Tests
.github/workflows/client-credential-benchmark.yml @bgavrilMS @robbie-microsoft @trwalke @pmaytak @gladjohn @neha-bhargava @rayluo @Avery-Dunn
.github/workflows/msal-node-confidential-client-benchmarks.yml @bgavrilMS @robbie-microsoft @trwalke @pmaytak @gladjohn @neha-bhargava @rayluo @Avery-Dunn
/regression-tests/msal-node/ @bgavrilMS @robbie-microsoft @trwalke @pmaytak @gladjohn @neha-bhargava @rayluo @Avery-Dunn

# MSAL React
/lib/msal-react/ @tnorling @jo-arroyo @peterzenz
/samples/msal-react-samples/ @tnorling @jo-arroyo @peterzenz
Expand All @@ -31,5 +26,10 @@
/.github/ @sameerag @tnorling @hectormmg @peterzenz
/.pipelines/ @hectormmg @tnorling @peterzenz

# MSAL Node Confidential Client Regression Tests
.github/workflows/client-credential-benchmark.yml @bgavrilMS @robbie-microsoft @trwalke @pmaytak @gladjohn @neha-bhargava @rayluo @Avery-Dunn
.github/workflows/msal-node-confidential-client-benchmarks.yml @bgavrilMS @robbie-microsoft @trwalke @pmaytak @gladjohn @neha-bhargava @rayluo @Avery-Dunn
/regression-tests/msal-node/ @bgavrilMS @robbie-microsoft @trwalke @pmaytak @gladjohn @neha-bhargava @rayluo @Avery-Dunn

# Filepaths to ignore
/change/
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "doc: JSDoc for deprecated BrowserAuthErrorMessage",
"packageName": "@azure/msal-browser",
"email": "[email protected]",
"dependentChangeType": "none"
}
6 changes: 5 additions & 1 deletion lib/msal-browser/src/error/BrowserAuthError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,11 @@ export const BrowserAuthErrorMessages = {

/**
* BrowserAuthErrorMessage class containing string constants used by error codes and messages.
* @deprecated Use BrowserAuthBrowserAuthErrorCodes instead
* @deprecated Use exported BrowserAuthErrorCodes instead.
* In your app you can do :
* ```
* import { BrowserAuthErrorCodes } from "@azure/msal-browser";
* ```
*/
export const BrowserAuthErrorMessage = {
pkceNotGenerated: {
Expand Down
2 changes: 1 addition & 1 deletion samples/msal-browser-samples/vue3-sample-app/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# MSAL.js 2.x + Vue 3 + TypeScript Sample
# MSAL.js + Vue 3 + TypeScript Sample

## About this sample

Expand Down
4 changes: 2 additions & 2 deletions samples/msal-browser-samples/vue3-sample-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build:package": "cd ../../../lib/msal-browser && npm run build:all"
},
"dependencies": {
"@azure/msal-browser": "^3.0.0-beta.0",
"@azure/msal-browser": "^3.1.0",
"element-plus": "^2.2.19",
"vue": "^3.2.41",
"vue-router": "^4.1.5"
Expand All @@ -19,4 +19,4 @@
"vite": "^3.1.8",
"vue-tsc": "^1.0.8"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ export function useMsal(): MsalContext {
}

if (inProgress.value === InteractionStatus.Startup) {
instance.value.handleRedirectPromise().catch(() => {
// Errors should be handled by listening to the LOGIN_FAILURE event
return;
instance.value.initialize().then(() => {
instance.value.handleRedirectPromise().catch(() => {
// Errors should be handled by listening to the LOGIN_FAILURE event
return;
});
});
}

Expand Down

0 comments on commit 345a21f

Please sign in to comment.