Skip to content

Commit 834fd58

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 6e0eed3 + b77e977 commit 834fd58

File tree

258 files changed

+1553
-1323
lines changed

Some content is hidden

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

258 files changed

+1553
-1323
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26476,6 +26476,11 @@
2647626476
"redirect_url": "/azure/hdinsight/spark/apache-spark-overview",
2647726477
"redirect_document_id": true
2647826478
},
26479+
{
26480+
"source_path": "articles/hdinsight/spark/apache-spark-eventhub-streaming.md",
26481+
"redirect_url": "/azure/hdinsight/spark/apache-spark-ipython-notebook-machine-learning",
26482+
"redirect_document_id": false
26483+
},
2647926484
{
2648026485
"source_path": "articles/hdinsight/storm/apache-storm-sensor-data-analysis.md",
2648126486
"redirect_url": "https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/",

articles/active-directory-b2c/active-directory-b2c-user-migration.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 08/31/2019
11+
ms.date: 11/26/2019
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
1515

16-
# Azure Active Directory B2C: User migration
16+
# Migrate users to Azure Active Directory B2C
1717

1818
When you migrate your identity provider to Azure Active Directory B2C (Azure AD B2C), you might also need to migrate the user accounts. This article explains how to migrate existing user accounts from any identity provider to Azure AD B2C. The article is not meant to be prescriptive, but rather, it describes a few scenarios. The developer is responsible for the suitability of each approach.
1919

@@ -302,7 +302,17 @@ In Solution Explorer, right-click on the `AADB2C.UserMigration.API`, select "Pub
302302

303303
The preceding technical profile defines one input claim: `signInName` (send as email). On sign-in, the claim is sent to your RESTful endpoint.
304304

305-
After you define the technical profile for your RESTful API, tell your Azure AD B2C policy to call the technical profile. The XML snippet overrides `SelfAsserted-LocalAccountSignin-Email`, which is defined in the base policy. The XML snippet also adds `ValidationTechnicalProfile`, with ReferenceId pointing to your technical profile `LocalAccountUserMigration`.
305+
After you define the technical profile for your RESTful API, configure the existing `SelfAsserted-LocalAccountSignin-Email` technical profile to additionally call your REST API technical profile by overriding it within your *TrustFrameworkExtensions.xml* file:
306+
307+
```XML
308+
<TechnicalProfile Id="SelfAsserted-LocalAccountSignin-Email">
309+
<ValidationTechnicalProfiles>
310+
<ValidationTechnicalProfile ReferenceId="LocalAccountUserMigration" />
311+
</ValidationTechnicalProfiles>
312+
</TechnicalProfile>
313+
```
314+
315+
Then, change the `Id` of the `LocalAccountSignIn` technical profile to `LocalAccountUserMigration`.
306316

307317
### Step 4.4: Upload the policy to your tenant
308318

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 04/26/2019
9+
ms.date: 11/21/2019
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
1313
manager: daveba
14-
ms.reviewer: calebb
14+
ms.reviewer: jlu, calebb
1515

1616
ms.collection: M365-identity-device-management
1717
---
@@ -36,7 +36,17 @@ The Azure Active Directory (Azure AD) default configuration for user sign in fre
3636

3737
It might sound alarming to not ask for a user to sign back in, in reality any violation of IT policies will revoke the session. Some examples include (but are not limited to) a password change, an incompliant device, or account disable. You can also explicitly [revoke users’ sessions using PowerShell](https://docs.microsoft.com/powershell/module/azuread/revoke-azureaduserallrefreshtoken?view=azureadps-2.0). The Azure AD default configuration comes down to “don’t ask users to provide their credentials if security posture of their sessions has not changed”.
3838

39-
Sign-in frequency setting works with apps that have implemented OAUTH2 or OIDC protocols according to the standards. Most Microsoft native apps for Windows, Mac, and Mobile comply with the setting.
39+
Sign-in frequency setting works with apps that have implemented OAUTH2 or OIDC protocols according to the standards. Most Microsoft native apps for Windows, Mac, and Mobile including the following comply with the setting.
40+
41+
- Word, Excel, PowerPoint Online
42+
- OneNote Online
43+
- Office.com
44+
- O365 Admin portal
45+
- Exchange Online
46+
- SharePoint and OneDrive
47+
- Teams web client
48+
- Dynamics CRM Online
49+
- Azure portal
4050

4151
## Persistence of browsing sessions
4252

articles/active-directory/develop/TOC.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@
6060
- name: .NET Core console (daemon)
6161
href: quickstart-v2-netcore-daemon.md
6262
- name: Python console daemon
63-
href: quickstart-v2-python-daemon.md
64-
- name: ASP.NET daemon web app
65-
href: https://github.com/Azure-Samples/active-directory-dotnet-daemon-v2
63+
href: quickstart-v2-python-daemon.md
6664
- name: Tutorials
6765
items:
6866
- name: Single-page apps
@@ -83,6 +81,10 @@
8381
href: tutorial-v2-windows-uwp.md
8482
- name: Windows Desktop .NET
8583
href: tutorial-v2-windows-desktop.md
84+
- name: Daemon apps
85+
items:
86+
- name: ASP.NET daemon web app
87+
href: tutorial-v2-aspnet-daemon-web-app.md
8688
- name: Samples
8789
href: sample-v2-code.md
8890
- name: Concepts

articles/active-directory/develop/developer-glossary.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.devlang: na
1414
ms.topic: conceptual
1515
ms.tgt_pltfrm: na
1616
ms.workload: identity
17-
ms.date: 05/21/2019
17+
ms.date: 10/28/2019
1818
ms.author: ryanwi
1919
ms.custom: aaddev
2020
ms.reviewer: jmprieur, saeeda, jesakowi, nacanuma
@@ -227,7 +227,7 @@ Use the following comments section to provide feedback and help to refine and sh
227227
[AAD-App-SP-Objects]:app-objects-and-service-principals.md
228228
[AAD-Auth-Scenarios]:authentication-scenarios.md
229229
[AAD-Dev-Guide]:azure-ad-developers-guide.md
230-
[AAD-Graph-Perm-Scopes]: https://msdn.microsoft.com/library/azure/ad/graph/howto/azure-ad-graph-api-permission-scopes
230+
[AAD-Graph-Perm-Scopes]: /graph/permissions-reference
231231
[AAD-Graph-App-Entity]: https://msdn.microsoft.com/Library/Azure/Ad/Graph/api/entity-and-complex-type-reference#application-entity
232232
[AAD-Graph-Sp-Entity]: https://msdn.microsoft.com/Library/Azure/Ad/Graph/api/entity-and-complex-type-reference#serviceprincipal-entity
233233
[AAD-Graph-User-Entity]: https://msdn.microsoft.com/Library/Azure/Ad/Graph/api/entity-and-complex-type-reference#user-entity
20.4 KB
Loading
33 KB
Loading
42.8 KB
Loading

0 commit comments

Comments
 (0)