@azure/msal-react 3.0.10 → 3.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +23 -23
- package/dist/MsalContext.js +1 -1
- package/dist/MsalProvider.js +6 -2
- package/dist/MsalProvider.js.map +1 -1
- package/dist/components/AuthenticatedTemplate.js +1 -1
- package/dist/components/MsalAuthenticationTemplate.js +1 -1
- package/dist/components/UnauthenticatedTemplate.js +1 -1
- package/dist/components/withMsal.js +1 -1
- package/dist/error/ReactAuthError.js +1 -1
- package/dist/hooks/useAccount.js +20 -11
- package/dist/hooks/useAccount.js.map +1 -1
- package/dist/hooks/useIsAuthenticated.js +1 -1
- package/dist/hooks/useMsal.js +1 -1
- package/dist/hooks/useMsalAuthentication.js +3 -2
- package/dist/hooks/useMsalAuthentication.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/packageMetadata.d.ts +1 -1
- package/dist/packageMetadata.js +2 -2
- package/dist/utils/utilities.js +1 -1
- package/lib/msal-react.cjs +27 -13
- package/lib/msal-react.cjs.map +1 -1
- package/lib/types/packageMetadata.d.ts +1 -1
- package/package.json +10 -9
- package/src/MsalProvider.tsx +6 -1
- package/src/hooks/useAccount.ts +24 -17
- package/src/hooks/useMsalAuthentication.ts +2 -1
- package/src/packageMetadata.ts +1 -1
package/README.md
CHANGED
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
[](https://nodei.co/npm/@azure/msal-react/)
|
|
5
5
|
[](https://codecov.io/gh/AzureAD/microsoft-authentication-library-for-js)
|
|
6
6
|
|
|
7
|
-
| <a href="https://docs.microsoft.com/azure/active-directory/develop/tutorial-v2-react" target="blank">Getting Started</a> | <a href="https://aka.ms/aaddevv2" target="_blank">AAD Docs</a> | <a href="https://azuread.github.io/microsoft-authentication-library-for-js/ref/modules/_azure_msal_react.html" target="_blank">Library Reference</a> | <a href="https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples" target="blank">Samples</a>
|
|
8
|
-
|
|
7
|
+
| <a href="https://docs.microsoft.com/azure/active-directory/develop/tutorial-v2-react" target="blank">Getting Started</a> | <a href="https://aka.ms/aaddevv2" target="_blank">AAD Docs</a> | <a href="https://azuread.github.io/microsoft-authentication-library-for-js/ref/modules/_azure_msal_react.html" target="_blank">Library Reference</a> | <a href="https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples" target="blank">Samples</a> |
|
|
8
|
+
| ------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
|
|
9
9
|
|
|
10
10
|
1. [About](#about)
|
|
11
11
|
1. [FAQ](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-react/FAQ.md)
|
|
@@ -32,16 +32,16 @@ The `@azure/msal-react` package described by the code in this folder uses the [`
|
|
|
32
32
|
|
|
33
33
|
## Prerequisites
|
|
34
34
|
|
|
35
|
-
-
|
|
35
|
+
- `@azure/msal-react` is meant to be used in [Single-Page Application scenarios](https://docs.microsoft.com/azure/active-directory/develop/scenario-spa-overview).
|
|
36
36
|
|
|
37
|
-
-
|
|
37
|
+
- Before using `@azure/msal-react` you will need to [register a Single Page Application in Azure AD](https://docs.microsoft.com/en-us/azure/active-directory/develop/scenario-spa-app-registration) to get a valid `clientId` for configuration, and to register the routes that your app will accept redirect traffic on.
|
|
38
38
|
|
|
39
39
|
## Version Support
|
|
40
40
|
|
|
41
|
-
| MSAL React version | MSAL support status | Supported React versions
|
|
42
|
-
| ------------------ | ------------------- |
|
|
43
|
-
| MSAL React
|
|
44
|
-
| MSAL React v1
|
|
41
|
+
| MSAL React version | MSAL support status | Supported React versions |
|
|
42
|
+
| ------------------ | ------------------- | ------------------------ |
|
|
43
|
+
| MSAL React v3 | Active development | 16, 17, 18, 19 |
|
|
44
|
+
| MSAL React v1, v2 | In maintenance | 16, 17, 18 |
|
|
45
45
|
|
|
46
46
|
**Note:** There have been no functional changes in the MSAL React v2 release.
|
|
47
47
|
|
|
@@ -111,11 +111,11 @@ Since `@azure/msal-react` is a wrapper around `@azure/msal-browser` many docs fr
|
|
|
111
111
|
|
|
112
112
|
### Advanced Topics
|
|
113
113
|
|
|
114
|
-
-
|
|
115
|
-
-
|
|
116
|
-
-
|
|
117
|
-
-
|
|
118
|
-
-
|
|
114
|
+
- [Configuration Options](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/configuration.md)
|
|
115
|
+
- [Request and Response Details](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/request-response-object.md)
|
|
116
|
+
- [Events](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/events.md)
|
|
117
|
+
- [Cache Storage](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/caching.md)
|
|
118
|
+
- [Performance Enhancements](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/performance.md)
|
|
119
119
|
|
|
120
120
|
### MSAL React Specific Concepts
|
|
121
121
|
|
|
@@ -128,18 +128,18 @@ Since `@azure/msal-react` is a wrapper around `@azure/msal-browser` many docs fr
|
|
|
128
128
|
|
|
129
129
|
Our [samples directory](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-react-samples) contains several example apps you can spin up to see how this library can be used in different contexts.
|
|
130
130
|
|
|
131
|
-
-
|
|
132
|
-
-
|
|
133
|
-
-
|
|
134
|
-
-
|
|
135
|
-
-
|
|
131
|
+
- [Create React App (JS) Sample](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-react-samples/react-router-sample)
|
|
132
|
+
- [Create React App (TS) Sample](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-react-samples/typescript-sample)
|
|
133
|
+
- [Next.js Sample](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-react-samples/nextjs-sample)
|
|
134
|
+
- [Gatsby Sample](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-react-samples/gatsby-sample)
|
|
135
|
+
- [B2C Sample](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-react-samples/b2c-sample)
|
|
136
136
|
|
|
137
137
|
More advanced samples backed with a tutorial can be found in the [Azure Samples](https://github.com/Azure-Samples) space on GitHub:
|
|
138
138
|
|
|
139
|
-
-
|
|
140
|
-
-
|
|
141
|
-
-
|
|
142
|
-
-
|
|
139
|
+
- [React SPA calling Express.js web API](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/3-Authorization-II/1-call-api)
|
|
140
|
+
- [React SPA calling Express.js web API using App Roles and RBAC](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/5-AccessControl/1-call-api-roles)
|
|
141
|
+
- [React SPA calling Microsoft Graph via Express.js web API using on-behalf-of flow](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/6-AdvancedScenarios/1-call-api-obo)
|
|
142
|
+
- [Deployment tutorial for Azure Static Web Apps](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/4-Deployment/2-deploy-static)
|
|
143
143
|
|
|
144
144
|
## Security Reporting
|
|
145
145
|
|
|
@@ -147,7 +147,7 @@ If you find a security issue with our libraries or services please report it to
|
|
|
147
147
|
|
|
148
148
|
## License
|
|
149
149
|
|
|
150
|
-
Copyright (c) Microsoft Corporation.
|
|
150
|
+
Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License.
|
|
151
151
|
|
|
152
152
|
## We Value and Adhere to the Microsoft Open Source Code of Conduct
|
|
153
153
|
|
package/dist/MsalContext.js
CHANGED
package/dist/MsalProvider.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-react v3.0.
|
|
1
|
+
/*! @azure/msal-react v3.0.12 2025-05-06 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import React__default, { useEffect, useMemo, useReducer } from 'react';
|
|
4
4
|
import { WrapperSKU, InteractionStatus, EventMessageUtils } from '@azure/msal-browser';
|
|
@@ -40,6 +40,10 @@ const reducer = (previousState, action) => {
|
|
|
40
40
|
default:
|
|
41
41
|
throw new Error(`Unknown action type: ${type}`);
|
|
42
42
|
}
|
|
43
|
+
if (newInProgress === InteractionStatus.Startup) {
|
|
44
|
+
// Can't start checking accounts until initialization is complete
|
|
45
|
+
return previousState;
|
|
46
|
+
}
|
|
43
47
|
const currentAccounts = payload.instance.getAllAccounts();
|
|
44
48
|
if (newInProgress !== previousState.inProgress &&
|
|
45
49
|
!accountArraysAreEqual(currentAccounts, previousState.accounts)) {
|
|
@@ -84,7 +88,7 @@ function MsalProvider({ instance, children, }) {
|
|
|
84
88
|
// Lazy initialization of the initial state
|
|
85
89
|
return {
|
|
86
90
|
inProgress: InteractionStatus.Startup,
|
|
87
|
-
accounts:
|
|
91
|
+
accounts: [],
|
|
88
92
|
};
|
|
89
93
|
});
|
|
90
94
|
useEffect(() => {
|
package/dist/MsalProvider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MsalProvider.js","sources":["../src/MsalProvider.tsx"],"sourcesContent":[null],"names":["SKU","React"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MsalProvider.js","sources":["../src/MsalProvider.tsx"],"sourcesContent":[null],"names":["SKU","React"],"mappings":"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"}
|
package/dist/hooks/useAccount.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
/*! @azure/msal-react v3.0.
|
|
1
|
+
/*! @azure/msal-react v3.0.12 2025-05-06 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { useState, useEffect } from 'react';
|
|
4
|
-
import { AccountEntity } from '@azure/msal-browser';
|
|
4
|
+
import { InteractionStatus, AccountEntity } from '@azure/msal-browser';
|
|
5
5
|
import { useMsal } from './useMsal.js';
|
|
6
6
|
import { getAccountByIdentifiers } from '../utils/utilities.js';
|
|
7
7
|
|
|
@@ -25,16 +25,25 @@ function getAccount(instance, accountIdentifiers) {
|
|
|
25
25
|
*/
|
|
26
26
|
function useAccount(accountIdentifiers) {
|
|
27
27
|
const { instance, inProgress, logger } = useMsal();
|
|
28
|
-
const [account, setAccount] = useState(() =>
|
|
28
|
+
const [account, setAccount] = useState(() => {
|
|
29
|
+
if (inProgress === InteractionStatus.Startup) {
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
return getAccount(instance, accountIdentifiers);
|
|
34
|
+
}
|
|
35
|
+
});
|
|
29
36
|
useEffect(() => {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
37
|
+
if (inProgress !== InteractionStatus.Startup) {
|
|
38
|
+
setAccount((currentAccount) => {
|
|
39
|
+
const nextAccount = getAccount(instance, accountIdentifiers);
|
|
40
|
+
if (!AccountEntity.accountInfoIsEqual(currentAccount, nextAccount, true)) {
|
|
41
|
+
logger.info("useAccount - Updating account");
|
|
42
|
+
return nextAccount;
|
|
43
|
+
}
|
|
44
|
+
return currentAccount;
|
|
45
|
+
});
|
|
46
|
+
}
|
|
38
47
|
}, [inProgress, accountIdentifiers, instance, logger]);
|
|
39
48
|
return account;
|
|
40
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAccount.js","sources":["../../src/hooks/useAccount.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;AAAA;;;AAGG;
|
|
1
|
+
{"version":3,"file":"useAccount.js","sources":["../../src/hooks/useAccount.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;AAAA;;;AAGG;AAaH,SAAS,UAAU,CACf,QAAkC,EAClC,kBAAuC,EAAA;AAEvC,IAAA,IACI,CAAC,kBAAkB;SAClB,CAAC,kBAAkB,CAAC,aAAa;YAC9B,CAAC,kBAAkB,CAAC,cAAc;AAClC,YAAA,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EACnC;;AAEE,QAAA,OAAO,QAAQ,CAAC,gBAAgB,EAAE,CAAC;AACtC,KAAA;IAED,OAAO,uBAAuB,CAC1B,QAAQ,CAAC,cAAc,EAAE,EACzB,kBAAkB,CACrB,CAAC;AACN,CAAC;AAED;;;AAGG;AACG,SAAU,UAAU,CACtB,kBAAuC,EAAA;IAEvC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;IAEnD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAqB,MAAK;AAC5D,QAAA,IAAI,UAAU,KAAK,iBAAiB,CAAC,OAAO,EAAE;AAC1C,YAAA,OAAO,IAAI,CAAC;AACf,SAAA;AAAM,aAAA;AACH,YAAA,OAAO,UAAU,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;AACnD,SAAA;AACL,KAAC,CAAC,CAAC;IAEH,SAAS,CAAC,MAAK;AACX,QAAA,IAAI,UAAU,KAAK,iBAAiB,CAAC,OAAO,EAAE;AAC1C,YAAA,UAAU,CAAC,CAAC,cAAkC,KAAI;gBAC9C,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;gBAC7D,IACI,CAAC,aAAa,CAAC,kBAAkB,CAC7B,cAAc,EACd,WAAW,EACX,IAAI,CACP,EACH;AACE,oBAAA,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;AAC7C,oBAAA,OAAO,WAAW,CAAC;AACtB,iBAAA;AAED,gBAAA,OAAO,cAAc,CAAC;AAC1B,aAAC,CAAC,CAAC;AACN,SAAA;KACJ,EAAE,CAAC,UAAU,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AAEvD,IAAA,OAAO,OAAO,CAAC;AACnB;;;;"}
|
package/dist/hooks/useMsal.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-react v3.0.
|
|
1
|
+
/*! @azure/msal-react v3.0.12 2025-05-06 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { useState, useRef, useEffect, useCallback } from 'react';
|
|
4
4
|
import { InteractionStatus, InteractionType, EventType, OIDC_DEFAULT_SCOPES, InteractionRequiredAuthError } from '@azure/msal-browser';
|
|
@@ -167,8 +167,8 @@ function useMsalAuthentication(interactionType, authenticationRequest, accountId
|
|
|
167
167
|
useEffect(() => {
|
|
168
168
|
if (shouldAcquireToken.current &&
|
|
169
169
|
inProgress === InteractionStatus.None) {
|
|
170
|
-
shouldAcquireToken.current = false;
|
|
171
170
|
if (!isAuthenticated) {
|
|
171
|
+
shouldAcquireToken.current = false;
|
|
172
172
|
logger.info("useMsalAuthentication - No user is authenticated, attempting to login");
|
|
173
173
|
login().catch(() => {
|
|
174
174
|
// Errors are saved in state above
|
|
@@ -176,6 +176,7 @@ function useMsalAuthentication(interactionType, authenticationRequest, accountId
|
|
|
176
176
|
});
|
|
177
177
|
}
|
|
178
178
|
else if (account) {
|
|
179
|
+
shouldAcquireToken.current = false;
|
|
179
180
|
logger.info("useMsalAuthentication - User is authenticated, attempting to acquire token");
|
|
180
181
|
acquireToken().catch(() => {
|
|
181
182
|
// Errors are saved in state above
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMsalAuthentication.js","sources":["../../src/hooks/useMsalAuthentication.ts"],"sourcesContent":[null],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"useMsalAuthentication.js","sources":["../../src/hooks/useMsalAuthentication.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export declare const name = "@azure/msal-react";
|
|
2
|
-
export declare const version = "3.0.
|
|
2
|
+
export declare const version = "3.0.12";
|
package/dist/packageMetadata.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
/*! @azure/msal-react v3.0.
|
|
1
|
+
/*! @azure/msal-react v3.0.12 2025-05-06 */
|
|
2
2
|
'use strict';
|
|
3
3
|
/* eslint-disable header/header */
|
|
4
4
|
const name = "@azure/msal-react";
|
|
5
|
-
const version = "3.0.
|
|
5
|
+
const version = "3.0.12";
|
|
6
6
|
|
|
7
7
|
export { name, version };
|
|
8
8
|
//# sourceMappingURL=packageMetadata.js.map
|
package/dist/utils/utilities.js
CHANGED
package/lib/msal-react.cjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-react v3.0.
|
|
1
|
+
/*! @azure/msal-react v3.0.12 2025-05-06 */
|
|
2
2
|
'use strict';
|
|
3
3
|
'use strict';
|
|
4
4
|
|
|
@@ -104,7 +104,7 @@ function getAccountByIdentifiers(allAccounts, accountIdentifiers) {
|
|
|
104
104
|
|
|
105
105
|
/* eslint-disable header/header */
|
|
106
106
|
const name = "@azure/msal-react";
|
|
107
|
-
const version = "3.0.
|
|
107
|
+
const version = "3.0.12";
|
|
108
108
|
|
|
109
109
|
/*
|
|
110
110
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -140,6 +140,10 @@ const reducer = (previousState, action) => {
|
|
|
140
140
|
default:
|
|
141
141
|
throw new Error(`Unknown action type: ${type}`);
|
|
142
142
|
}
|
|
143
|
+
if (newInProgress === msalBrowser.InteractionStatus.Startup) {
|
|
144
|
+
// Can't start checking accounts until initialization is complete
|
|
145
|
+
return previousState;
|
|
146
|
+
}
|
|
143
147
|
const currentAccounts = payload.instance.getAllAccounts();
|
|
144
148
|
if (newInProgress !== previousState.inProgress &&
|
|
145
149
|
!accountArraysAreEqual(currentAccounts, previousState.accounts)) {
|
|
@@ -184,7 +188,7 @@ function MsalProvider({ instance, children, }) {
|
|
|
184
188
|
// Lazy initialization of the initial state
|
|
185
189
|
return {
|
|
186
190
|
inProgress: msalBrowser.InteractionStatus.Startup,
|
|
187
|
-
accounts:
|
|
191
|
+
accounts: [],
|
|
188
192
|
};
|
|
189
193
|
});
|
|
190
194
|
React.useEffect(() => {
|
|
@@ -350,16 +354,25 @@ function getAccount(instance, accountIdentifiers) {
|
|
|
350
354
|
*/
|
|
351
355
|
function useAccount(accountIdentifiers) {
|
|
352
356
|
const { instance, inProgress, logger } = useMsal();
|
|
353
|
-
const [account, setAccount] = React.useState(() =>
|
|
357
|
+
const [account, setAccount] = React.useState(() => {
|
|
358
|
+
if (inProgress === msalBrowser.InteractionStatus.Startup) {
|
|
359
|
+
return null;
|
|
360
|
+
}
|
|
361
|
+
else {
|
|
362
|
+
return getAccount(instance, accountIdentifiers);
|
|
363
|
+
}
|
|
364
|
+
});
|
|
354
365
|
React.useEffect(() => {
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
366
|
+
if (inProgress !== msalBrowser.InteractionStatus.Startup) {
|
|
367
|
+
setAccount((currentAccount) => {
|
|
368
|
+
const nextAccount = getAccount(instance, accountIdentifiers);
|
|
369
|
+
if (!msalBrowser.AccountEntity.accountInfoIsEqual(currentAccount, nextAccount, true)) {
|
|
370
|
+
logger.info("useAccount - Updating account");
|
|
371
|
+
return nextAccount;
|
|
372
|
+
}
|
|
373
|
+
return currentAccount;
|
|
374
|
+
});
|
|
375
|
+
}
|
|
363
376
|
}, [inProgress, accountIdentifiers, instance, logger]);
|
|
364
377
|
return account;
|
|
365
378
|
}
|
|
@@ -552,8 +565,8 @@ function useMsalAuthentication(interactionType, authenticationRequest, accountId
|
|
|
552
565
|
React.useEffect(() => {
|
|
553
566
|
if (shouldAcquireToken.current &&
|
|
554
567
|
inProgress === msalBrowser.InteractionStatus.None) {
|
|
555
|
-
shouldAcquireToken.current = false;
|
|
556
568
|
if (!isAuthenticated) {
|
|
569
|
+
shouldAcquireToken.current = false;
|
|
557
570
|
logger.info("useMsalAuthentication - No user is authenticated, attempting to login");
|
|
558
571
|
login().catch(() => {
|
|
559
572
|
// Errors are saved in state above
|
|
@@ -561,6 +574,7 @@ function useMsalAuthentication(interactionType, authenticationRequest, accountId
|
|
|
561
574
|
});
|
|
562
575
|
}
|
|
563
576
|
else if (account) {
|
|
577
|
+
shouldAcquireToken.current = false;
|
|
564
578
|
logger.info("useMsalAuthentication - User is authenticated, attempting to acquire token");
|
|
565
579
|
acquireToken().catch(() => {
|
|
566
580
|
// Errors are saved in state above
|
package/lib/msal-react.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msal-react.cjs","sources":["../../src/MsalContext.ts","../../src/utils/utilities.ts","../../src/packageMetadata.ts","../../src/MsalProvider.tsx","../../src/hooks/useMsal.ts","../../src/hooks/useIsAuthenticated.ts","../../src/components/AuthenticatedTemplate.tsx","../../src/components/UnauthenticatedTemplate.tsx","../../src/hooks/useAccount.ts","../../src/error/ReactAuthError.ts","../../src/hooks/useMsalAuthentication.ts","../../src/components/MsalAuthenticationTemplate.tsx","../../src/components/withMsal.tsx"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,null,null,null],"names":["stubbedPublicClientApplication","InteractionStatus","Logger","React","EventMessageUtils","useEffect","WrapperSKU","useMemo","SKU","useReducer","useContext","useState","AccountEntity","AuthError","useRef","useCallback","InteractionType","OIDC_DEFAULT_SCOPES","InteractionRequiredAuthError","EventType"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"msal-react.cjs","sources":["../../src/MsalContext.ts","../../src/utils/utilities.ts","../../src/packageMetadata.ts","../../src/MsalProvider.tsx","../../src/hooks/useMsal.ts","../../src/hooks/useIsAuthenticated.ts","../../src/components/AuthenticatedTemplate.tsx","../../src/components/UnauthenticatedTemplate.tsx","../../src/hooks/useAccount.ts","../../src/error/ReactAuthError.ts","../../src/hooks/useMsalAuthentication.ts","../../src/components/MsalAuthenticationTemplate.tsx","../../src/components/withMsal.tsx"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,null,null,null],"names":["stubbedPublicClientApplication","InteractionStatus","Logger","React","EventMessageUtils","useEffect","WrapperSKU","useMemo","SKU","useReducer","useContext","useState","AccountEntity","AuthError","useRef","useCallback","InteractionType","OIDC_DEFAULT_SCOPES","InteractionRequiredAuthError","EventType"],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export declare const name = "@azure/msal-react";
|
|
2
|
-
export declare const version = "3.0.
|
|
2
|
+
export declare const version = "3.0.12";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@azure/msal-react",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.12",
|
|
4
4
|
"author": {
|
|
5
5
|
"name": "Microsoft",
|
|
6
6
|
"email": "nugetaad@microsoft.com",
|
|
@@ -56,26 +56,27 @@
|
|
|
56
56
|
"apiExtractor": "api-extractor run"
|
|
57
57
|
},
|
|
58
58
|
"peerDependencies": {
|
|
59
|
-
"@azure/msal-browser": "^4.
|
|
60
|
-
"react": "^16.8.0 || ^17 || ^18"
|
|
59
|
+
"@azure/msal-browser": "^4.12.0",
|
|
60
|
+
"react": "^16.8.0 || ^17 || ^18 || ^19"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
|
-
"@azure/msal-browser": "^4.
|
|
63
|
+
"@azure/msal-browser": "^4.12.0",
|
|
64
64
|
"@microsoft/api-extractor": "^7.43.4",
|
|
65
65
|
"@rollup/plugin-typescript": "^11.1.5",
|
|
66
66
|
"@testing-library/jest-dom": "^5.11.5",
|
|
67
|
-
"@testing-library/react": "^
|
|
67
|
+
"@testing-library/react": "^16.3.0",
|
|
68
68
|
"@types/jest": "^29.5.0",
|
|
69
69
|
"@types/node": "^20.5.1",
|
|
70
|
-
"@types/react": "^
|
|
71
|
-
"@types/react-dom": "^
|
|
70
|
+
"@types/react": "^19.1.2",
|
|
71
|
+
"@types/react-dom": "^19.1.2",
|
|
72
72
|
"eslint-config-msal": "file:../../shared-configs/eslint-config-msal",
|
|
73
73
|
"jest": "^29.5.0",
|
|
74
74
|
"jest-environment-jsdom": "^29.5.0",
|
|
75
|
+
"jest-junit": "^16.0.0",
|
|
75
76
|
"msal-test-utils": "file:../../shared-test-utils",
|
|
76
77
|
"prettier": "2.8.7",
|
|
77
|
-
"react": "^
|
|
78
|
-
"react-dom": "^
|
|
78
|
+
"react": "^19.1.0",
|
|
79
|
+
"react-dom": "^19.1.0",
|
|
79
80
|
"rollup": "^4.22.4",
|
|
80
81
|
"ts-jest": "^29.1.0",
|
|
81
82
|
"ts-jest-resolver": "^2.0.1",
|
package/src/MsalProvider.tsx
CHANGED
|
@@ -85,6 +85,11 @@ const reducer = (
|
|
|
85
85
|
throw new Error(`Unknown action type: ${type}`);
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
+
if (newInProgress === InteractionStatus.Startup) {
|
|
89
|
+
// Can't start checking accounts until initialization is complete
|
|
90
|
+
return previousState;
|
|
91
|
+
}
|
|
92
|
+
|
|
88
93
|
const currentAccounts = payload.instance.getAllAccounts();
|
|
89
94
|
if (
|
|
90
95
|
newInProgress !== previousState.inProgress &&
|
|
@@ -135,7 +140,7 @@ export function MsalProvider({
|
|
|
135
140
|
// Lazy initialization of the initial state
|
|
136
141
|
return {
|
|
137
142
|
inProgress: InteractionStatus.Startup,
|
|
138
|
-
accounts:
|
|
143
|
+
accounts: [],
|
|
139
144
|
};
|
|
140
145
|
});
|
|
141
146
|
|
package/src/hooks/useAccount.ts
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
AccountInfo,
|
|
9
9
|
IPublicClientApplication,
|
|
10
10
|
AccountEntity,
|
|
11
|
+
InteractionStatus,
|
|
11
12
|
} from "@azure/msal-browser";
|
|
12
13
|
import { useMsal } from "./useMsal.js";
|
|
13
14
|
import { AccountIdentifiers } from "../types/AccountIdentifiers.js";
|
|
@@ -42,26 +43,32 @@ export function useAccount(
|
|
|
42
43
|
): AccountInfo | null {
|
|
43
44
|
const { instance, inProgress, logger } = useMsal();
|
|
44
45
|
|
|
45
|
-
const [account, setAccount] = useState<AccountInfo | null>(() =>
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
const [account, setAccount] = useState<AccountInfo | null>(() => {
|
|
47
|
+
if (inProgress === InteractionStatus.Startup) {
|
|
48
|
+
return null;
|
|
49
|
+
} else {
|
|
50
|
+
return getAccount(instance, accountIdentifiers);
|
|
51
|
+
}
|
|
52
|
+
});
|
|
48
53
|
|
|
49
54
|
useEffect(() => {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
55
|
+
if (inProgress !== InteractionStatus.Startup) {
|
|
56
|
+
setAccount((currentAccount: AccountInfo | null) => {
|
|
57
|
+
const nextAccount = getAccount(instance, accountIdentifiers);
|
|
58
|
+
if (
|
|
59
|
+
!AccountEntity.accountInfoIsEqual(
|
|
60
|
+
currentAccount,
|
|
61
|
+
nextAccount,
|
|
62
|
+
true
|
|
63
|
+
)
|
|
64
|
+
) {
|
|
65
|
+
logger.info("useAccount - Updating account");
|
|
66
|
+
return nextAccount;
|
|
67
|
+
}
|
|
62
68
|
|
|
63
|
-
|
|
64
|
-
|
|
69
|
+
return currentAccount;
|
|
70
|
+
});
|
|
71
|
+
}
|
|
65
72
|
}, [inProgress, accountIdentifiers, instance, logger]);
|
|
66
73
|
|
|
67
74
|
return account;
|
|
@@ -253,8 +253,8 @@ export function useMsalAuthentication(
|
|
|
253
253
|
shouldAcquireToken.current &&
|
|
254
254
|
inProgress === InteractionStatus.None
|
|
255
255
|
) {
|
|
256
|
-
shouldAcquireToken.current = false;
|
|
257
256
|
if (!isAuthenticated) {
|
|
257
|
+
shouldAcquireToken.current = false;
|
|
258
258
|
logger.info(
|
|
259
259
|
"useMsalAuthentication - No user is authenticated, attempting to login"
|
|
260
260
|
);
|
|
@@ -263,6 +263,7 @@ export function useMsalAuthentication(
|
|
|
263
263
|
return;
|
|
264
264
|
});
|
|
265
265
|
} else if (account) {
|
|
266
|
+
shouldAcquireToken.current = false;
|
|
266
267
|
logger.info(
|
|
267
268
|
"useMsalAuthentication - User is authenticated, attempting to acquire token"
|
|
268
269
|
);
|
package/src/packageMetadata.ts
CHANGED