Skip to content

Commit 5718f41

Browse files
authored
Merge pull request #248970 from MicrosoftDocs/main
Publish to live, Tuesday 4 AM PST, 8/22
2 parents 76c602d + 79fb2ce commit 5718f41

File tree

103 files changed

+1000
-965
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1000
-965
lines changed

articles/active-directory/develop/includes/develop-preview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ ms.topic: include
1515
# > FEATURE_OR_LIBRARY [!INCLUDE [PREVIEW BOILERPLATE](../../../includes/active-directory-develop-preview.md)]
1616
#
1717
---
18-
is in public preview. This preview is provided without a service-level agreement and isn't recommended for production workloads. Some features might be unsupported or have constrained capabilities. For more information, see [Supplemental terms of use for Microsoft Azure previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
18+
is in public preview. This preview is provided without a service-level agreement and isn't recommended for production workloads. Some features might be unsupported or have constrained capabilities. For more information, see [Universal License Terms for Online Services](https://aka.ms/EntraPreviewsTermsOfUse).

articles/active-directory/develop/includes/libraries/libraries-daemon.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
|PHP| [The PHP League oauth2-client](https://oauth2-client.thephpleague.com/usage/) | [League\OAuth2](https://oauth2-client.thephpleague.com/) | ![Green check mark.][n] | ![X indicating no.][n] | ![Green check mark.][y] | -- |
99
-->
1010

11-
<sup>1</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in *Public preview*.
11+
<sup>1</sup> [Universal License Terms for Online Services][preview-tos] apply to libraries in *Public preview*.
1212

1313
<!--Image references-->
1414

@@ -17,4 +17,4 @@
1717

1818
<!--Reference-style links -->
1919

20-
[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
20+
[preview-tos]: https://aka.ms/EntraPreviewsTermsOfUse

articles/active-directory/develop/includes/libraries/libraries-desktop.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| React Native | [React Native App Auth](https://github.com/FormidableLabs/react-native-app-auth/blob/main/docs/config-examples/azure-active-directory.md) | [react-native-app-auth](https://www.npmjs.com/package/react-native-app-auth) | ![X indicating no.][n] | ![Green check mark.][y] | ![Green check mark.][y] | -- |
1111
-->
1212

13-
<sup>1</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in *Public preview*.
13+
<sup>1</sup> [Universal License Terms for Online Services][preview-tos] apply to libraries in *Public preview*.
1414

1515
<!--Image references-->
1616

@@ -20,4 +20,4 @@
2020

2121
<!--Reference-style links -->
2222

23-
[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
23+
[preview-tos]: https://aka.ms/EntraPreviewsTermsOfUse

articles/active-directory/develop/includes/libraries/libraries-mobile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
| React Native |[React Native App Auth](https://github.com/FormidableLabs/react-native-app-auth/blob/main/docs/config-examples/azure-active-directory.md) | [react-native-app-auth](https://www.npmjs.com/package/react-native-app-auth) | ![X indicating no.][n] | ![Green check mark.][y] | ![Green check mark.][y] | -- |
99
-->
1010

11-
<sup>1</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in *Public preview*.
11+
<sup>1</sup> [Universal License Terms for Online Services][preview-tos] apply to libraries in *Public preview*.
1212

1313
<!--Image references-->
1414

@@ -17,4 +17,4 @@
1717

1818
<!--Reference-style links -->
1919

20-
[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
20+
[preview-tos]: https://aka.ms/EntraPreviewsTermsOfUse

articles/active-directory/develop/includes/libraries/libraries-spa.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.author: henrymbugua
1919
| Vue | [Vue MSAL]( https://github.com/mvertopoulos/vue-msal) | [vue-msal]( https://www.npmjs.com/package/vue-msal) | ![X indicating no.][n] | ![Green check mark.][y] | ![Green check mark.][y] | -- |
2020
-->
2121

22-
<sup>1</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in _Public preview_.
22+
<sup>1</sup> [Universal License Terms for Online Services][preview-tos] apply to libraries in _Public preview_.
2323

2424
<sup>2</sup> [Auth code flow][auth-code-flow] with PKCE only (Recommended).
2525

@@ -34,6 +34,6 @@ ms.author: henrymbugua
3434

3535
[aad-app-model-v2-overview]: v2-overview.md
3636
[microsoft-sdl]: https://www.microsoft.com/securityengineering/sdl/
37-
[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
37+
[preview-tos]: https://aka.ms/EntraPreviewsTermsOfUse
3838
[auth-code-flow]: ../../v2-oauth2-auth-code-flow.md
3939
[implicit-flow]: ../../v2-oauth2-implicit-grant-flow.md

articles/active-directory/develop/includes/libraries/libraries-webapp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
| Ruby | [OmniAuth](https://github.com/omniauth/omniauth) | [omniauth 1.3.1](https://github.com/omniauth/omniauth/releases/tag/v1.3.1)<br/>[omniauth-oauth2 1.4.0](https://github.com/intridea/omniauth-oauth2) | ![X indicating no.][n] | ![X indicating no.][n] | ![Green check mark.][y] | -- |
1818
-->
1919

20-
<sup>(1)</sup> [Supplemental terms of use for Microsoft Azure Previews][preview-tos] apply to libraries in *Public preview*.
20+
<sup>(1)</sup> [Universal License Terms for Online Services][preview-tos] apply to libraries in *Public preview*.
2121

2222
<sup>(2)</sup> The [Microsoft.IdentityModel](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet) library only _validates_ tokens - it can't request ID or access tokens.
2323

@@ -28,4 +28,4 @@
2828

2929
<!--Reference-style links -->
3030

31-
[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
31+
[preview-tos]: https://aka.ms/EntraPreviewsTermsOfUse

articles/active-directory/develop/msal-error-handling-js.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ The following error types are available:
4646

4747
- `AuthError`: Base error class for the MSAL.js library, also used for unexpected errors.
4848

49-
- `ClientAuthError`: Error class, which denotes an issue with Client authentication. Most errors that come from the library will be ClientAuthErrors. These errors result from things like calling a login method when login is already in progress, the user cancels the login, and so on.
49+
- `ClientAuthError`: Error class which denotes an issue with Client authentication. Most errors that come from the library are ClientAuthErrors. These errors result from things like calling a login method when login is already in progress, the user cancels the login, and so on.
5050

5151
- `ClientConfigurationError`: Error class, extends `ClientAuthError` thrown before requests are made when the given user config parameters are malformed or missing.
5252

53-
- `ServerError`: Error class, represents the error strings sent by the authentication server. These may be errors such as invalid request formats or parameters, or any other errors that prevent the server from authenticating or authorizing the user.
53+
- `ServerError`: Error class, represents the error strings sent by the authentication server. These errors may be invalid request formats or parameters, or any other errors that prevent the server from authenticating or authorizing the user.
5454

5555
- `InteractionRequiredAuthError`: Error class, extends `ServerError` to represent server errors, which require an interactive call. This error is thrown by `acquireTokenSilent` if the user is required to interact with the server to provide credentials or consent for authentication/authorization. Error codes include `"interaction_required"`, `"login_required"`, and `"consent_required"`.
5656

@@ -71,7 +71,7 @@ myMSALObj.handleRedirectPromise()
7171
myMSALObj.acquireTokenRedirect(request);
7272
```
7373

74-
The methods for pop-up experience (`loginPopup`, `acquireTokenPopup`) return promises, so you can use the promise pattern (.then and .catch) to handle them as shown:
74+
The methods for pop-up experience (`loginPopup`, `acquireTokenPopup`) return promises, so you can use the promise pattern (`.then` and `.catch`) to handle them as shown:
7575

7676
```javascript
7777
myMSALObj.acquireTokenPopup(request).then(
@@ -144,6 +144,10 @@ When calling an API requiring Conditional Access, you can receive a claims chall
144144
145145
See [How to use Continuous Access Evaluation enabled APIs in your applications](./app-resilience-continuous-access-evaluation.md) for more detail.
146146
147+
### Using other frameworks
148+
149+
Using toolkits like Tauri for registered single page applications (SPAs) with the identity platform are not recognized for production apps. SPAs only support URLs that start with `https` for production apps and `http://localhost` for local development. Prefixes like `tauri://localhost` cannot be used for browser apps. This format can only be supported for mobile or web apps as they have a confidential component unlike browser apps.
150+
147151
[!INCLUDE [Active directory error handling retries](./includes/error-handling-and-tips/error-handling-retries.md)]
148152

149153
## Next steps

articles/active-directory/develop/msal-ios-shared-devices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ These Microsoft applications support Azure AD's shared device mode:
250250
- [Microsoft Teams](/microsoftteams/platform/) (in Public Preview)
251251

252252
> [!IMPORTANT]
253-
> Public preview is provided without a service-level agreement and isn't recommended for production workloads. Some features might be unsupported or have constrained capabilities. For more information, see [Supplemental terms of use for Microsoft Azure previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
253+
> Public preview is provided without a service-level agreement and isn't recommended for production workloads. Some features might be unsupported or have constrained capabilities. For more information, see [Universal License Terms for Online Services](https://aka.ms/EntraPreviewsTermsOfUse).
254254
255255
## Next steps
256256

articles/active-directory/develop/reference-v2-libraries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ For more information about the Microsoft Authentication Library, see the [Overvi
7575
<!--Reference-style links -->
7676
[AAD-App-Model-V2-Overview]: v2-overview.md
7777
[Microsoft-SDL]: https://www.microsoft.com/securityengineering/sdl/
78-
[preview-tos]: https://azure.microsoft.com/support/legal/preview-supplemental-terms/
78+
[preview-tos]: https://aka.ms/EntraPreviewsTermsOfUse

articles/active-directory/external-identities/add-users-administrator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ After you add a guest user to the directory, you can either send the guest user
2424
> [!IMPORTANT]
2525
> You should follow the steps in [How-to: Add your organization's privacy info in Azure Active Directory](../fundamentals/properties-area.md) to add the URL of your organization's privacy statement. As part of the first time invitation redemption process, an invited user must consent to your privacy terms to continue.
2626
27-
The updated experience for creating new users covered in this article is available as an Azure AD preview feature. This feature is enabled by default, but you can opt out by going to **Azure AD** > **Preview features** and disabling the **Create user experience** feature. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
27+
The updated experience for creating new users covered in this article is available as an Azure AD preview feature. This feature is enabled by default, but you can opt out by going to **Azure AD** > **Preview features** and disabling the **Create user experience** feature. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://www.microsoft.com/licensing/terms/product/ForOnlineServices/EAEAS).
2828

2929
Instructions for the legacy create user process can be found in the [Add or delete users](../fundamentals/add-users.md) article.
3030

0 commit comments

Comments
 (0)