Skip to content

Commit c923df1

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents e6ae1c3 + 0255a97 commit c923df1

File tree

263 files changed

+6650
-1953
lines changed

Some content is hidden

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

263 files changed

+6650
-1953
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,12 @@
674674
"branch": "main",
675675
"branch_mapping": {}
676676
},
677+
{
678+
"path_to_root": "cosmos-db-sql-api-javascript-samples",
679+
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-javascript-samples",
680+
"branch": "main",
681+
"branch_mapping": {}
682+
},
677683
{
678684
"path_to_root": "azure-cosmos-db-python-getting-started",
679685
"url": "https://github.com/Azure-Samples/azure-cosmos-db-python-getting-started",

articles/active-directory/develop/reference-aadsts-error-codes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ The `error` field has several possible values - review the protocol documentatio
348348
| AADSTS700022 | InvalidMultipleResourcesScope - The provided value for the input parameter scope isn't valid because it contains more than one resource. |
349349
| AADSTS700023 | InvalidResourcelessScope - The provided value for the input parameter scope isn't valid when request an access token. |
350350
| AADSTS7000215 | Invalid client secret is provided. Developer error - the app is attempting to sign in without the necessary or correct authentication parameters.|
351+
| AADSTS7000218 | The request body must contain the following parameter: 'client_assertion' or 'client_secret'. |
351352
| AADSTS7000222 | InvalidClientSecretExpiredKeysProvided - The provided client secret keys are expired. Visit the Azure portal to create new keys for your app, or consider using certificate credentials for added security: [https://aka.ms/certCreds](./active-directory-certificate-credentials.md) |
352353
| AADSTS700005 | InvalidGrantRedeemAgainstWrongTenant - Provided Authorization Code is intended to use against other tenant, thus rejected. OAuth2 Authorization Code must be redeemed against same tenant it was acquired for (/common or /{tenant-ID} as appropriate) |
353354
| AADSTS1000000 | UserNotBoundError - The Bind API requires the Azure AD user to also authenticate with an external IDP, which hasn't happened yet. |

articles/active-directory/develop/v2-app-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ You can ensure the user's identity by validating the ID token with a public sign
7777

7878
To see this scenario in action, try the code samples in [Sign in users from a Web app](scenario-web-app-sign-user-overview.md).
7979

80-
In addition to simple sign-in, a web server app might need to access another web service, such as a Representational State Transfer ([REST](https://docs.microsoft.com/rest/api/azure/)) API. In this case, the web server app engages in a combined OpenID Connect and OAuth 2.0 flow, by using the [OAuth 2.0 authorization code flow](v2-oauth2-auth-code-flow.md). For more information about this scenario, refer to our code [sample](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/blob/master/2-WebApp-graph-user/2-1-Call-MSGraph/README.md).
80+
In addition to simple sign-in, a web server app might need to access another web service, such as a [Representational State Transfer (REST) API](/rest/api/azure/). In this case, the web server app engages in a combined OpenID Connect and OAuth 2.0 flow, by using the [OAuth 2.0 authorization code flow](v2-oauth2-auth-code-flow.md). For more information about this scenario, refer to our code [sample](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/blob/master/2-WebApp-graph-user/2-1-Call-MSGraph/README.md).
8181

8282
## Web APIs
8383

articles/active-directory/enterprise-users/licensing-service-plan-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.service: active-directory
1313
ms.subservice: enterprise-users
1414
ms.topic: reference
1515
ms.workload: identity
16-
ms.date: 09/19/2022
16+
ms.date: 09/21/2022
1717
ms.author: nicholak
1818
ms.reviewer: Nicholak-MS
1919
ms.custom: "it-pro;seo-update-azuread-jan"
@@ -32,7 +32,7 @@ When managing licenses in [the Azure portal](https://portal.azure.com/#blade/Mic
3232
- **Service plans included (friendly names)**: A list of service plans (friendly names) in the product that correspond to the string ID and GUID
3333

3434
>[!NOTE]
35-
>This information last updated on September 19th, 2022.<br/>You can also download a CSV version of this table [here](https://download.microsoft.com/download/e/3/e/e3e9faf2-f28b-490a-9ada-c6089a1fc5b0/Product%20names%20and%20service%20plan%20identifiers%20for%20licensing.csv).
35+
>This information last updated on September 21st, 2022.<br/>You can also download a CSV version of this table [here](https://download.microsoft.com/download/e/3/e/e3e9faf2-f28b-490a-9ada-c6089a1fc5b0/Product%20names%20and%20service%20plan%20identifiers%20for%20licensing.csv).
3636
><br/>
3737
3838
| Product name | String ID | GUID | Service plans included | Service plans included (friendly names) |

articles/active-directory/fundamentals/security-operations-user-accounts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ The following are listed in order of importance based on the effect and severity
257257
| What to monitor| Risk Level| Where| Filter/sub-filter| Notes |
258258
| - |- |- |- |- |
259259
| Users authenticating to other Azure AD tenants.| Low| Azure AD Sign-ins log| Status = success<br>Resource tenantID != Home Tenant ID| Detects when a user has successfully authenticated to another Azure AD tenant with an identity in your organization's tenant.<br>Alert if Resource TenantID isn't equal to Home Tenant ID <br>[Microsoft Sentinel template](https://github.com/Azure/Azure-Sentinel/blob/master/Hunting%20Queries/AuditLogs/UsersAuthenticatingtoOtherAzureADTenants.yaml)<br>[Sigma rules](https://github.com/SigmaHQ/sigma/tree/master/rules/cloud/azure)|
260-
|User state changed from Guest to Member|Medium|Azure AD Audit logs|Activity: Update user<br>Category: UserManagement<br>UserType changed from Guest to Member|Monitor and alert on change of user type from Guest to Member. Was this expected?<br>[Microsoft Sentinel template](https://github.com/Azure/Azure-Sentinel/blob/master/Detections/AuditLogs/UserStatechangedfromGuesttoMember.yaml<br>[Sigma rules](https://github.com/SigmaHQ/sigma/tree/master/rules/cloud/azure))
261-
|Guest users invited to tenant by non-approved inviters|Medium|Azure AD Audit logs|Activity: Invite external user<br>Category: UserManagement<br>Initiated by (actor): User Principal Name|Monitor and alert on non-approved actors inviting external users.<br>[Microsoft Sentinel template](https://github.com/Azure/Azure-Sentinel/blob/master/Detections/AuditLogs/GuestUsersInvitedtoTenantbyNewInviters.yaml<br>[Sigma rules](https://github.com/SigmaHQ/sigma/tree/master/rules/cloud/azure)|
260+
|User state changed from Guest to Member|Medium|Azure AD Audit logs|Activity: Update user<br>Category: UserManagement<br>UserType changed from Guest to Member|Monitor and alert on change of user type from Guest to Member. Was this expected?<br>[Microsoft Sentinel template](https://github.com/Azure/Azure-Sentinel/blob/master/Detections/AuditLogs/UserStatechangedfromGuesttoMember.yaml)<br>[Sigma rules](https://github.com/SigmaHQ/sigma/tree/master/rules/cloud/azure)
261+
|Guest users invited to tenant by non-approved inviters|Medium|Azure AD Audit logs|Activity: Invite external user<br>Category: UserManagement<br>Initiated by (actor): User Principal Name|Monitor and alert on non-approved actors inviting external users.<br>[Microsoft Sentinel template](https://github.com/Azure/Azure-Sentinel/blob/master/Detections/AuditLogs/GuestUsersInvitedtoTenantbyNewInviters.yaml)<br>[Sigma rules](https://github.com/SigmaHQ/sigma/tree/master/rules/cloud/azure)|
262262

263263
### Monitoring for failed unusual sign ins
264264

articles/active-directory/governance/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@
245245
href: workflows-faqs.md
246246
- name: Developer API reference Lifecycle Workflows- Azure Active Directory
247247
href: lifecycle-workflows-developer-reference.md
248+
- name: Set employeeLeaveDateTime for leaver workflows
249+
href: set-employee-leave-date-time.md
248250
- name: Preparing user accounts for Lifecycle workflows tutorials (Preview)
249251
href: tutorial-prepare-azure-ad-user-accounts.md
250252
- name: Configure a Logic App for Lifecycle Workflow use (Preview)

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
@@ -23,10 +23,10 @@ The following table shows the scheduling (trigger) relevant attributes and the m
2323
|Attribute|Type|Supported in HR Inbound Provisioning|Support in Azure AD Connect Cloud Sync|Support in Azure AD Connect Sync|
2424
|-----|-----|-----|-----|-----|
2525
|employeeHireDate|DateTimeOffset|Yes|Yes|Yes|
26-
|employeeLeaveDateTime|DateTimeOffset|Not currently(manually setting supported)|Not currently(manually setting supported)|Not currently(manually setting supported)|
26+
|employeeLeaveDateTime|DateTimeOffset|Yes|Not currently|Not currently|
2727

2828
> [!NOTE]
29-
> Currently, automatic synchronization of the employeeLeaveDateTime attribute for HR Inbound scenarios is not available. To take advantaged of leaver scenarios, you can set the employeeLeaveDateTime manually. Manually setting the attribute can be done in the portal or with Graph. For more information see [User profile in Azure](../fundamentals/active-directory-users-profile-azure-portal.md) and [Update user](/graph/api/user-update?view=graph-rest-beta&tabs=http).
29+
> To take advantaged of leaver scenarios, you can set the employeeLeaveDateTime manually for cloud-only users. For more information, see: [Set employeeLeaveDateTime](set-employee-leave-date-time.md)
3030
3131
This document explains how to set up synchronization from on-premises Azure AD Connect cloud sync and Azure AD Connect for the required attributes.
3232

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
---
2+
title: Set employeeLeaveDateTime
3+
description: Explains how to manually set employeeLeaveDateTime.
4+
author: owinfreyATL
5+
ms.author: owinfrey
6+
ms.service: active-directory
7+
ms.topic: how-to
8+
ms.date: 09/07/2022
9+
ms.custom: template-how-to
10+
---
11+
12+
# Set employeeLeaveDateTime
13+
14+
This article describes how to manually set the employeeLeaveDateTime attribute for a user. This attribute can be set as a trigger for leaver workflows created using Lifecycle Workflows.
15+
16+
## Required permission and roles
17+
18+
To set the employeeLeaveDateTime attribute, you must make sure the correct delegated roles and application permissions are set. They are as follows:
19+
20+
### Delegated
21+
22+
In delegated scenarios, the signed-in user needs the Global Administrator role to update the employeeLeaveDateTime attribute. One of the following delegated permissions is also required:
23+
- User-LifeCycleInfo.ReadWrite.All
24+
- Directory.AccessAsUser.All
25+
26+
### Application
27+
28+
Updating the employeeLeaveDateTime requires the User-LifeCycleInfo.ReadWrite.All application permission.
29+
30+
>[!NOTE]
31+
> The User-LifeCycleInfo.ReadWrite.All permissions is currently hidden and cannot be configured in Graph Explorer or the API permission blade of app registrations.
32+
33+
## Set employeeLeaveDateTime via PowerShell
34+
To set the employeeLeaveDateTime for a user using PowerShell enter the following information:
35+
36+
```powershell
37+
Connect-MgGraph -Scopes "User-LifeCycleInfo.ReadWrite.All"
38+
Select-MgProfile -Name "beta"
39+
40+
$UserId = "<Object ID of the user>"
41+
$employeeLeaveDateTime = "<Leave date>"
42+
43+
$Body = '{"employeeLeaveDateTime": "' + $employeeLeaveDateTime + '"}'
44+
Update-MgUser -UserId $UserId -BodyParameter $Body
45+
46+
$User = Get-MgUser -UserId $UserId -Property employeeLeaveDateTime
47+
$User.AdditionalProperties
48+
```
49+
50+
This script is an example of a user who will leave on September 30, 2022 at 23:59.
51+
52+
```powershell
53+
Connect-MgGraph -Scopes "User-LifeCycleInfo.ReadWrite.All"
54+
Select-MgProfile -Name "beta"
55+
56+
$UserId = "528492ea-779a-4b59-b9a3-b3773ef6da6d"
57+
$employeeLeaveDateTime = "2022-09-30T23:59:59Z"
58+
59+
$Body = '{"employeeLeaveDateTime": "' + $employeeLeaveDateTime + '"}'
60+
Update-MgUser -UserId $UserId -BodyParameter $Body
61+
62+
$User = Get-MgUser -UserId $UserId -Property employeeLeaveDateTime
63+
$User.AdditionalProperties
64+
```
65+
66+
67+
## Next steps
68+
69+
- [How to synchronize attributes for Lifecycle workflows](how-to-lifecycle-workflow-sync-attributes.md)
70+
- [Lifecycle Workflows templates](lifecycle-workflow-templates.md)

articles/active-directory/hybrid/how-to-connect-sync-whatis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The sync service consists of two components, the on-premises **Azure AD Connect
2929
>
3030
>To find out if you are already eligible for Cloud Sync, please verify your requirements in [this wizard](https://admin.microsoft.com/adminportal/home?Q=setupguidance#/modernonboarding/identitywizard).
3131
>
32-
>To learn more about Cloud Sync please read [this article](https://docs.microsoft.com/azure/active-directory/cloud-sync/what-is-cloud-sync), or watch this [short video](https://www.microsoft.com/en-us/videoplayer/embed/RWJ8l5).
32+
>To learn more about Cloud Sync please read [this article](/azure/active-directory/cloud-sync/what-is-cloud-sync), or watch this [short video](https://www.microsoft.com/videoplayer/embed/RWJ8l5).
3333
>
3434
3535

articles/active-directory/hybrid/reference-connect-sync-attributes-synchronized.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ Device objects are created in Active Directory. These objects can be devices joi
461461

462462
## Notes
463463
* When using an Alternate ID, the on-premises attribute userPrincipalName is synchronized with the Azure AD attribute onPremisesUserPrincipalName. The Alternate ID attribute, for example mail, is synchronized with the Azure AD attribute userPrincipalName.
464+
* Although there is no enforcement of uniqueness on the Azure AD onPremisesUserPrincipalName attribute, it is not supported to sync the same UserPrincipalName value to the Azure AD onPremisesUserPrincipalName attribute for multiple different Azure AD users.
464465
* In the lists above, the object type **User** also applies to the object type **iNetOrgPerson**.
465466

466467
## Next steps

0 commit comments

Comments
 (0)