Skip to content

Commit 1dc8450

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents b0e568a + dc99e12 commit 1dc8450

File tree

1,484 files changed

+31771
-14963
lines changed

Some content is hidden

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

1,484 files changed

+31771
-14963
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,6 @@
361361
"redirect_url": "/azure/data-explorer/data-explorer-insights",
362362
"redirect_document_id": false
363363
},
364-
{
365-
"source_path_from_root": "/articles/azure-monitor/insights/troubleshoot-workbooks.md" ,
366-
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
367-
"redirect_document_id": false
368-
},
369364
{
370365
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-ga-release-faq.md" ,
371366
"redirect_url": "/azure/azure-monitor/faq#vm-insights",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/communication-services/quickstarts/telephony/manage-inbound-calls.md",
5+
"redirect_url": "/articles/communication-services/how-tos/call-automation-sdk/redirect-inbound-telephony-calls.md",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
"redirect_url": "/azure/site-recovery/deploy-vmware-azure-replication-appliance-modernized",
4141
"redirect_document_id": false
4242
},
43+
{
44+
"source_path": "articles/container-registry/container-registry-customer-managed-keys.md",
45+
"redirect_url": "/azure/container-registry/tutorial-customer-managed-keys",
46+
"redirect_document_id": false
47+
},
4348
{
4449
"source_path": "articles/iot-hub/iot-hub-rm-template.md",
4550
"redirect_url": "/azure/iot-hub/iot-hub-rm-template-powershell",

articles/active-directory-b2c/TOC.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,10 @@
496496
href: partner-lexisnexis.md
497497
- name: Onfido
498498
href: partner-onfido.md
499+
- name: Identity verification tools
500+
items:
501+
- name: Grit IEF editor
502+
href: partner-grit-editor.md
499503
- name: Domain name
500504
items:
501505
- name: b2clogin.com overview

articles/active-directory-b2c/add-password-reset-policy.md

Lines changed: 23 additions & 10 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: 08/24/2021
12+
ms.date: 10/07/2022
1313
ms.custom: project-no-code
1414
ms.author: kengaderdus
1515
ms.subservice: B2C
@@ -114,6 +114,7 @@ Declare your claims in the [claims schema](claimsschema.md). Open the extensions
114114

115115
[Page layout version](contentdefinitions.md#migrating-to-page-layout) 2.1.2 is required to enable the self-service password reset flow in the sign-up or sign-in journey. To upgrade the page layout version:
116116

117+
1. Open the base file of your policy, for example, *SocialAndLocalAccounts/TrustFrameworkBase.xml*.
117118
1. Search for the [BuildingBlocks](buildingblocks.md) element. If the element doesn't exist, add it.
118119
1. Locate the [ContentDefinitions](contentdefinitions.md) element. If the element doesn't exist, add it.
119120
1. Modify the **DataURI** element within the **ContentDefinition** element to have the ID `api.signuporsignin`:
@@ -131,7 +132,10 @@ Declare your claims in the [claims schema](claimsschema.md). Open the extensions
131132
```
132133

133134
### Add the technical profiles
134-
A claims transformation technical profile accesses the `isForgotPassword` claim. The technical profile is referenced later. When it's invoked, it sets the value of the `isForgotPassword` claim to `true`. Find the **ClaimsProviders** element (if the element doesn't exist, create it), and then add the following claims provider:
135+
A claims transformation technical profile accesses the `isForgotPassword` claim. The technical profile is referenced later. When it's invoked, it sets the value of the `isForgotPassword` claim to `true`.
136+
137+
1. Open the extensions file of your policy, for example, in *SocialAndLocalAccounts/TrustFrameworkExtensions.xml*.
138+
1. Find the **ClaimsProviders** element (if the element doesn't exist, create it), and then add the following claims provider:
135139

136140
```xml
137141
<!--
@@ -171,7 +175,8 @@ The user can now sign in, sign up, and perform password reset in your user journ
171175

172176
The sub journey is called from the user journey and performs the specific steps that deliver the password reset experience to the user. Use the `Call` type sub journey so that when the sub journey is finished, control is returned to the orchestration step that initiated the sub journey.
173177

174-
Find the **SubJourneys** element. If the element doesn't exist, add it after the **User Journeys** element. Then, add the following sub journey:
178+
1. Open the extensions file of your policy, such as *SocialAndLocalAccounts/TrustFrameworkExtensions.xml*.
179+
1. Find the **SubJourneys** element. If the element doesn't exist, add it after the **User Journeys** element. Then, add the following sub journey:
175180

176181
```xml
177182
<!--
@@ -203,23 +208,25 @@ Next, connect the **Forgot your password?** link to the Forgot Password sub jour
203208

204209
If you don't have your own custom user journey that has a **CombinedSignInAndSignUp** step, complete the following steps to duplicate an existing sign-up or sign-in user journey. Otherwise, continue to the next section.
205210

206-
1. In the starter pack, open the *TrustFrameworkBase.xml* file.
211+
1. In the starter pack, open the *TrustFrameworkBase.xml* file such as *SocialAndLocalAccounts/TrustFrameworkBase.xml*.
207212
1. Find and copy the entire contents of the **UserJourney** element that includes `Id="SignUpOrSignIn"`.
208-
1. Open *TrustFrameworkExtensions.xml* and find the **UserJourneys** element. If the element doesn't exist, add one.
213+
1. Open *TrustFrameworkExtensions.xml* file, such as *SocialAndLocalAccounts/TrustFrameworkExtensions.xml*, and find the **UserJourneys** element. If the element doesn't exist, create it.
209214
1. Create a child element of the **UserJourneys** element by pasting the entire contents of the **UserJourney** element you copied in step 2.
210215
1. Rename the ID of the user journey. For example, `Id="CustomSignUpSignIn"`.
211216

212217
### Connect the Forgot Password link to the Forgot Password sub journey
213218

214-
In your user journey, you can represent the Forgot Password sub journey as a **ClaimsProviderSelection**. Adding this element connects the **Forgot your password?** link to the Forgot Password sub journey.
219+
In your user journey, you can represent the Forgot Password sub journey as a **ClaimsProviderSelection**. By adding this element, you connect the **Forgot your password?** link to the Forgot Password sub journey.
220+
221+
1. Open the *TrustFrameworkExtensions.xml* file, such as *SocialAndLocalAccounts/TrustFrameworkExtensions.xml*.
215222

216223
1. In the user journey, find the orchestration step element that includes `Type="CombinedSignInAndSignUp"` or `Type="ClaimsProviderSelection"`. It's usually the first orchestration step. The **ClaimsProviderSelections** element contains a list of identity providers that a user can use to sign in. Add the following line:
217224

218225
```xml
219226
<ClaimsProviderSelection TargetClaimsExchangeId="ForgotPasswordExchange" />
220227
```
221228

222-
1. In the next orchestration step, add a **ClaimsExchange** element. Add the following line:
229+
1. In the next orchestration step, add a **ClaimsExchange** element by adding the following line:
223230

224231
```xml
225232
<ClaimsExchange Id="ForgotPasswordExchange" TechnicalProfileReferenceId="ForgotPassword" />
@@ -245,7 +252,13 @@ In your user journey, you can represent the Forgot Password sub journey as a **C
245252

246253
### Set the user journey to be executed
247254

248-
Now that you've modified or created a user journey, in the **Relying Party** section, specify the journey that Azure AD B2C will execute for this custom policy. In the [RelyingParty](relyingparty.md) element, find the **DefaultUserJourney** element. Update the **DefaultUserJourney ReferenceId** to match the ID of the user journey in which you added the **ClaimsProviderSelections**.
255+
Now that you've modified or created a user journey, in the **Relying Party** section, specify the journey that Azure AD B2C will execute for this custom policy.
256+
257+
1. Open the file that has the **Relying Party** element, such as *SocialAndLocalAccounts/SignUpOrSignin.xml*.
258+
259+
1. In the [RelyingParty](relyingparty.md) element, find the **DefaultUserJourney** element.
260+
261+
1. Update the **DefaultUserJourney ReferenceId** to match the ID of the user journey in which you added the **ClaimsProviderSelections**.
249262

250263
```xml
251264
<RelyingParty>
@@ -275,8 +288,8 @@ Your application might need to detect whether the user signed in by using the Fo
275288
1. In the Azure portal, search for and select **Azure AD B2C**.
276289
1. In the menu under **Policies**, select **Identity Experience Framework**.
277290
1. Select **Upload custom policy**. In the following order, upload the two policy files that you changed:
278-
1. The extension policy, for example, *TrustFrameworkExtensions.xml*.
279-
1. The relying party policy, for example, *SignUpSignIn.xml*.
291+
1. The extension policy, for example, *SocialAndLocalAccounts/TrustFrameworkExtensions.xml*.
292+
1. The relying party policy, for example, *SocialAndLocalAccounts/SignUpOrSignin.xml*.
280293

281294
::: zone-end
282295

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

Lines changed: 3 additions & 3 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: conceptual
12-
ms.date: 08/10/2022
12+
ms.date: 10/11/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515

@@ -38,7 +38,7 @@ These steps can differ slightly based on the type of application you're building
3838

3939
## Web applications
4040

41-
For web applications (including .NET, PHP, Java, Ruby, Python, and Node.js) that are hosted on a server and accessed through a browser, Azure AD B2C supports [OpenID Connect](protocols-overview.md) for all user experiences. In the Azure AD B2C implementation of OpenID Connect, your web application initiates user experiences by issuing authentication requests to Azure AD. The result of the request is an `id_token`. This security token represents the user's identity. It also provides information about the user in the form of claims:
41+
For web applications (including .NET, PHP, Java, Ruby, Python, and Node.js) that are hosted on a web server and accessed through a browser, Azure AD B2C supports [OpenID Connect](protocols-overview.md) for all user experiences. In the Azure AD B2C implementation of OpenID Connect, your web application initiates user experiences by issuing authentication requests to Azure AD. The result of the request is an `id_token`. This security token represents the user's identity. It also provides information about the user in the form of claims:
4242

4343
```json
4444
// Partial raw id_token
@@ -69,7 +69,7 @@ Validation of the `id_token` by using a public signing key that is received from
6969

7070
To see this scenario in action, try one of the web application sign-in code samples in our [Getting started section](overview.md).
7171

72-
In addition to facilitating simple sign in, a web server application might also need to access a back-end web service. In this case, the web application can perform a slightly different [OpenID Connect flow](openid-connect.md) and acquire tokens by using authorization codes and refresh tokens. This scenario is depicted in the following [Web APIs section](#web-apis).
72+
In addition to facilitating simple sign in, a web application might also need to access a back-end web service. In this case, the web application can perform a slightly different [OpenID Connect flow](openid-connect.md) and acquire tokens by using authorization codes and refresh tokens. This scenario is depicted in the following [Web APIs section](#web-apis).
7373

7474
## Single-page applications
7575

articles/active-directory-b2c/configure-authentication-sample-react-spa-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export const msalConfig: Configuration = {
157157
export const protectedResources = {
158158
todoListApi: {
159159
endpoint: "http://localhost:5000/hello",
160-
scopes: ["https://your-tenant-namee.onmicrosoft.com/tasks-api/tasks.read"],
160+
scopes: ["https://your-tenant-name.onmicrosoft.com/tasks-api/tasks.read"],
161161
},
162162
}
163163
```

articles/active-directory-b2c/custom-email-mailjet.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: 06/22/2022
12+
ms.date: 10/06/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
zone_pivot_groups: b2c-policy-type
@@ -162,7 +162,7 @@ With a Mailjet account created and the Mailjet API key stored in an Azure AD B2C
162162
<td valign="top" width="50%"></td>
163163
</tr>
164164
</table>
165-
<img src="https://mucp.api.account.microsoft.com/m/v2/v?d=AIAACWEPFYXYIUTJIJVV4ST7XLBHVI5MLLYBKJAVXHBDTBHUM5VBSVVPTTVRWDFIXJ5JQTHYOH5TUYIPO4ZAFRFK52UAMIS3UNIPPI7ZJNDZPRXD5VEJBN4H6RO3SPTBS6AJEEAJOUYL4APQX5RJUJOWGPKUABY&amp;i=AIAACL23GD2PFRFEY5YVM2XQLM5YYWMHFDZOCDXUI2B4LM7ETZQO473CVF22PT6WPGR5IIE6TCS6VGEKO5OZIONJWCDMRKWQQVNP5VBYAINF3S7STKYOVDJ4JF2XEW4QQVNHMAPQNHFV3KMR3V3BA4I36B6BO7L4VQUHQOI64EOWPLMG5RB3SIMEDEHPILXTF73ZYD3JT6MYOLAZJG7PJJCAXCZCQOEFVH5VCW2KBQOKRYISWQLRWAT7IINZ3EFGQI2CY2EMK3FQOXM7UI3R7CZ6D73IKDI" width="1" height="1"></body>
165+
</body>
166166
</html>
167167
```
168168

articles/active-directory-b2c/custom-email-sendgrid.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: 04/25/2022
12+
ms.date: 10/06/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
zone_pivot_groups: b2c-policy-type
@@ -154,7 +154,7 @@ With a SendGrid account created and SendGrid API key stored in an Azure AD B2C p
154154
<td valign="top" width="50%"></td>
155155
</tr>
156156
</table>
157-
<img src="https://mucp.api.account.microsoft.com/m/v2/v?d=AIAACWEPFYXYIUTJIJVV4ST7XLBHVI5MLLYBKJAVXHBDTBHUM5VBSVVPTTVRWDFIXJ5JQTHYOH5TUYIPO4ZAFRFK52UAMIS3UNIPPI7ZJNDZPRXD5VEJBN4H6RO3SPTBS6AJEEAJOUYL4APQX5RJUJOWGPKUABY&amp;i=AIAACL23GD2PFRFEY5YVM2XQLM5YYWMHFDZOCDXUI2B4LM7ETZQO473CVF22PT6WPGR5IIE6TCS6VGEKO5OZIONJWCDMRKWQQVNP5VBYAINF3S7STKYOVDJ4JF2XEW4QQVNHMAPQNHFV3KMR3V3BA4I36B6BO7L4VQUHQOI64EOWPLMG5RB3SIMEDEHPILXTF73ZYD3JT6MYOLAZJG7PJJCAXCZCQOEFVH5VCW2KBQOKRYISWQLRWAT7IINZ3EFGQI2CY2EMK3FQOXM7UI3R7CZ6D73IKDI" width="1" height="1"></body>
157+
</body>
158158
</html>
159159
```
160160

articles/active-directory-b2c/enable-authentication-android-app-options.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: reference
10-
ms.date: 11/11/2021
10+
ms.date: 10/06/2022
1111
ms.author: kengaderdus
1212
ms.subservice: B2C
1313
ms.custom: "b2c-support"
@@ -162,8 +162,14 @@ b2cApp.acquireToken(parameters);
162162
#### [Kotlin](#tab/kotlin)
163163

164164
```kotlin
165-
val extraQueryParameters: MutableList<Pair<String, String>> = ArrayList()
166-
extraQueryParameters.add(Pair("ui_locales", "en-us"))
165+
val extraQueryParameters: MutableList<Map.Entry<String, String>> = ArrayList()
166+
167+
val mapEntry = object : Map.Entry<String, String> {
168+
override val key: String = "ui_locales"
169+
override val value: String = "en-us"
170+
}
171+
172+
extraQueryParameters.add(mapEntry )
167173

168174
val parameters = AcquireTokenParameters.Builder()
169175
.startAuthorizationFromActivity(activity)
@@ -173,7 +179,6 @@ val parameters = AcquireTokenParameters.Builder()
173179

174180
b2cApp!!.acquireToken(parameters)
175181
```
176-
177182
#### [Java](#tab/java)
178183

179184
```java

0 commit comments

Comments
 (0)