Skip to content

Commit cedcaab

Browse files
authored
Merge pull request #214252 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents fe1c4cb + 6c30ac9 commit cedcaab

File tree

69 files changed

+560
-156
lines changed

Some content is hidden

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

69 files changed

+560
-156
lines changed

articles/active-directory-b2c/json-transformations.md

Lines changed: 21 additions & 1 deletion
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: reference
12-
ms.date: 08/10/2022
12+
ms.date: 09/07/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
@@ -251,6 +251,26 @@ The following claims transformation outputs a JSON string claim that will be the
251251
}
252252
```
253253

254+
The **GenerateJson** claims transformation accepts plain strings. If an input claim contains a JSON string, that string will be escaped. In the following example, if you use email output from [CreateJsonArray above](json-transformations.md#example-of-createjsonarray), that is ["[email protected]"], as an input parameter, the email will look like as shown in the following JSON claim:
255+
256+
- Output claim:
257+
- **requestBody**:
258+
259+
```json
260+
{
261+
"customerEntity":{
262+
"email":"[\"[email protected]\"]",
263+
"userObjectId":"01234567-89ab-cdef-0123-456789abcdef",
264+
"firstName":"John",
265+
"lastName":"Smith",
266+
"role":{
267+
"name":"Administrator",
268+
"id": 1
269+
}
270+
}
271+
}
272+
```
273+
254274
## GetClaimFromJson
255275

256276
Get a specified element from a JSON data. Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-transformation/json#getclaimfromjson) of this claims transformation.

articles/active-directory-b2c/user-profile-attributes.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 09/24/2021
11+
ms.date: 10/11/2021
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
14+
ms.custom: b2c-support
1415
---
1516

1617
# User profile attributes
@@ -48,7 +49,7 @@ The table below lists the [user resource type](/graph/api/resources/user) attrib
4849
|creationType |String|If the user account was created as a local account for an Azure Active Directory B2C tenant, the value is LocalAccount or nameCoexistence. Read only.|No|No|Persisted, Output|
4950
|dateOfBirth |Date|Date of birth.|No|No|Persisted, Output|
5051
|department |String|The name for the department in which the user works. Max length 64.|Yes|No|Persisted, Output|
51-
|displayName |String|The display name for the user. Max length 256.|Yes|Yes|Persisted, Output|
52+
|displayName |String|The display name for the user. Max length 256. \< \> characters aren't allowed. | Yes|Yes|Persisted, Output|
5253
|facsimileTelephoneNumber<sup>1</sup>|String|The telephone number of the user's business fax machine.|Yes|No|Persisted, Output|
5354
|givenName |String|The given name (first name) of the user. Max length 64.|Yes|Yes|Persisted, Output|
5455
|jobTitle |String|The user's job title. Max length 128.|Yes|Yes|Persisted, Output|
@@ -165,7 +166,7 @@ In user migration scenarios, if the accounts you want to migrate have weaker pas
165166

166167
## MFA phone number attribute
167168

168-
When using a phone for multi-factor authentication (MFA), the mobile phone is used to verify the user identity. To [add](/graph/api/authentication-post-phonemethods) a new phone number programmatically, [update](/graph/api/b2cauthenticationmethodspolicy-update), [get](/graph/api/b2cauthenticationmethodspolicy-get), or [delete](/graph/api/phoneauthenticationmethod-delete) the phone number, use MS Graph API [phone authentication method](/graph/api/resources/phoneauthenticationmethod).
169+
When using a phone for multi-factor authentication (MFA), the mobile phone is used to verify the user identity. To [add](/graph/api/authentication-post-phonemethods) a new phone number programmatically, [update](/graph/api/phoneauthenticationmethod-update), [get](/graph/api/phoneauthenticationmethod-get), or [delete](/graph/api/phoneauthenticationmethod-delete) the phone number, use MS Graph API [phone authentication method](/graph/api/resources/phoneauthenticationmethod).
169170

170171
In Azure AD B2C [custom policies](custom-policy-overview.md), the phone number is available through `strongAuthenticationPhoneNumber` claim type.
171172

articles/active-directory/enterprise-users/groups-dynamic-membership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ dirSyncEnabled |true false |user.dirSyncEnabled -eq true
104104
| memberOf | Any string value (valid group object ID) | user.memberof -any (group.objectId -in ['value']) |
105105
| mobile |Any string value or *null* | user.mobile -eq "value" |
106106
| objectId |GUID of the user object | user.objectId -eq "11111111-1111-1111-1111-111111111111" |
107-
| onPremisesDistinguishedName (preview)| Any string value or *null* | user.onPremisesDistinguishedName -eq "value" |
107+
| onPremisesDistinguishedName | Any string value or *null* | user.onPremisesDistinguishedName -eq "value" |
108108
| onPremisesSecurityIdentifier | On-premises security identifier (SID) for users who were synchronized from on-premises to the cloud. | user.onPremisesSecurityIdentifier -eq "S-1-1-11-1111111111-1111111111-1111111111-1111111" |
109109
| passwordPolicies |None<br>DisableStrongPassword<br>DisablePasswordExpiration<br>DisablePasswordExpiration, DisableStrongPassword | user.passwordPolicies -eq "DisableStrongPassword" |
110110
| physicalDeliveryOfficeName |Any string value or *null* | user.physicalDeliveryOfficeName -eq "value" |

articles/active-directory/governance/how-to-lifecycle-workflow-sync-attributes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ To ensure timing accuracy of scheduled workflows it’s curial to consider:
9494
6. Select **Add attribute**.
9595
7. Fill in the following information:
9696
- Mapping Type: Direct
97-
- Source attribute: msDS-cloudExtensionAttribute1
97+
- Source attribute: extensionAttribute1
9898
- Default value: Leave blank
9999
- Target attribute: employeeHireDate
100100
- Apply this mapping: Always
@@ -157,4 +157,4 @@ For more information, see [How to customize a synchronization rule](../hybrid/ho
157157
## Next steps
158158
- [What are lifecycle workflows?](what-are-lifecycle-workflows.md)
159159
- [Create a custom workflow using the Azure portal](tutorial-onboard-custom-workflow-portal.md)
160-
- [Create a Lifecycle workflow](create-lifecycle-workflow.md)
160+
- [Create a Lifecycle workflow](create-lifecycle-workflow.md)

articles/active-directory/governance/tutorial-prepare-azure-ad-user-accounts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ First we'll create our employee, Melva Prince.
5858
"displayName": "Melva Prince",
5959
"mailNickname": "mprince",
6060
"department": "sales",
61-
"mail": "mpricne@<your tenant name here>",
62-
"employeeHireDate": "2022-04-15T22:10:00Z"
61+
"mail": "mprince@<your tenant name here>",
62+
"employeeHireDate": "2022-04-15T22:10:00Z",
6363
"userPrincipalName": "mprince@<your tenant name here>",
6464
"passwordProfile" : {
6565
"forceChangePasswordNextSignIn": true,
@@ -84,7 +84,7 @@ Next, we'll create Britta Simon. This is the account that will be used as our m
8484
"mailNickname": "bsimon",
8585
"department": "sales",
8686
"mail": "bsimon@<your tenant name here>",
87-
"employeeHireDate": "2021-01-15T22:10:00Z"
87+
"employeeHireDate": "2021-01-15T22:10:00Z",
8888
"userPrincipalName": "bsimon@<your tenant name here>",
8989
"passwordProfile" : {
9090
"forceChangePasswordNextSignIn": true,

articles/aks/cluster-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ This enables an OIDC Issuer URL of the provider which allows the API server to d
369369
370370
### Prerequisites
371371

372-
* The Azure CLI version 2.42.0 or higher. Run `az --version` to find your version. If you need to install or upgrade, see [Install Azure CLI][azure-cli-install].
372+
* The Azure CLI version 2.40.0 or higher. Run `az --version` to find your version. If you need to install or upgrade, see [Install Azure CLI][azure-cli-install].
373373
* AKS version 1.22 and higher. If your cluster is running version 1.21 and the OIDC Issuer preview is enabled, we recommend you upgrade the cluster to the minimum required version supported.
374374

375375
### Create an AKS cluster with OIDC Issuer

0 commit comments

Comments
 (0)