Skip to content

Commit 1af3d1c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into yelevin/unified-IIT-take-two
2 parents 9d915a5 + ae31534 commit 1af3d1c

File tree

3,223 files changed

+36884
-62403
lines changed

Some content is hidden

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

3,223 files changed

+36884
-62403
lines changed

.github/policies/disallow-edits.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,19 @@ configuration:
153153

154154
- description: Disallow sign-off for articles in the /articles/reliability folder.
155155
if:
156-
# If a 'sign-off' comment is added to a PR in the articles/reliability folder , and the PR author isn't Anastasia or John...
157-
- payloadType: Issue_Comment
158-
- isPullRequest
159-
- filesMatchPattern:
160-
matchAny: true
161-
pattern: articles/reliability/*
156+
# If a 'sign-off' comment is added to a PR that's assigned to anaharris-ms, and the PR author isn't Anastasia or John...
157+
- or:
158+
- payloadType: Issue_Comment
159+
- payloadType: Pull_Request_Review_Comment
160+
- isAction:
161+
action: Created
162+
- isActivitySender:
163+
issueAuthor: True
164+
- isAssignedToUser:
165+
user: anaharris-ms
162166
- commentContains:
163-
pattern: \#sign-off
164-
isRegex: false
167+
pattern: '#sign-off'
168+
isRegex: False
165169
- not:
166170
or:
167171
- isActivitySender:

.openpublishing.redirection.json

Lines changed: 560 additions & 30 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/claimsschema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ In the following example, when the Identity Experience Framework interacts with
110110
</ClaimType>
111111
```
112112

113-
As a result, the JWT token issued by Azure AD B2C, emits the `family_name` instead of ClaimType name **surname**.
113+
As a result, the JWT issued by Azure AD B2C, emits the `family_name` instead of ClaimType name **surname**.
114114

115115
```json
116116
{

articles/active-directory-b2c/custom-policies-series-branch-user-journey.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ Follow the steps in [Test the custom policy](custom-policies-series-validate-use
229229

230230
1. In the first screen, for **Account Type**, select **Personal Account**.
231231
1. For **Access Code**, enter *88888*, and then select **Continue**.
232-
1. Enter the rest of the details as required, and then select **Continue**. After the policy finishes execution, you're redirected to `https://jwt.ms`, and you see a decoded JWT token.
232+
1. Enter the rest of the details as required, and then select **Continue**. After the policy finishes execution, you're redirected to `https://jwt.ms`, and you see a decoded JWT.
233233
1. Repeat step 5, but this time, select **Account Type**, select **Contoso Employee Account**, and then follow the prompts.
234234

235235

articles/active-directory-b2c/custom-policies-series-call-rest-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ In this article, you learn how to:
3535

3636
## Scenario overview
3737

38-
In [Create branching in user journey by using Azure AD B2C custom policies](custom-policies-series-branch-user-journey.md), users who select *Personal Account* need to provide a valid invitation access code to proceed. We use a static access code, but real world apps don't work this way. If the service that issues the access codes is external to your custom policy, you must make a call to that service, and pass the access code input by the user for validation. If the access code is valid, the service returns an HTTP `200 OK` response, and Azure AD B2C issues JWT token. Otherwise, the service returns an HTTP 4xx response, and the user must reenter an access code.
38+
In [Create branching in user journey by using Azure AD B2C custom policies](custom-policies-series-branch-user-journey.md), users who select *Personal Account* need to provide a valid invitation access code to proceed. We use a static access code, but real world apps don't work this way. If the service that issues the access codes is external to your custom policy, you must make a call to that service, and pass the access code input by the user for validation. If the access code is valid, the service returns an HTTP `200 OK` response, and Azure AD B2C issues JWT. Otherwise, the service returns an HTTP 4xx response, and the user must reenter an access code.
3939

4040
:::image type="content" source="media/custom-policies-series-call-rest-api/screenshot-of-call-rest-api-call.png" alt-text="A flowchart of calling a R E S T A P I.":::
4141

@@ -228,7 +228,7 @@ Follow the steps in [Test the custom policy](custom-policies-series-validate-use
228228
229229
1. For **Account Type**, select **Personal Account**
230230
1. Enter the rest of the details as required, and then select **Continue**. You see a new screen.
231-
1. For **Access Code**, enter *88888*, and then select **Continue**. After the policy finishes execution, you're redirected to `https://jwt.ms`, and you see a decoded JWT token. If you repeat the procedure, and enter a different **Access Code**, other than *88888*, you see an error, **The access code you entered is incorrect. Please try again.**
231+
1. For **Access Code**, enter *88888*, and then select **Continue**. After the policy finishes execution, you're redirected to `https://jwt.ms`, and you see a decoded JWT. If you repeat the procedure, and enter a different **Access Code**, other than *88888*, you see an error, **The access code you entered is incorrect. Please try again.**
232232

233233
## Step 5 - Enable debug mode
234234

articles/active-directory-b2c/custom-policies-series-collect-user-input.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ ms.reviewer: yoelh
1616
ms.subservice: b2c
1717

1818

19-
#Customer intent: As a developer using Azure Active Directory B2C, I want to collect and manipulate user inputs by writing a custom policy, so that I can customize the user interface and process the inputs as claims in a JWT token.
19+
#Customer intent: As a developer using Azure Active Directory B2C, I want to collect and manipulate user inputs by writing a custom policy, so that I can customize the user interface and process the inputs as claims in a JWT.
2020

2121
---
2222

2323
# Collect and manipulate user inputs by using Azure Active Directory B2C custom policy
2424

2525
Azure Active Directory B2C (Azure AD B2C) custom policies allows you to collect user inputs. You can then use inbuilt methods to manipulate the user inputs.
2626

27-
In this article, you learn how to write a custom policy that collects user inputs via a graphical user interface. You'll then access the inputs, process then, and finally return them as claims in a JWT token. To complete this task, you'll:
27+
In this article, you learn how to write a custom policy that collects user inputs via a graphical user interface. You'll then access the inputs, process then, and finally return them as claims in a JWT. To complete this task, you'll:
2828

2929
- Declare claims. A claim provides temporary storage of data during an Azure AD B2C policy execution. It can store information about the user, such as first name, last name, or any other claim obtained from the user or other systems. You can learn more about claims in the [Azure AD B2C custom policy overview](custom-policy-overview.md#claims).
3030

@@ -260,7 +260,7 @@ Replace the existing contents of the `HelloWorldJourney` User Journey with the f
260260
</OrchestrationSteps>
261261
```
262262

263-
According to the orchestration steps, we collect user inputs, set values for *objectId*, *displayName* and *message* claims, and finally send the Jwt token.
263+
According to the orchestration steps, we collect user inputs, set values for *objectId*, *displayName* and *message* claims, and finally send the JWT.
264264

265265
## Step 6 - Update relying party
266266

@@ -486,7 +486,7 @@ Follow the steps in [Upload custom policy file](custom-policies-series-hello-wor
486486

487487
:::image type="content" source="media/custom-policies-series-collect-user-input/screenshot-of-accepting-user-inputs-in-custom-policy.png" alt-text="screenshot of accepting user inputs in custom policy.":::
488488

489-
After the policy finishes execution, you're redirected to `https://jwt.ms`, and you see a decoded JWT token. It looks similar to the following JWT token snippet:
489+
After the policy finishes execution, you're redirected to `https://jwt.ms`, and you see a decoded JWT. It looks similar to the following JWT snippet:
490490

491491
```json
492492
{

articles/active-directory-b2c/custom-policies-series-hello-world.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ If you haven't already done so, create the following encryption keys. To automat
141141
</ClaimsProvider>
142142
```
143143

144-
We've declared a JWT Token Issuer. In the `CryptographicKeys` section, if you used different names to configure the signing and encryption keys in [step 1](#step-1---configure-the-signing-and-encryption-keys), make sure you use the correct value for the `StorageReferenceId`.
144+
We've declared a JWT Issuer. In the `CryptographicKeys` section, if you used different names to configure the signing and encryption keys in [step 1](#step-1---configure-the-signing-and-encryption-keys), make sure you use the correct value for the `StorageReferenceId`.
145145

146146
1. In the `UserJourneys` section of the `ContosoCustomPolicy.XML` file, add the following code:
147147

@@ -267,7 +267,7 @@ After you upload the file, Azure AD B2C adds the prefix `B2C_1A_`, so the names
267267
1. For **Select application** on the overview page of the custom policy, select the web application such as *webapp1* that you previously registered. Make sure that the **Select reply URL** value is set to`https://jwt.ms`.
268268
1. Select **Run now** button.
269269

270-
After the policy finishes execution, you're redirected to `https://jwt.ms`, and you see a decoded JWT token. It looks similar to the following JWT token snippet:
270+
After the policy finishes execution, you're redirected to `https://jwt.ms`, and you see a decoded JWT. It looks similar to the following JWT snippet:
271271

272272
```json
273273
{

articles/active-directory-b2c/custom-policies-series-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ This how-to guide series consists of multiple articles. We recommend that you st
3838

3939
|Article | What you'll learn |
4040
|---------|---------|
41-
|[Write your first Azure Active Directory B2C custom policy - Hello World!](custom-policies-series-hello-world.md) | Write your first Azure AD B2C custom policy. You return the message *Hello World!* in the JWT token. |
41+
|[Write your first Azure Active Directory B2C custom policy - Hello World!](custom-policies-series-hello-world.md) | Write your first Azure AD B2C custom policy. You return the message *Hello World!* in the JWT. |
4242
|[Collect and manipulate user inputs by using Azure AD B2C custom policy](custom-policies-series-collect-user-input.md) | Learn how to collect inputs from users, and how to manipulate them.|
4343
|[Validate user inputs by using Azure Active Directory B2C custom policy](custom-policies-series-validate-user-input.md) | Learn how to validate user inputs by using techniques such as limiting user input options, regular expressions, predicates, and validation technical profiles|
4444
|[Create branching in user journey by using Azure Active Directory B2C custom policy](custom-policies-series-branch-user-journey.md) | Learn how to create different user experiences for different users based on the value of a claim.|

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ When the custom policy runs:
452452

453453
- **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 Microsoft Entra ID.
454454

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

457457
## Step 5 - Update relying party output claims
458458

@@ -466,7 +466,7 @@ In the `ContosoCustomPolicy.XML` file, locate the `RelyingParty` element, and th
466466
<OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="sub"/>
467467
<OutputClaim ClaimTypeReferenceId="identityProvider" />
468468
```
469-
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.
469+
We've added the identity provider (*identityProvider*) as an output claim, so it will be included in the JWT returned to the relying party application.
470470

471471
## Step 6 - Upload policy
472472

@@ -485,7 +485,7 @@ If it's the first time running this policy (social account doesn't already exist
485485

486486
Enter or update **Display Name**, **Given Name** and the **Surname**, and then select **Continue** button.
487487

488-
After the policy finishes execution, you're redirected to https://jwt.ms, and you see a decoded JWT token. It looks similar to the following JWT token snippet:
488+
After the policy finishes execution, you're redirected to https://jwt.ms, and you see a decoded JWT. It looks similar to the following JWT snippet:
489489

490490
```json
491491
{
@@ -504,7 +504,7 @@ After the policy finishes execution, you're redirected to https://jwt.ms, and yo
504504
}.[Signature]
505505
```
506506

507-
Notice the identity provider, `"idp": "facebook.com"`, has been included in the JWT token.
507+
Notice the identity provider, `"idp": "facebook.com"`, has been included in the JWT.
508508

509509
## A combined local and social sign-in
510510

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ When the custom policy runs:
311311

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

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

316316
## Step 4 - Upload policy
317317

0 commit comments

Comments
 (0)