Skip to content

Commit 6bdd7aa

Browse files
authored
Merge pull request #29 from MicrosoftDocs/master
update fork
2 parents f6ece40 + 6531a52 commit 6bdd7aa

File tree

7,916 files changed

+159512
-110759
lines changed

Some content is hidden

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

7,916 files changed

+159512
-110759
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
Thumbs.db
44

55
# Visual Studio and VS Code files
6-
.settings.json
76
.vscode/*
87
.vs/*
98
log/
@@ -24,3 +23,4 @@ AzureMigration.ps1
2423
!/.vscode/extensions.json
2524
.gitignore
2625
**/.vscode/settings.json
26+
!/.vscode/settings.json

.openpublishing.publish.config.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,11 @@
419419
"url": "https://github.com/Azure/azure-cosmosdb-java",
420420
"branch": "master"
421421
},
422+
{
423+
"path_to_root": "azure-cosmosdb-graph-dotnet",
424+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-graph-gremlindotnet-getting-started",
425+
"branch": "master"
426+
},
422427
{
423428
"path_to_root": "azure-cosmosdb-java-v4-getting-started",
424429
"url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",
@@ -433,14 +438,6 @@
433438
"master": [
434439
"Publish",
435440
"PDF"
436-
],
437-
"release-event-grid": [
438-
"Publish",
439-
"PDF"
440-
],
441-
"hd-insight-pdf": [
442-
"Publish",
443-
"PDF"
444441
]
445442
},
446443
"need_generate_pdf_url_template": true,

.openpublishing.redirection.json

Lines changed: 2272 additions & 470 deletions
Large diffs are not rendered by default.

.vscode/settings.json

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"markdown.docsetLanguages": [
3+
".NET Core CLI",
4+
"Apache",
5+
"ASPX",
6+
"AzCopy",
7+
"Azure CLI",
8+
"Azure CLI (Interactive)",
9+
"Azure Powershell",
10+
"Azure Powershell (Interactive)",
11+
"Bash",
12+
"C",
13+
"C#",
14+
"C# (Interactive)",
15+
"C++",
16+
"CSS",
17+
"DAX Power BI",
18+
"Diff",
19+
"Dockerfile",
20+
"DOS",
21+
"F#",
22+
"Go",
23+
"Gradle",
24+
"Groovy",
25+
"HTML",
26+
"HTTP",
27+
"Ini",
28+
"Java",
29+
"JavaScript",
30+
"JSON",
31+
"Kotlin",
32+
"Kusto",
33+
"Markdown",
34+
"MS Graph (Interactive)",
35+
"Objective C",
36+
"PHP",
37+
"Plaintext no highlight",
38+
"PostgreSQL & PL/pgSQL",
39+
"PowerShell",
40+
"PowerShell (Interactive)",
41+
"Properties",
42+
"Python",
43+
"R",
44+
"Razor CSHTML",
45+
"Ruby",
46+
"Scala",
47+
"Shell",
48+
"Solidity",
49+
"SQL",
50+
"Swift",
51+
"Terraform (HCL)",
52+
"TypeScript",
53+
"VB.NET",
54+
"XAML",
55+
"XML",
56+
"YAML"
57+
],
58+
"cSpell.words": [
59+
"auditd"
60+
]
61+
}

CODEOWNERS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
# Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
22
# Cognitive Services
3-
articles/cognitive-services/ @diberry @erhopf, @nitinme
3+
articles/cognitive-services/ @diberry @erhopf @aahill @ievangelist @patrickfarley @nitinme
44

55
# DevOps
66
articles/ansible/ @TomArcherMsft
77
articles/chef/ @TomArcherMsft
88
articles/jenkins/ @TomArcherMsft
99
articles/terraform/ @TomArcherMsft
1010

11+
# Requires Internal Review
12+
articles/best-practices-availability-paired-regions.md @jpconnock @arob98 @syntaxc4 @tysonn @snoviking
13+
1114
# Governance
1215
articles/governance/ @DCtheGeek
1316

articles/active-directory-b2c/TOC.yml

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@
8181
- name: Register a SAML service provider
8282
href: connect-with-saml-service-providers.md
8383
displayName: SP, RP, service provider, connect
84+
- name: Register a Graph application
85+
href: microsoft-graph-get-started.md
86+
displayName: migrate, migration, microsoft graph
8487
- name: Add a web API application
8588
href: add-web-application.md
8689
- name: Add a native client application
@@ -101,7 +104,7 @@
101104
href: user-flow-self-service-password-reset.md
102105
- name: UX customization
103106
items:
104-
- name: User interface customization
107+
- name: Customize the UI
105108
href: customize-ui-overview.md
106109
- name: JavaScript and page layouts
107110
href: user-flow-javascript-overview.md
@@ -177,13 +180,9 @@
177180
- name: Customize the UI
178181
href: custom-policy-ui-customization.md
179182
displayName: ux, input, cors, html, css
180-
- name: Customize the UI dynamically
181-
href: custom-policy-ui-customization-dynamic.md
182183
- name: Custom email
183184
href: custom-email.md
184185
displayName: verification
185-
- name: Page layout
186-
href: page-layout.md
187186
- name: Enable JavaScript
188187
href: javascript-samples.md
189188
- name: Password complexity
@@ -348,10 +347,18 @@
348347
displayName: migrate, b2clogin, owin
349348
- name: Automation
350349
items:
351-
- name: Export usage report
352-
href: view-usage-reports.md
353-
- name: Account management
350+
- name: Azure Monitor
351+
href: azure-monitor.md
352+
displayName: log, logs, logging, usage, events
353+
- name: Manage users - Microsoft Graph
354354
href: manage-user-accounts-graph-api.md
355+
displayName: account, accounts
356+
- name: Deploy with Azure Pipelines
357+
href: deploy-custom-policies-devops.md
358+
displayName: azure devops, ci/cd, cicd, custom policy, policies
359+
- name: Manage policies with PowerShell
360+
href: manage-custom-policies-powershell.md
361+
displayName: scripting, scripts, psh, custom policy
355362
- name: Audit logs
356363
href: view-audit-logs.md
357364
- name: Manage users - Azure portal
@@ -372,21 +379,24 @@
372379
items:
373380
- name: Migrate users
374381
href: user-migration.md
375-
- name: Migrate users with external identities
376-
href: migrate-social-identities.md
377382
- name: Reference
378383
items:
379384
- name: Identity Experience Framework release notes
380385
href: custom-policy-developer-notes.md
381386
- name: Code samples
382387
href: https://azure.microsoft.com/resources/samples/?service=active-directory-b2c
388+
- name: Page layout versions
389+
href: page-layout.md
383390
- name: Cookie definitions
384391
href: cookie-definitions.md
392+
displayName: cookies, SameSite
385393
- name: Error codes
386394
href: error-codes.md
395+
- name: Microsoft Graph API operations
396+
href: microsoft-graph-operations.md
387397
- name: Region availability & data residency
388398
href: data-residency.md
389-
- name: Enable billing
399+
- name: Billing model
390400
href: billing.md
391401
- name: Threat management
392402
href: threat-management.md
@@ -417,4 +427,4 @@
417427
href: support-options.md
418428
displayName: technical
419429
- name: Videos
420-
href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory-b2c
430+
href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory-b2c

articles/active-directory-b2c/access-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ GET https://<tenant-name>.b2clogin.com/tfp/<tenant-name>.onmicrosoft.com/<policy
6868
client_id=<application-ID>
6969
&nonce=anyRandomValue
7070
&redirect_uri=https://jwt.ms
71-
&scope=https://tenant-name>.onmicrosoft.com/api/read
71+
&scope=https://<tenant-name>.onmicrosoft.com/api/read
7272
&response_type=code
7373
```
7474

articles/active-directory-b2c/active-directory-technical-profile.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 09/10/2018
12+
ms.date: 02/13/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -258,6 +258,7 @@ The following technical profile deletes a social user account using **alternativ
258258
| UserMessageIfClaimsPrincipalAlreadyExists | No | If an error is to be raised (see RaiseErrorIfClaimsPrincipalAlreadyExists attribute description), specify the message to show to the user if user object already exists. The value can be [localized](localization.md).|
259259
| ApplicationObjectId | No | The application object identifier for extension attributes. Value: ObjectId of an application. For more information, see [Use custom attributes in a custom profile edit policy](custom-policy-custom-attributes.md). |
260260
| ClientId | No | The client identifier for accessing the tenant as a third party. For more information, see [Use custom attributes in a custom profile edit policy](custom-policy-custom-attributes.md) |
261+
| IncludeClaimResolvingInClaimsHandling  | No | For input and output claims, specifies whether [claims resolution](claim-resolver-overview.md) is included in the technical profile. Possible values: `true`, or `false` (default). If you want to use a claims resolver in the technical profile, set this to `true`. |
261262

262263

263264

articles/active-directory-b2c/analytics-with-application-insights.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.topic: conceptual
1111
ms.workload: identity
12-
ms.date: 10/12/2018
12+
ms.date: 02/11/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515

@@ -154,7 +154,7 @@ Add the profiles to the *TrustFrameworkExtensions.xml* file from the starter pac
154154
<InputClaims>
155155
<!-- Properties of an event are added through the syntax {property:NAME}, where NAME is property being added to the event. DefaultValue can be either a static value or a value that's resolved by one of the supported DefaultClaimResolvers. -->
156156
<InputClaim ClaimTypeReferenceId="PolicyId" PartnerClaimType="{property:Policy}" DefaultValue="{Policy:PolicyId}" />
157-
<InputClaim ClaimTypeReferenceId="CorrelationId" PartnerClaimType="{property:JourneyId}" />
157+
<InputClaim ClaimTypeReferenceId="CorrelationId" PartnerClaimType="{property:JourneyId}" DefaultValue="{Context:CorrelationId}" />
158158
<InputClaim ClaimTypeReferenceId="Culture" PartnerClaimType="{property:Culture}" DefaultValue="{Culture:RFC5646}" />
159159
</InputClaims>
160160
</TechnicalProfile>

articles/active-directory-b2c/application-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ To set up client credential flow, see [Azure Active Directory v2.0 and the OAuth
121121

122122
#### Web API chains (on-behalf-of flow)
123123

124-
Many architectures include a web API that needs to call another downstream web API, where both are secured by Azure AD B2C. This scenario is common in native clients that have a Web API back-end and calls a Microsoft online service such as the Microsoft Graph API or Azure AD Graph API.
124+
Many architectures include a web API that needs to call another downstream web API, where both are secured by Azure AD B2C. This scenario is common in native clients that have a Web API back-end and calls a Microsoft online service such as the Microsoft Graph API.
125125

126126
This chained web API scenario can be supported by using the OAuth 2.0 JWT bearer credential grant, also known as the on-behalf-of flow. However, the on-behalf-of flow is not currently implemented in the Azure AD B2C.
127127

0 commit comments

Comments
 (0)