Skip to content

Commit b0065df

Browse files
committed
address local accounts sign in review comment - add combined local and social accoint
1 parent dadb9de commit b0065df

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

articles/active-directory-b2c/custom-policies-series-sign-up-or-sign-in-federation.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ In the `ContosoCustomPolicy.XML` file, locate the `HelloWorldJourney` user journ
405405
</OrchestrationStep>
406406

407407
<!-- Show self-asserted page only if the directory does not have the user account
408-
already (i.e. we do not have an objectId). -->
408+
already (i.e. we don't have an objectId). -->
409409
<OrchestrationStep Order="4" Type="ClaimsExchange">
410410
<Preconditions>
411411
<Precondition Type="ClaimsExist" ExecuteActionsIf="true">
@@ -436,21 +436,21 @@ In the orchestration, we've used make reference to technical profiles that enabl
436436

437437
When the custom policy runs:
438438

439-
- **Orchestration Step 1** - This step includes a *ClaimsProviderSelections* element, which lists the available sign-in options a user can choose from. In this case, we've one option only, *FacebookExchange*.
439+
- **Orchestration Step 1** - This step includes a *ClaimsProviderSelections* element, which lists the available sign-in options a user can choose from. In this case, we've only have one option, *FacebookExchange*, so when the policy runs, users are taken directly to Facebook.com in step 2 as shown by the `TargetClaimsExchangeId` attribute.
440440

441-
- **Orchestration Step 2** - The *Facebook-OAUTH* Technical Profile executes, so the user is redirected to Facebook to sign in.
441+
- **Orchestration Step 2** - The *Facebook-OAUTH* technical profile executes, so the user is redirected to Facebook to sign in.
442442

443-
- **Orchestration Step 3** - In step 3, the *AAD-UserReadUsingAlternativeSecurityId* Technical Profile executes to try to read the user social account from Azure AD. If the social account is found, `objectId` is returned as an output claim.
443+
- **Orchestration Step 3** - In step 3, the *AAD-UserReadUsingAlternativeSecurityId* technical profile executes to try to read the user social account from Azure AD storage. If the social account is found, `objectId` is returned as an output claim.
444444

445445
- **Orchestration Step 4** - This step runs if the user doesn't already exist (`objectId` doesn't exist). It shows the form that collects more information from the user or updates similar information obtained from the social account.
446446

447447
- **Orchestration Step 5** - This step runs if the user doesn't already exist (`objectId` doesn't exist), so the *AAD-UserWriteUsingAlternativeSecurityId* Technical Profile executes to write the social account into Azure AD.
448448

449449
- **Orchestration Step 6** - Finally, step 6 assembles and returns the JWT token at the end of the policy’s execution.
450450

451-
## Step 5 - Update Relying Party Output Claims
451+
## Step 5 - Update relying party output claims
452452

453-
In the `ContosoCustomPolicy.XML` file, locate the *RelyingParty* element, and then replace all the output claims with the following code:
453+
In the `ContosoCustomPolicy.XML` file, locate the *RelyingParty* element, and then replace all the output claims collection with the following code:
454454

455455
```xml
456456
<OutputClaim ClaimTypeReferenceId="displayName" />
@@ -460,7 +460,7 @@ In the `ContosoCustomPolicy.XML` file, locate the *RelyingParty* element, and th
460460
<OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="sub"/>
461461
<OutputClaim ClaimTypeReferenceId="identityProvider" />
462462
```
463-
We've included the identity provider (*identityProvider*) as an output claim, so it will be available in the JWT token returned to the relying party application.
463+
We've added the identity provider (*identityProvider*) as an output claim, so it will be included in the JWT token returned to the relying party application.
464464

465465
## Step 6 - Upload policy
466466

@@ -473,7 +473,7 @@ Follow the steps in [Test the custom policy](custom-policies-series-validate-use
473473
You're redirected to a Facebook sign-in page. Enter your Facebook credentials, and then select **Log In**.
474474
You're directly redirected to Facebook as we set it so in our orchestration steps since we don't have multiple sign-in options to choose from. Typically, in an app, you'd add a button like **Sign in with Facebook**, which when selected, runs the policy.
475475

476-
If it's the first time running this policy (social account doesn't already exist), you see a screen such as the one shown below. You won't see this screen in subsequent policy execution (social account already exist).
476+
If it's the first time running this policy (social account doesn't already exist in Azure AD storage), you see a screenshot such as the one shown below. You won't see this screen in subsequent policy executions as the social account already exist in Azure AD storage.
477477

478478
:::image type="content" source="media/custom-policies-series-sign-up-or-sign-in-federation/screenshot-of-sign-in-social-account.png" alt-text="Screenshot of sign-in flow with social account.":::
479479

@@ -518,12 +518,12 @@ Use the following steps to add a combined local and social account:
518518
</ClaimType>
519519
<!--</ClaimsSchema>-->
520520
```
521-
1. In the `UserJourneys` section, add a new user journey, *CombinedSignInSignUp* by using the following code:
521+
1. In the `UserJourneys` section, add a new user journey, *LocalAndSocialSignInAndSignUp* by using the following code:
522522

523523
```xml
524524
<!--<UserJourneys>-->
525525
...
526-
<UserJourney Id="CombinedSignInSignUp">
526+
<UserJourney Id="LocalAndSocialSignInAndSignUp">
527527
<OrchestrationSteps>
528528
<!--Orchestration steps will be added here-->
529529
</OrchestrationSteps>
@@ -532,7 +532,7 @@ Use the following steps to add a combined local and social account:
532532
```
533533
1. Add the orchestration steps
534534

535-
1. In the RelyingParty section, change *DefaultUserJourney's* `ReferenceId` to `CombinedSignInSignUp`
535+
1. In the RelyingParty section, change *DefaultUserJourney's* `ReferenceId` to `LocalAndSocialSignInAndSignUp`
536536

537537
1. Upload policy file
538538

articles/active-directory-b2c/custom-policies-series-sign-up-or-sign-in.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ We've configured a content definition for our self-asserted technical profile, `
219219

220220
## Step 3 - Update the User Journey Orchestration Steps
221221

222-
In the `ContosoCustomPolicy.XML` file, locate the *HelloWorldJourney* user journey and replace all its orchestration steps with the following code:
222+
In the `ContosoCustomPolicy.XML` file, locate the *HelloWorldJourney* user journey and replace all its orchestration steps collection with the following code:
223223

224224
```xml
225225
<!--<OrchestrationSteps>-->
@@ -303,11 +303,11 @@ When the custom policy runs:
303303
- **Orchestration Step 4** - This step runs if the user signs up (objectId doesn't exist), so we display the sign-up form by invoking the
304304
*UserInformationCollector* self-asserted technical profile. This step runs whether a user signs up or signs in.
305305

306-
- **Orchestration Steps 5** - This step reads account information from Azure AD (we invoke *AAD-UserRead* Azure AD technical profile), so it runs whether a user signs up or signs in.
306+
- **Orchestration Step 5** - This step reads account information from Azure AD (we invoke *AAD-UserRead* Azure AD technical profile), so it runs whether a user signs up or signs in.
307307

308308
- **Orchestration Step 6** - This step invokes the *UserInputMessageClaimGenerator* technical profile to assemble the user’s greeting message.
309309

310-
- **Orchestration Step 7** - Finally, step 8 assembles and returns the JWT token at the end of the policy’s execution
310+
- **Orchestration Step 7** - Finally, step 8 assembles and returns the JWT token at the end of the policy’s execution.
311311

312312
## Step 4 - Upload policy
313313

0 commit comments

Comments
 (0)