Skip to content

Commit 1891b80

Browse files
v-lakastv-lakast
committed
Resolved merge conflict
2 parents d55ccae + 076a712 commit 1891b80

File tree

290 files changed

+6729
-5336
lines changed

Some content is hidden

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

290 files changed

+6729
-5336
lines changed

‎.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,11 @@
740740
"redirect_url": "/azure/active-directory-b2c/authorization-code-flow",
741741
"redirect_document_id": true
742742
},
743+
{
744+
"source_path_from_root": "/articles/active-directory-b2c/custom-policy-get-started.md",
745+
"redirect_url": "/azure/active-directory-b2c/tutorial-create-user-flows?pivots=b2c-custom-policy",
746+
"redirect_document_id": true
747+
},
743748
{
744749
"source_path_from_root": "/articles/active-directory-b2c/active-directory-b2c-how-to-enable-billing.md",
745750
"redirect_url": "/azure/active-directory-b2c/billing",
@@ -870,6 +875,11 @@
870875
"redirect_url": "/azure/active-directory-b2c/custom-policy-ui-customization",
871876
"redirect_document_id": false
872877
},
878+
{
879+
"source_path_from_root": "/articles/active-directory-b2c/custom-policy-trust-frameworks.md",
880+
"redirect_url": "/azure/active-directory-b2c/custom-policy-overview",
881+
"redirect_document_id": false
882+
},
873883
{
874884
"source_path_from_root": "/articles/active-directory-b2c/active-directory-b2c-ui-customization-custom-dynamic.md",
875885
"redirect_url": "/azure/active-directory-b2c/custom-policy-ui-customization-dynamic",
@@ -11144,6 +11154,11 @@
1114411154
"redirect_url": "/azure/azure-sql/database/connect-query-r",
1114511155
"redirect_document_id": true
1114611156
},
11157+
{
11158+
"source_path_from_root": "/articles/azure-sql/database/connect-query-r.md",
11159+
"redirect_url": "/sql/machine-learning/tutorials/quickstart-r-create-script?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
11160+
"redirect_document_id": false
11161+
},
1114711162
{
1114811163
"source_path_from_root": "/articles/sql-database/sql-database-connect-query-ruby.md",
1114911164
"redirect_url": "/azure/azure-sql/database/connect-query-ruby",
@@ -19259,6 +19274,11 @@
1925919274
"redirect_url": "/azure/devtest-labs/use-paas-services",
1926019275
"redirect_document_id": true
1926119276
},
19277+
{
19278+
"source_path_from_root": "/articles/digital-twins/how-to-interpret-event-data.md",
19279+
"redirect_url": "/azure/digital-twins/concepts-notifications",
19280+
"redirect_document_id": false
19281+
},
1926219282
{
1926319283
"source_path_from_root": "/articles/digital-twins/how-to-integrate-models.md",
1926419284
"redirect_url": "/azure/digital-twins/concepts-ontologies-convert",

‎articles/active-directory-b2c/TOC.yml

Lines changed: 118 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,21 @@
7979
href: tokens-overview.md
8080
- name: Request access token
8181
href: access-tokens.md
82-
- name: Policy keys
83-
href: policy-keys-overview.md
84-
- name: User flow and policy
82+
- name: User experience
83+
expanded: true
8584
items:
86-
- name: User flows
85+
- name: User flows and custom policies
8786
href: user-flow-overview.md
88-
- name: Custom policies
87+
- name: Custom policy overview
8988
href: custom-policy-overview.md
9089
- name: User accounts
9190
href: user-overview.md
9291
- name: User profile attributes
9392
href: user-profile-attributes.md
9493
- name: Identity Protection and Conditional Access
9594
href: conditional-access-identity-protection-overview.md
95+
- name: Policy keys
96+
href: policy-keys-overview.md
9697
- name: How-to guides
9798
items:
9899
- name: App integration
@@ -120,6 +121,9 @@
120121
href: signin-appauth-ios.md
121122
- name: Android using App Auth
122123
href: signin-appauth-android.md
124+
- name: Secure API Management API
125+
href: secure-api-management.md
126+
displayName: apim, api management, migrate, b2clogin.com
123127
- name: Create a flow
124128
items:
125129
- name: Sign-up or sign-in policy
@@ -221,6 +225,15 @@
221225
href: password-complexity.md
222226
- name: Disable email verification
223227
href: disable-email-verification.md
228+
- name: Custom email verification
229+
items:
230+
- name: Mailjet
231+
href: custom-email-mailjet.md
232+
displayName: Custom email, Custom verification email, Verification email
233+
- name: SendGrid
234+
href: custom-email-sendgrid.md
235+
displayName: Custom email, Custom verification email, Verification email
236+
displayName: verification
224237
- name: Enable MFA
225238
items:
226239
- name: Multi-factor authentication
@@ -268,19 +281,6 @@
268281
href: add-api-connector.md
269282
- name: Custom policy
270283
items:
271-
- name: Custom policy overview
272-
href: custom-policy-trust-frameworks.md
273-
- name: Get started with custom policies
274-
href: custom-policy-get-started.md
275-
- name: Custom email verification
276-
items:
277-
- name: Mailjet
278-
href: custom-email-mailjet.md
279-
displayName: Custom email, Custom verification email, Verification email
280-
- name: SendGrid
281-
href: custom-email-sendgrid.md
282-
displayName: Custom email, Custom verification email, Verification email
283-
displayName: verification
284284
- name: Add your own business logic
285285
items:
286286
- name: Integrate REST API
@@ -300,101 +300,6 @@
300300
displayName: troubleshooting, app insights
301301
- name: Troubleshooting custom policies
302302
href: troubleshoot-custom-policies.md
303-
- name: Reference
304-
items:
305-
- name: TrustFrameworkPolicy
306-
href: trustframeworkpolicy.md
307-
- name: BuildingBlocks
308-
href: buildingblocks.md
309-
items:
310-
- name: ClaimsSchema
311-
href: claimsschema.md
312-
- name: ClaimsTransformations
313-
href: claimstransformations.md
314-
items:
315-
- name: Boolean
316-
href: boolean-transformations.md
317-
- name: Date
318-
href: date-transformations.md
319-
- name: General
320-
href: general-transformations.md
321-
- name: Integer
322-
href: integer-transformations.md
323-
- name: JSON
324-
href: json-transformations.md
325-
- name: Phone number
326-
href: phone-number-claims-transformations.md
327-
- name: External accounts
328-
href: social-transformations.md
329-
- name: StringCollection
330-
href: stringcollection-transformations.md
331-
- name: String
332-
href: string-transformations.md
333-
- name: Predicates
334-
href: predicates.md
335-
- name: ContentDefinitions
336-
href: contentdefinitions.md
337-
- name: Localization
338-
href: localization.md
339-
items:
340-
- name: Localization string IDs
341-
href: localization-string-ids.md
342-
- name: DisplayControls
343-
href: display-controls.md
344-
items:
345-
- name: Verification
346-
href: display-control-verification.md
347-
- name: ClaimsProviders
348-
href: claimsproviders.md
349-
items:
350-
- name: Technical Profiles
351-
href: technicalprofiles.md
352-
items:
353-
- name: About validation technical profiles
354-
href: validation-technical-profile.md
355-
- name: Azure Active Directory
356-
href: active-directory-technical-profile.md
357-
- name: Azure AD Multi-Factor Authentication
358-
href: multi-factor-auth-technical-profile.md
359-
displayName: mfa
360-
- name: Azure AD SSPR
361-
href: aad-sspr-technical-profile.md
362-
- name: Claims transformation
363-
href: claims-transformation-technical-profile.md
364-
- name: ID token hint
365-
href: id-token-hint.md
366-
- name: JWT token issuer
367-
href: jwt-issuer-technical-profile.md
368-
- name: OAuth1
369-
href: oauth1-technical-profile.md
370-
- name: OAuth2
371-
href: oauth2-technical-profile.md
372-
- name: One-time password
373-
href: one-time-password-technical-profile.md
374-
displayName: otp
375-
- name: OpenID Connect
376-
href: openid-connect-technical-profile.md
377-
- name: Phone factor
378-
href: phone-factor-technical-profile.md
379-
- name: REST
380-
href: restful-technical-profile.md
381-
- name: SAML identity provider
382-
href: saml-identity-provider-technical-profile.md
383-
- name: SAML token issuer
384-
href: saml-issuer-technical-profile.md
385-
- name: Self-asserted
386-
href: self-asserted-technical-profile.md
387-
- name: SSO session
388-
href: custom-policy-reference-sso.md
389-
displayName: single sign-on
390-
- name: UserJourneys
391-
href: userjourneys.md
392-
- name: SubJourneys
393-
href: subjourneys.md
394-
- name: RelyingParty
395-
href: relyingparty.md
396-
- name: Claim resolvers
397-
href: claim-resolver-overview.md
398303
- name: UserInfo endpoint
399304
href: userinfo-endpoint.md
400305
- name: Partner integration
@@ -459,15 +364,15 @@
459364
- name: Azure portal
460365
href: manage-users-portal.md
461366
displayName: create users, add users, delete users
367+
- name: Migrate users
368+
href: user-migration.md
369+
displayName: bulk import
462370
- name: Partner integration
463371
items:
464372
- name: N8identity
465373
href: partner-n8identity.md
466374
- name: Saviynt
467375
href: partner-saviynt.md
468-
- name: Secure API Management API
469-
href: secure-api-management.md
470-
displayName: apim, api management, migrate, b2clogin.com
471376
- name: Logs and monitoring
472377
items:
473378
- name: Audit logs
@@ -490,12 +395,105 @@
490395
- name: User data
491396
href: manage-user-data.md
492397
displayName: GDPR
493-
- name: Migration
494-
items:
495-
- name: Migrate users
496-
href: user-migration.md
497398
- name: Reference
498399
items:
400+
- name: Custom policy schema
401+
items:
402+
- name: TrustFrameworkPolicy
403+
href: trustframeworkpolicy.md
404+
- name: BuildingBlocks
405+
href: buildingblocks.md
406+
items:
407+
- name: ClaimsSchema
408+
href: claimsschema.md
409+
- name: ClaimsTransformations
410+
href: claimstransformations.md
411+
items:
412+
- name: Boolean
413+
href: boolean-transformations.md
414+
- name: Date
415+
href: date-transformations.md
416+
- name: General
417+
href: general-transformations.md
418+
- name: Integer
419+
href: integer-transformations.md
420+
- name: JSON
421+
href: json-transformations.md
422+
- name: Phone number
423+
href: phone-number-claims-transformations.md
424+
- name: External accounts
425+
href: social-transformations.md
426+
- name: StringCollection
427+
href: stringcollection-transformations.md
428+
- name: String
429+
href: string-transformations.md
430+
- name: Predicates
431+
href: predicates.md
432+
- name: ContentDefinitions
433+
href: contentdefinitions.md
434+
- name: Localization
435+
href: localization.md
436+
items:
437+
- name: Localization string IDs
438+
href: localization-string-ids.md
439+
- name: DisplayControls
440+
href: display-controls.md
441+
items:
442+
- name: Verification
443+
href: display-control-verification.md
444+
- name: ClaimsProviders
445+
href: claimsproviders.md
446+
items:
447+
- name: Technical Profiles
448+
href: technicalprofiles.md
449+
items:
450+
- name: About validation technical profiles
451+
href: validation-technical-profile.md
452+
- name: Azure Active Directory
453+
href: active-directory-technical-profile.md
454+
- name: Azure AD Multi-Factor Authentication
455+
href: multi-factor-auth-technical-profile.md
456+
displayName: mfa
457+
- name: Azure AD SSPR
458+
href: aad-sspr-technical-profile.md
459+
- name: Claims transformation
460+
href: claims-transformation-technical-profile.md
461+
- name: ID token hint
462+
href: id-token-hint.md
463+
- name: JWT token issuer
464+
href: jwt-issuer-technical-profile.md
465+
- name: OAuth1
466+
href: oauth1-technical-profile.md
467+
- name: OAuth2
468+
href: oauth2-technical-profile.md
469+
- name: One-time password
470+
href: one-time-password-technical-profile.md
471+
displayName: otp
472+
- name: OpenID Connect
473+
href: openid-connect-technical-profile.md
474+
- name: Phone factor
475+
href: phone-factor-technical-profile.md
476+
- name: REST
477+
href: restful-technical-profile.md
478+
- name: SAML identity provider
479+
href: saml-identity-provider-technical-profile.md
480+
- name: SAML token issuer
481+
href: saml-issuer-technical-profile.md
482+
- name: Self-asserted
483+
href: self-asserted-technical-profile.md
484+
- name: SSO session
485+
href: custom-policy-reference-sso.md
486+
displayName: single sign-on
487+
- name: UserJourneys
488+
href: userjourneys.md
489+
- name: SubJourneys
490+
href: subjourneys.md
491+
- name: RelyingParty
492+
href: relyingparty.md
493+
- name: Claim resolvers
494+
href: claim-resolver-overview.md
495+
- name: Custom policy release notes
496+
href: custom-policy-developer-notes.md
499497
- name: Service limits and restrictions
500498
href: service-limits.md
501499
- name: App registrations
@@ -511,8 +509,6 @@
511509
href: error-codes.md
512510
- name: Extensions app
513511
href: extensions-app.md
514-
- name: Custom policy (IEF) release notes
515-
href: custom-policy-developer-notes.md
516512
- name: Page layout versions
517513
href: page-layout.md
518514
displayName: Page version

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Azure Active Directory B2C (Azure AD B2C) provides support for the Azure Active
2424

2525
The **Name** attribute of the **Protocol** element needs to be set to `Proprietary`. The **handler** attribute must contain the fully qualified name of the protocol handler assembly `Web.TPEngine.Providers.AzureActiveDirectoryProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null`.
2626

27-
Following [custom policy starter pack](custom-policy-get-started.md#custom-policy-starter-pack) Azure AD technical profiles include the **AAD-Common** technical profile. The Azure AD technical profiles don't specify the protocol because the protocol is configured in the **AAD-Common** technical profile:
27+
Following [custom policy starter pack](tutorial-create-user-flows.md?pivots=b2c-custom-policy#custom-policy-starter-pack) Azure AD technical profiles include the **AAD-Common** technical profile. The Azure AD technical profiles don't specify the protocol because the protocol is configured in the **AAD-Common** technical profile:
2828

2929
- **AAD-UserReadUsingAlternativeSecurityId** and **AAD-UserReadUsingAlternativeSecurityId-NoError** - Look up a social account in the directory.
3030
- **AAD-UserWriteUsingAlternativeSecurityId** - Create a new social account.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ On the sign-up or sign-in page, Azure AD B2C presents a list of external identit
2323

2424
![Mobile sign-in example with a social account (Facebook)](media/add-identity-provider/external-idp.png)
2525

26-
You can add identity providers that are supported by Azure Active Directory B2C (Azure AD B2C) to your [user flows](user-flow-overview.md) using the Azure portal. You can also add identity providers to your [custom policies](custom-policy-get-started.md).
26+
You can add identity providers that are supported by Azure Active Directory B2C (Azure AD B2C) to your [user flows](user-flow-overview.md) using the Azure portal. You can also add identity providers to your [custom policies](user-flow-overview.md).
2727

2828
## Select an identity provider
2929

‎articles/active-directory-b2c/add-password-change-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ In Azure Active Directory B2C (Azure AD B2C), you can enable users who are signe
3939

4040
## Prerequisites
4141

42-
* Complete the steps in [Get started with custom policies in Active Directory B2C](custom-policy-get-started.md).
42+
* Complete the steps in [Get started with custom policies in Active Directory B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy).
4343
* If you haven't already done so, [register a web application in Azure Active Directory B2C](tutorial-register-applications.md).
4444

4545
## Add the elements

0 commit comments

Comments
 (0)