Skip to content

Commit 6b550f1

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sancha/pvtlink
2 parents 80a3361 + fabaf47 commit 6b550f1

File tree

1,149 files changed

+14305
-10296
lines changed

Some content is hidden

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

1,149 files changed

+14305
-10296
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -128,54 +128,6 @@
128128
"branch": "master",
129129
"branch_mapping": {}
130130
},
131-
{
132-
"path_to_root": "samples-mediaservices-integration",
133-
"url": "https://github.com/Azure-Samples/media-services-dotnet-functions-integration",
134-
"branch": "main",
135-
"branch_mapping": {}
136-
},
137-
{
138-
"path_to_root": "samples-mediaservices-encryptiondrm",
139-
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-drm",
140-
"branch": "master",
141-
"branch_mapping": {}
142-
},
143-
{
144-
"path_to_root": "samples-mediaservices-encryptionfairplay",
145-
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-fairplay",
146-
"branch": "master",
147-
"branch_mapping": {}
148-
},
149-
{
150-
"path_to_root": "samples-mediaservices-encryptionaes",
151-
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-aes",
152-
"branch": "master",
153-
"branch_mapping": {}
154-
},
155-
{
156-
"path_to_root": "samples-mediaservices-copyblob",
157-
"url": "https://github.com/Azure-Samples/media-services-dotnet-copy-blob-into-asset",
158-
"branch": "master",
159-
"branch_mapping": {}
160-
},
161-
{
162-
"path_to_root": "samples-mediaservices-deliverplayready",
163-
"url": "https://github.com/Azure-Samples/media-services-dotnet-deliver-playready-widevine-licenses",
164-
"branch": "master",
165-
"branch_mapping": {}
166-
},
167-
{
168-
"path_to_root": "samples-mediaservices-livestream",
169-
"url": "https://github.com/Azure-Samples/media-services-dotnet-encode-live-stream-with-ams-clear",
170-
"branch": "master",
171-
"branch_mapping": {}
172-
},
173-
{
174-
"path_to_root": "samples-mediaservices-encoderstandard",
175-
"url": "https://github.com/Azure-Samples/media-services-dotnet-on-demand-encoding-with-media-encoder-standard",
176-
"branch": "master",
177-
"branch_mapping": {}
178-
},
179131
{
180132
"path_to_root": "azure-app-service-multi-container",
181133
"url": "https://github.com/Azure-Samples/multicontainerwordpress",
@@ -374,30 +326,6 @@
374326
"branch": "master",
375327
"branch_mapping": {}
376328
},
377-
{
378-
"path_to_root": "media-services-v3-dotnet-tutorials",
379-
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials",
380-
"branch": "main",
381-
"branch_mapping": {}
382-
},
383-
{
384-
"path_to_root": "media-services-v3-dotnet",
385-
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet",
386-
"branch": "main",
387-
"branch_mapping": {}
388-
},
389-
{
390-
"path_to_root": "media-services-v3-dotnet-core-functions-integration",
391-
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-core-functions-integration",
392-
"branch": "main",
393-
"branch_mapping": {}
394-
},
395-
{
396-
"path_to_root": "media-services-v3-python",
397-
"url": "https://github.com/Azure-Samples/media-services-v3-python",
398-
"branch": "main",
399-
"branch_mapping": {}
400-
},
401329
{
402330
"path_to_root": "samples-javascript",
403331
"url": "https://github.com/Microsoft/tsiclient",
@@ -410,24 +338,6 @@
410338
"branch": "master",
411339
"branch_mapping": {}
412340
},
413-
{
414-
"path_to_root": "media-services-v3-dotnet-core-tutorials",
415-
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-core-tutorials",
416-
"branch": "master",
417-
"branch_mapping": {}
418-
},
419-
{
420-
"path_to_root": "media-services-v3-rest-postman",
421-
"url": "https://github.com/Azure-Samples/media-services-v3-rest-postman",
422-
"branch": "master",
423-
"branch_mapping": {}
424-
},
425-
{
426-
"path_to_root": "media-services-v3-node-tutorials",
427-
"url": "https://github.com/Azure-Samples/media-services-v3-node-tutorials",
428-
"branch": "main",
429-
"branch_mapping": {}
430-
},
431341
{
432342
"path_to_root": "media-services-video-indexer",
433343
"url": "https://github.com/Azure-Samples/media-services-video-indexer",

articles/active-directory/authentication/howto-authentication-temporary-access-pass.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ To configure the Temporary Access Pass authentication method policy:
7171
After you enable a policy, you can create a Temporary Access Pass for a user in Azure AD.
7272
These roles can perform the following actions related to a Temporary Access Pass.
7373

74-
- Global Administrator can create, delete, view a Temporary Access Pass on any user (except themselves)
75-
- Privileged Authentication Administrators can create, delete, view a Temporary Access Pass on admins and members (except themselves)
76-
- Authentication Administrators can create, delete, view a Temporary Access Pass on members (except themselves)
74+
- Global Administrators can create, delete, and view a Temporary Access Pass on any user (except themselves)
75+
- Privileged Authentication Administrators can create, delete, and view a Temporary Access Pass on admins and members (except themselves)
76+
- Authentication Administrators can create, delete, and view a Temporary Access Pass on members (except themselves)
7777
- Global Reader can view the Temporary Access Pass details on the user (without reading the code itself).
7878

7979
1. Sign in to the Azure portal as either a Global administrator, Privileged Authentication administrator, or Authentication administrator.

articles/active-directory/develop/app-resilience-continuous-access-evaluation.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ Your app would then use the claims challenge to acquire a new access token for t
137137
```javascript
138138
const tokenRequest = {
139139
claims: window.atob(claimsChallenge), // decode the base64 string
140-
scopes: ['User.Read']
141-
account: msalInstance.getActiveAccount();
140+
scopes: ['User.Read'],
141+
account: msalInstance.getActiveAccount()
142142
};
143143

144144
let tokenResponse;
@@ -173,8 +173,9 @@ You can test your application by signing in a user and then using the Azure port
173173

174174
## Code samples
175175

176-
- [React single-page application using MSAL React to sign-in users against Azure Active Directory](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/2-Authorization-I/1-call-graph)
177-
- [Enable your ASP.NET Core web app to sign in users and call Microsoft Graph with the Microsoft identity platform](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-1-Call-MSGraph)
176+
- [Enable your Angular single-page application to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-javascript-angular-tutorial/tree/main/2-Authorization-I/1-call-graph)
177+
- [Enable your React single-page application to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/2-Authorization-I/1-call-graph)
178+
- [Enable your ASP.NET Core web app to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-1-Call-MSGraph)
178179
179180
## Next steps
180181

articles/active-directory/develop/claims-challenge.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,14 @@ const checkIsClientCapableOfClaimsChallenge = (req, res, next) => {
237237

238238
---
239239

240+
## Code samples
241+
242+
- [Enable your Angular single-page application to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-javascript-angular-tutorial/tree/main/2-Authorization-I/1-call-graph)
243+
- [Enable your React single-page application to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/2-Authorization-I/1-call-graph)
244+
- [Enable your ASP.NET Core web app to sign in users and call Microsoft Graph](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-1-Call-MSGraph)
245+
240246
## Next steps
241247

242248
- [Microsoft identity platform and OAuth 2.0 authorization code flow](v2-oauth2-auth-code-flow.md#request-an-authorization-code)
243249
- [How to use Continuous Access Evaluation enabled APIs in your applications](app-resilience-continuous-access-evaluation.md)
244250
- [Granular Conditional Access for sensitive data and actions](https://techcommunity.microsoft.com/t5/azure-active-directory-identity/granular-conditional-access-for-sensitive-data-and-actions/ba-p/1751775)
245-
- [React single-page application using MSAL React to sign-in users against Azure Active Directory](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/2-Authorization-I/1-call-graph)
246-
- [Enable your ASP.NET Core web app to sign in users and call Microsoft Graph with the Microsoft identity platform](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-1-Call-MSGraph)
Lines changed: 57 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Interactive request prompt behavior (MSAL.js)
3-
description: Learn to customize prompt behavior in interactive calls using the Microsoft Authentication Library for JavaScript (MSAL.js).
2+
title: Prompt behavior with MSAL.js
3+
description: Learn to customize prompt behavior using the Microsoft Authentication Library for JavaScript (MSAL.js).
44
services: active-directory
55
author: mmacy
66
manager: CelesteDG
@@ -16,34 +16,76 @@ ms.custom: aaddev
1616
#Customer intent: As an application developer, I want to learn about customizing the UI prompt behaviors in MSAL.js library so I can decide if this platform meets my application development needs and requirements.
1717
---
1818

19-
# Prompt behavior in MSAL.js interactive requests
19+
# Prompt behavior with MSAL.js
2020

21-
When a user has established an active Azure AD session with multiple user accounts, the Azure AD sign in page will by default prompt the user to select an account before proceeding to sign in. Users will not see an account selection experience if there is only a single authenticated session with Azure AD.
21+
MSAL.js allows passing a prompt value as part of its login or token request methods. Based on your application scenario, you can customize the Azure AD prompt behavior for a request by setting the **prompt** parameter in the [request object](https://azuread.github.io/microsoft-authentication-library-for-js/ref/modules/_azure_msal_common.html#commonauthorizationurlrequest):
2222

23-
The MSAL.js library (starting in v0.2.4) does not send a prompt parameter during the interactive requests (`loginRedirect`, `loginPopup`, `acquireTokenRedirect` and `acquireTokenPopup`), and thereby does not enforce any prompt behavior. For silent token requests using the `acquireTokenSilent` method, MSAL.js passes a prompt parameter set to `none`.
23+
```javascript
24+
import { PublicClientApplication } from "@azure/msal-browser";
2425

25-
Based on your application scenario, you can control the prompt behavior for the interactive requests by setting the prompt parameter in the request parameters passed to the methods. For example, if you want to invoke the account selection experience:
26+
const pca = new PublicClientApplication({
27+
auth: {
28+
clientId: "YOUR_CLIENT_ID"
29+
}
30+
});
2631

27-
```javascript
28-
var request = {
32+
const loginRequest = {
2933
scopes: ["user.read"],
3034
prompt: 'select_account',
3135
}
3236

33-
userAgentApplication.loginRedirect(request);
37+
pca.loginPopup(loginRequest)
38+
.then(response => {
39+
// do something with the response
40+
})
41+
.catch(error => {
42+
// handle errors
43+
});
3444
```
3545

46+
## Supported prompt values
47+
48+
The following prompt values can be used when authenticating with the Microsoft identity platform:
49+
50+
| Parameter | Behavior |
51+
|------------|----------------------------------------------------------------------------------|
52+
| `login` | Forces the user to enter their credentials on that request, negating single-sign on. |
53+
| `none` | Ensures that the user isn't presented with any interactive prompt. If the request can't be completed silently by using single-sign on, the Microsoft identity platform returns a *login_required* or *interaction_required* error. |
54+
| `consent` | Triggers the OAuth consent dialog after the user signs in, asking the user to grant permissions to the app. |
55+
| `select_account` | Interrupts single sign-on by providing an account selection experience listing all the accounts in session or an option to choose a different account altogether. |
56+
| `create` | Triggers a sign-up dialog allowing external users to create an account. For more information, see: [Self-service sign-up](../external-identities/self-service-sign-up-overview.md) |
57+
58+
MSAL.js will throw an `invalid_prompt` error for any unsupported prompt values:
59+
60+
```console
61+
invalid_prompt_value: Supported prompt values are 'login', 'select_account', 'consent', 'create' and 'none'. Please see here for valid configuration options: https://azuread.github.io/microsoft-authentication-library-for-js/ref/modules/_azure_msal_common.html#commonauthorizationurlrequest Given value: my_custom_prompt
62+
```
63+
64+
## Default prompt values
65+
66+
The following shows default prompt values that MSAL.js uses:
3667

37-
The following prompt values can be passed when authenticating with Azure AD:
68+
| MSAL.js method | Default prompt | Allowed prompts |
69+
|------------------------|----------------|-----------------|
70+
| `loginPopup` | N/A | Any |
71+
| `loginRedirect` | N/A | Any |
72+
| `ssoSilent` | `none` | N/A (ignored) |
73+
| `acquireTokenPopup` | N/A | Any |
74+
| `acquireTokenRedirect` | N/A | Any |
75+
| `acquireTokenSilent` | `none` | N/A (ignored) |
3876

39-
**login:** This value will force the user to enter credentials on the authentication request.
77+
> [!NOTE]
78+
> Note that **prompt** is a protocol-level parameter and signals the desired authentication behavior to the identity provider. It does not affect MSAL.js behavior and MSAL.js does not have control over how the service will ultimately handle the request. In most circumstances, Azure AD will try to honor the request. If this is not possible, it may return an error response, or completely ignore the given prompt value.
4079
41-
**select_account:** This value will provide the user with an account selection experience listing all the accounts in session.
80+
## Interactive requests with prompt=none
4281

43-
**consent:** This value will invoke the OAuth consent dialogue that allows users to grant permissions to the app.
82+
Generally, when you need to make a silent request, use a silent MSAL.js method (`ssoSilent`, `acquireTokenSilent`), and handle any *login_required* or *interaction_required* errors with an interactive method (`loginPopup`, `loginRedirect`, `acquireTokenPopup`, `acquireTokenRedirect`).
4483

45-
**none:** This value will ensure that the user does not see any interactive prompt. It is recommended not to pass this value to interactive methods in MSAL.js as it can have unexpected behaviors. Instead, use the `acquireTokenSilent` method to achieve silent calls.
84+
In some cases however, the prompt value `none` can be used together with an interactive MSAL.js method to achieve silent authentication. For instance, due to the third-party cookie restrictions in some browsers, `ssoSilent` requests will fail despite an active user session with Azure AD. As a remedy, you can pass the prompt value `none` to an interactive request such as `loginPopup`. MSAL.js will then open a popup window to Azure AD and Azure AD will honor the prompt value by utilizing the existing session cookie. In this case, the user will see a brief popup window but will not be prompted for a credential entry.
4685

4786
## Next steps
4887

49-
Read more about the `prompt` parameter in the [OAuth 2.0 implicit grant](v2-oauth2-implicit-grant-flow.md) protocol which MSAL.js library uses.
88+
- [Single sign-on with MSAL.js](msal-js-sso.md)
89+
- [Handle errors and exceptions in MSAL.js](msal-error-handling-js.md)
90+
- [Handle ITP in Safari and other browsers where third-party cookies are blocked](reference-third-party-cookies-spas.md)
91+
- [OAuth 2.0 authorization code flow](v2-oauth2-auth-code-flow.md)

articles/active-directory/develop/whats-new-docs.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: active-directory
55
author: mmacy
66
manager: CelesteDG
77

8-
ms.date: 09/01/2022
8+
ms.date: 09/03/2022
99
ms.service: active-directory
1010
ms.subservice: develop
1111
ms.topic: reference
@@ -18,6 +18,19 @@ ms.custom: has-adal-ref
1818

1919
Welcome to what's new in the Microsoft identity platform documentation. This article lists new docs that have been added and those that have had significant updates in the last three months.
2020

21+
## September 2022
22+
23+
### New articles
24+
25+
- [Configure a user-assigned managed identity to trust an external identity provider (preview)](workload-identity-federation-create-trust-user-assigned-managed-identity.md)
26+
- [Important considerations and restrictions for federated identity credentials](workload-identity-federation-considerations.md)
27+
28+
### Updated articles
29+
30+
- [How to use Continuous Access Evaluation enabled APIs in your applications](app-resilience-continuous-access-evaluation.md)
31+
- [Run automated integration tests](test-automate-integration-testing.md)
32+
- [Tutorial: Sign in users and call the Microsoft Graph API from a JavaScript single-page application (SPA)](tutorial-v2-javascript-spa.md)
33+
2134
## August 2022
2235

2336
### Updated articles
@@ -51,13 +64,3 @@ Welcome to what's new in the Microsoft identity platform documentation. This art
5164
- [Microsoft identity platform access tokens](access-tokens.md)
5265
- [Single-page application: Sign-in and Sign-out](scenario-spa-sign-in.md)
5366
- [Tutorial: Add sign-in to Microsoft to an ASP.NET web app](tutorial-v2-asp-webapp.md)
54-
55-
## June 2022
56-
57-
### Updated articles
58-
59-
- [Add app roles to your application and receive them in the token](howto-add-app-roles-in-azure-ad-apps.md)
60-
- [Azure AD Authentication and authorization error codes](reference-aadsts-error-codes.md)
61-
- [Microsoft identity platform refresh tokens](refresh-tokens.md)
62-
- [Single-page application: Acquire a token to call an API](scenario-spa-acquire-token.md)
63-
- [Tutorial: Sign in users and call the Microsoft Graph API in an Electron desktop app](tutorial-v2-nodejs-desktop.md)

articles/active-directory/devices/concept-azure-ad-register.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: devices
88
ms.topic: conceptual
9-
ms.date: 02/15/2022
9+
ms.date: 09/30/2022
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -26,10 +26,11 @@ The goal of Azure AD registered - also known as Workplace joined - devices is to
2626
| | Bring your own device |
2727
| | Mobile devices |
2828
| **Device ownership** | User or Organization |
29-
| **Operating Systems** | Windows 10 or newer, iOS, Android, and macOS |
29+
| **Operating Systems** | Windows 10 or newer, iOS, Android, macOS, Ubuntu 20.04/22.04 |
3030
| **Provisioning** | Windows 10 or newer – Settings |
3131
| | iOS/Android – Company Portal or Microsoft Authenticator app |
3232
| | macOS – Company Portal |
33+
| | Linux - Intune Agent |
3334
| **Device sign in options** | End-user local credentials |
3435
| | Password |
3536
| | Windows Hello |
246 KB
Loading

0 commit comments

Comments
 (0)