Skip to content

Commit 086b2cd

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into acrreten
2 parents cfcf8f0 + b7cdd83 commit 086b2cd

File tree

5,205 files changed

+65533
-42577
lines changed

Some content is hidden

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

5,205 files changed

+65533
-42577
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ AzureMigration.ps1
2525
**/.vscode/settings.json
2626
!/.vscode/settings.json
2727

28-
desktop.ini
28+
desktop.ini

.openpublishing.redirection.json

Lines changed: 849 additions & 94 deletions
Large diffs are not rendered by default.

.whatsnew/.application-proxy.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"$schema": "https://whatsnewapi.azurewebsites.net/schema",
3+
"docSetProductName": "Azure Active Directory application proxy",
4+
"rootDirectory": "articles/active-directory/app-proxy/",
5+
"docLinkSettings": {
6+
"linkFormat": "relative",
7+
"relativeLinkPrefix": "/azure/active-directory/app-proxy"
8+
},
9+
"inclusionCriteria": {
10+
"excludePullRequestTitles": true,
11+
"minAdditionsToFile" : 2,
12+
"maxFilesChanged": 50,
13+
"labels": [
14+
"label:active-directory/svc",
15+
"label:app-proxy/subsvc"
16+
]
17+
},
18+
"areas": [
19+
{
20+
"name": ".",
21+
"heading": "Azure Active Directory application proxy"
22+
}
23+
]
24+
}

.whatsnew/.microsoft-identity-platform.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"relativeLinkPrefix": "/azure/active-directory/develop"
88
},
99
"inclusionCriteria": {
10-
"excludePullRequestTitles": true,
10+
"omitPullRequestTitles" : true,
1111
"minAdditionsToFile" : 20,
1212
"maxFilesChanged": 50,
1313
"labels": [
@@ -17,7 +17,7 @@
1717
},
1818
"areas": [
1919
{
20-
"name": ".",
20+
"names": [ "."],
2121
"heading": "Microsoft identity platform"
2222
}
2323
]

CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ articles/terraform/ @TomArcherMsft
5757
articles/virtual-machines/ @cynthn @mimckitt
5858
articles/virtual-machine-scale-sets/ @ju-shim @mimckitt
5959
articles/cloud-services/ @mimckitt
60+
articles/cloud-services-extended-support/ @mimckitt
61+
articles/service-fabric/ @erikadoyle @mimckitt
62+
articles/container-instances/ @macolso @mimckitt
63+
articles/container-registry/ @dlepow @mimckitt
6064

6165
# Requires Internal Review
6266
articles/best-practices-availability-paired-regions.md @martinekuan @syntaxc4 @snoviking

articles/active-directory-b2c/TOC.yml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@
8888
href: user-flow-overview.md
8989
- name: Custom policy overview
9090
href: custom-policy-overview.md
91+
- name: API Connectors
92+
href: api-connectors-overview.md
93+
displayName: REST API, web API, API connectors
9194
- name: User accounts
9295
href: user-overview.md
9396
- name: User profile attributes
@@ -171,6 +174,8 @@
171174
href: identity-provider-azure-ad-multi-tenant.md
172175
- name: Azure AD B2C
173176
href: identity-provider-azure-ad-b2c.md
177+
- name: eBay
178+
href: identity-provider-ebay.md
174179
- name: Facebook
175180
href: identity-provider-facebook.md
176181
- name: Generic OpenId Connect
@@ -277,26 +282,18 @@
277282
href: conditional-access-user-flow.md
278283
- name: Configure age gating
279284
href: age-gating.md
280-
- name: API connectors (preview)
285+
- name: API connectors
281286
items:
282-
- name: Overview
283-
href: api-connectors-overview.md
284-
- name: Add an API connector
287+
- name: Add an API connector to a sign-up user flow
285288
href: add-api-connector.md
289+
displayName: rest claims validation, validate
290+
- name: Add an API connector to a sign-up or sign-in user flow
291+
href: custom-policy-rest-api-claims-exchange.md
292+
displayName: rest claims exchange
293+
- name: Secure an API connector
294+
href: secure-rest-api.md
286295
- name: Custom policy
287296
items:
288-
- name: Add your own business logic
289-
items:
290-
- name: Integrate REST API
291-
href: custom-policy-rest-api-intro.md
292-
- name: Validate user input
293-
href: custom-policy-rest-api-claims-validation.md
294-
displayName: rest claims validation, validate
295-
- name: Obtain additional claims
296-
href: custom-policy-rest-api-claims-exchange.md
297-
displayName: rest claims exchange
298-
- name: Secure REST API
299-
href: secure-rest-api.md
300297
- name: Troubleshooting
301298
items:
302299
- name: Collect logs using Application Insights
@@ -505,10 +502,12 @@
505502
href: relyingparty.md
506503
- name: Claim resolvers
507504
href: claim-resolver-overview.md
508-
- name: Custom policy release notes
505+
- name: Release notes
509506
href: custom-policy-developer-notes.md
510507
- name: Service limits and restrictions
511508
href: service-limits.md
509+
- name: TLS and cipher suite requirements
510+
href: https-cipher-tls-requirements.md
512511
- name: App registrations
513512
href: app-registrations-training-guide.md
514513
- name: Billing model

articles/active-directory-b2c/add-api-connector.md

Lines changed: 291 additions & 12 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/add-identity-provider.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: msmimart
66
manager: celestedg
77

88
ms.author: mimart
9-
ms.date: 03/03/2021
9+
ms.date: 04/29/2021
1010
ms.custom: mvc
1111
ms.topic: how-to
1212
ms.service: active-directory
@@ -35,6 +35,7 @@ You typically use only one identity provider in your applications, but you have
3535
* [Azure AD (Single-tenant)](identity-provider-azure-ad-single-tenant.md)
3636
* [Azure AD (Multi-tenant)](identity-provider-azure-ad-multi-tenant.md)
3737
* [Azure AD B2C](identity-provider-azure-ad-b2c.md)
38+
* [eBay](identity-provider-ebay.md)
3839
* [Facebook](identity-provider-facebook.md)
3940
* [Generic identity provider](identity-provider-generic-openid-connect.md)
4041
* [GitHub](identity-provider-github.md)

articles/active-directory-b2c/add-password-change-policy.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.workload: identity
1111
ms.topic: how-to
12-
ms.date: 03/22/2021
12+
ms.date: 05/03/2021
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
zone_pivot_groups: b2c-policy-type
@@ -156,7 +156,7 @@ In Azure Active Directory B2C (Azure AD B2C), you can enable users who are signe
156156

157157
1. Open the policy that you changed. For example, *B2C_1A_profile_edit_password_change*.
158158
2. For **Application**, select your application that you previously registered. To see the token, the **Reply URL** should show `https://jwt.ms`.
159-
3. Click **Run now**. Sign in with the account that you previously created. You should now have the opportunity to change the password.
159+
3. Click **Run now**. In the new tab that opens, remove "&prompt=login" from the URL and refresh the tab. Then sign in with the account you previously created. You will now have the opportunity to change the password.
160160

161161
## Next steps
162162

0 commit comments

Comments
 (0)