Skip to content

Commit 6c69381

Browse files
authored
Merge pull request #76951 from MicrosoftDocs/master
5/16 AM Publish
2 parents 1e5d699 + c4d97c8 commit 6c69381

File tree

139 files changed

+901
-763
lines changed

Some content is hidden

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

139 files changed

+901
-763
lines changed

articles/active-directory/conditional-access/howto-conditional-access-session-lifetime.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ If you have configured different Sign-in frequency for different web apps that a
7777
1. Choose all required conditions.
7878

7979
> [!NOTE]
80-
> Please note that this control requires to choose “All Cloud Apps” as a condition
80+
> Please note that this control requires to choose “All Cloud Apps” as a condition. Browser session persistence is controlled by authentication session token. All tabs in a browser session share a single session token and therefore they all must share persistence state.
8181
8282
1. Go to **Access Controls** > **Session** and click **Persistent browser session**
8383
1. Select a value from dropdown

articles/active-directory/develop/msal-net-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ This is because the Resource Manager API expects a slash in its audience claim (
190190
The logic used by Azure AD is the following:
191191
- For ADAL (v1.0) endpoint with a v1.0 access token (the only possible), aud=resource
192192
- For MSAL (v2.0 endpoint) asking an access token for a resource accepting v2.0 tokens, aud=resource.AppId
193-
- For MSAL (v2.0 endpoint) asking an access token for a resource accepting a v1.0 access token (which is the case above), Azure AD parses the desired audience from the requested scope by taking everything before the last slash and using it as the resource identifier. Therefore if https://database.windows.net expects an audience of "https://database.windows.net/", you'll need to request a scope of https://database.windows.net//.default. See also issue #[747](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/747): Resource url's trailing slash is omitted, which caused sql auth failure #747
193+
- For MSAL (v2.0 endpoint) asking an access token for a resource accepting a v1.0 access token (which is the case above), Azure AD parses the desired audience from the requested scope by taking everything before the last slash and using it as the resource identifier. Therefore if https:\//database.windows.net expects an audience of "https://database.windows.net/", you'll need to request a scope of https:\//database.windows.net//.default. See also issue #[747](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/747): Resource url's trailing slash is omitted, which caused sql auth failure #747
194194
195195

196196
### Scopes to request access to all the permissions of a v1.0 application

articles/active-directory/develop/scenario-web-app-call-api-app-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ private async Task OnAuthorizationCodeReceived(AuthorizationCodeReceivedNotifica
181181

182182
### MSAL.NET Token cache for a ASP.NET (Core) Web app
183183

184-
In web apps (or web APIs as a matter of fact), the token cache implementation is different from the Desktop applications token cache implementations (which are often [file based](scenario-desktop-acquire-token.md#file-based-token-cache). It can use the ASP.NET/ASP.NET Core session, or a Redis cache, or a database, or even Azure Blog storage. In the code snippet above this is the object of the `EnablePersistence(HttpContext, clientApp.UserTokenCache, clientApp.AppTokenCache);` method call, which binds a cache service. The detail of what happens here is beyond the scope of this scenario guide, but links are provided below.
184+
In web apps (or web APIs as a matter of fact), the token cache implementation is different from the Desktop applications token cache implementations (which are often [file based](scenario-desktop-acquire-token.md#file-based-token-cache). It can use the ASP.NET/ASP.NET Core session, or a Redis cache, or a database, or even Azure Blob storage. In the code snippet above this is the object of the `EnablePersistence(HttpContext, clientApp.UserTokenCache, clientApp.AppTokenCache);` method call, which binds a cache service. The detail of what happens here is beyond the scope of this scenario guide, but links are provided below.
185185

186186
> [!IMPORTANT]
187187
> A very important thing to realize is that for web Apps and web APIs, there should be one token cache per user (per account). You need to serialize the token cache for each account.

articles/active-directory/hybrid/whatis-azure-ad-connect.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ Rich [usage metrics](how-to-connect-health-adfs.md#usage-analytics-for-ad-fs)|To
6060
|Great user experience|Dashboard fashion from Azure portal</br>[Alerts through emails](how-to-connect-health-adfs.md#alerts-for-ad-fs)|
6161

6262

63+
## License requirements for using Azure AD Connect
64+
65+
[!INCLUDE [active-directory-free-license.md](../../../includes/active-directory-free-license.md)]
66+
67+
6368

6469

6570
## Next steps

articles/active-directory/hybrid/whatis-hybrid-identity.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ Here are some common hybrid identity and access management scenarios with recomm
5555
> <sup>4</sup> AD FS can be integrated with your enterprise PKI to allow sign-in using certificates. These certificates can be soft-certificates deployed via trusted provisioning channels such as MDM or GPO or smartcard certificates (including PIV/CAC cards) or Hello for Business (cert-trust). For more information about smartcard authentication support, see [this blog](https://blogs.msdn.microsoft.com/samueld/2016/07/19/adfs-certauth-aad-o365/).
5656
>
5757
58+
## License requirements for using Azure AD Connect
59+
60+
[!INCLUDE [active-directory-free-license.md](../../../includes/active-directory-free-license.md)]
61+
5862
## Next Steps
5963

6064
- [What is Azure AD Connect and Connect Health?](whatis-azure-ad-connect.md)

articles/active-directory/manage-apps/access-panel-extension-problem-installing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: Install the application access panel browser extension - Azure | Microsof
33
description: Fix common errors encountered when you install the access panel browser extension.
44
services: active-directory
55
documentationcenter: ''
6-
author: CelesteDG
7-
manager: mtillman
6+
author: msmimart
7+
manager: CelesteDG
88

99
ms.assetid:
1010
ms.service: active-directory
@@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
1616
ms.date: 5/4/2018
17-
ms.author: celested
17+
ms.author: mimart
1818
ms.reviewer: japere,asteen
1919
ms.collection: M365-identity-device-management
2020
---

articles/active-directory/manage-apps/access-panel-manage-self-service-access.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: How to use self-service application access | Microsoft Docs
33
description: Enable self-service application access to allow users to find their own applications
44
services: active-directory
55
documentationcenter: ''
6-
author: CelesteDG
7-
manager: mtillman
6+
author: msmimart
7+
manager: CelesteDG
88

99
ms.assetid:
1010
ms.service: active-directory
@@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
1616
ms.date: 07/11/2017
17-
ms.author: celested
17+
ms.author: mimart
1818
ms.reviewer: japere,asteen
1919
ms.collection: M365-identity-device-management
2020
---

articles/active-directory/manage-apps/access-panel-troubleshoot-application-not-appearing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: An assigned application is not appearing on the access panel | Microsoft
33
description: Troubleshoot why an application is not appearing in the Access Panel
44
services: active-directory
55
documentationcenter: ''
6-
author: CelesteDG
7-
manager: mtillman
6+
author: msmimart
7+
manager: CelesteDG
88

99
ms.assetid:
1010
ms.service: active-directory
@@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
1616
ms.date: 09/09/2018
17-
ms.author: celested
17+
ms.author: mimart
1818
ms.reviwer: japere
1919
ms.collection: M365-identity-device-management
2020
---

articles/active-directory/manage-apps/access-panel-troubleshoot-self-service-access.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: Problem using self-service application access | Microsoft Docs
33
description: Troubleshoot problems related to self-service application access
44
services: active-directory
55
documentationcenter: ''
6-
author: CelesteDG
7-
manager: mtillman
6+
author: msmimart
7+
manager: CelesteDG
88

99
ms.assetid:
1010
ms.service: active-directory
@@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
1616
ms.date: 07/11/2017
17-
ms.author: celested
17+
ms.author: mimart
1818
ms.reviewer: japere,asteen
1919
ms.collection: M365-identity-device-management
2020
---

articles/active-directory/manage-apps/access-panel-troubleshoot-unexpected-application.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: How applications appear on the access panel | Microsoft Docs
33
description: Troubleshoot why an application is appearing in the Access Panel
44
services: active-directory
55
documentationcenter: ''
6-
author: CelesteDG
7-
manager: mtillman
6+
author: msmimart
7+
manager: CelesteDG
88

99
ms.assetid:
1010
ms.service: active-directory
@@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
1616
ms.date: 07/11/2017
17-
ms.author: celested
17+
ms.author: mimart
1818
ms.reviewr: japere
1919
ms.collection: M365-identity-device-management
2020
---

0 commit comments

Comments
 (0)