Skip to content

Commit e2e9d2e

Browse files
authored
Merge pull request #210746 from MicrosoftDocs/main
9/09 PM Publish
2 parents 0029764 + 8c6726c commit e2e9d2e

File tree

241 files changed

+3795
-1522
lines changed

Some content is hidden

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

241 files changed

+3795
-1522
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/azure/availability-zones/migrate-api-mgt",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path": "articles/api-management/breaking-changes/rp-source-ip-address-change-mar2023.md",
10+
"redirect_url": "/azure/api-management/breaking-changes/rp-source-ip-address-change-mar-2023",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path": "articles/api-management/developer-portal-implement-widgets.md",
1015
"redirect_url": "/azure/api-management/developer-portal-extend-custom-functionality",

articles/active-directory/authentication/active-directory-certificate-based-authentication-get-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ manager: amycolannino
1414
ms.reviewer: annaba
1515

1616
ms.collection: M365-identity-device-management
17-
ms.custom: has-adal-ref
17+
1818
---
1919
# Get started with certificate-based authentication in Azure Active Directory with federation
2020

@@ -37,7 +37,7 @@ This topic:
3737

3838
To configure CBA with federation, the following statements must be true:
3939

40-
- CBA with federation is only supported for Federated environments for browser applications, native clients using modern authentication (ADAL), or MSAL libraries. The one exception is Exchange Active Sync (EAS) for Exchange Online (EXO), which can be used for federated and managed accounts. To configure Azure AD CBA without needing federation, see [How to configure Azure AD certificate-based authentication](how-to-certificate-based-authentication.md).
40+
- CBA with federation is only supported for Federated environments for browser applications, native clients using modern authentication, or MSAL libraries. The one exception is Exchange Active Sync (EAS) for Exchange Online (EXO), which can be used for federated and managed accounts. To configure Azure AD CBA without needing federation, see [How to configure Azure AD certificate-based authentication](how-to-certificate-based-authentication.md).
4141
- The root certificate authority and any intermediate certificate authorities must be configured in Azure Active Directory.
4242
- Each certificate authority must have a certificate revocation list (CRL) that can be referenced via an internet-facing URL.
4343
- You must have at least one certificate authority configured in Azure Active Directory. You can find related steps in the [Configure the certificate authorities](#step-2-configure-the-certificate-authorities) section.

articles/active-directory/conditional-access/concept-conditional-access-grant.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ The following client apps are confirmed to support this setting:
151151
- Microsoft Teams
152152
- Microsoft To Do
153153
- Microsoft Word
154+
- Microsoft Power Apps
155+
- Microsoft Field Service (Dynamics 365)
154156
- MultiLine for Intune
155157
- Nine Mail - Email and Calendar
156158
- Notate for Intune

articles/active-directory/conditional-access/concept-conditional-access-policies.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ All policies are enforced in two phases:
3636
- Use the session details gathered in phase 1 to identify any requirements that haven't been met.
3737
- If there's a policy that is configured to block access, with the block grant control, enforcement will stop here and the user will be blocked.
3838
- The user will be prompted to complete more grant control requirements that weren't satisfied during phase 1 in the following order, until policy is satisfied:
39-
- [Multi-factor authentication​](concept-conditional-access-grant.md#require-multi-factor-authentication)
40-
- [Device to be marked as compliant](./concept-conditional-access-grant.md#require-device-to-be-marked-as-compliant)
41-
- [Hybrid Azure AD joined device](./concept-conditional-access-grant.md#require-hybrid-azure-ad-joined-device)
42-
- [Approved client app](./concept-conditional-access-grant.md#require-approved-client-app)
43-
- [App protection policy](./concept-conditional-access-grant.md#require-app-protection-policy)
44-
- [Password change](./concept-conditional-access-grant.md#require-password-change)
45-
- [Terms of use](concept-conditional-access-grant.md#terms-of-use)
46-
- [Custom controls](./concept-conditional-access-grant.md#custom-controls-preview)
39+
1. [Multi-factor authentication​](concept-conditional-access-grant.md#require-multi-factor-authentication)
40+
2. [Device to be marked as compliant](./concept-conditional-access-grant.md#require-device-to-be-marked-as-compliant)
41+
3. [Hybrid Azure AD joined device](./concept-conditional-access-grant.md#require-hybrid-azure-ad-joined-device)
42+
4. [Approved client app](./concept-conditional-access-grant.md#require-approved-client-app)
43+
5. [App protection policy](./concept-conditional-access-grant.md#require-app-protection-policy)
44+
6. [Password change](./concept-conditional-access-grant.md#require-password-change)
45+
7. [Terms of use](concept-conditional-access-grant.md#terms-of-use)
46+
8. [Custom controls](./concept-conditional-access-grant.md#custom-controls-preview)
4747
- Once all grant controls have been satisfied, apply session controls (App Enforced, Microsoft Defender for Cloud Apps, and token Lifetime)
4848
- Phase 2 of policy evaluation occurs for all enabled policies.
4949

articles/active-directory/conditional-access/faqs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ manager: amycolannino
1414
ms.reviewer: calebb
1515

1616
ms.collection: M365-identity-device-management
17-
ms.custom: has-adal-ref
17+
ms.custom:
1818
---
1919
# Azure Active Directory Conditional Access FAQs
2020

@@ -48,7 +48,7 @@ Microsoft Teams relies heavily on Exchange Online and SharePoint Online for core
4848

4949
Microsoft Teams also is supported separately as a cloud app in Conditional Access policies. Conditional Access policies that are set for a cloud app apply to Microsoft Teams when a user signs in. However, without the correct policies on other apps like Exchange Online and SharePoint Online users may still be able to access those resources directly.
5050

51-
Microsoft Teams desktop clients for Windows and Mac support modern authentication. Modern authentication brings sign-in based on the Azure Active Directory Authentication Library (ADAL) to Microsoft Office client applications across platforms.
51+
Microsoft Teams desktop clients for Windows and Mac support modern authentication. Modern authentication brings sign-in to Microsoft Office client applications across platforms.
5252

5353
For more information, see the article, [Conditional Access service dependencies](service-dependencies.md) and consider targeting policies to the [Office 365 app](concept-conditional-access-cloud-apps.md#office-365) instead.
5454

articles/active-directory/develop/includes/console-app/quickstart-nodejs.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77
ms.service: active-directory
88
ms.subservice: develop
99
ms.topic: include
10-
ms.date: 01/10/2022
10+
ms.date: 09/09/2022
1111
ms.author: marsma
1212
#Customer intent: As an application developer, I want to learn how my Node.js app can get an access token and call an API that is protected by a Microsoft identity platform endpoint using client credentials flow.
1313
ms.custom: mode-other
@@ -60,17 +60,20 @@ To register your application and add the app's registration information to your
6060
- `Enter_the_Application_Id_Here` - is the **Application (client) ID** of the application you registered earlier. Find this ID on the app registration's **Overview** pane in the Azure portal.
6161
- `Enter_the_Tenant_Id_Here` - replace this value with the **Tenant ID** or **Tenant name** (for example, contoso.microsoft.com). Find these values on the app registration's **Overview** pane in the Azure portal.
6262
- `Enter_the_Client_Secret_Here` - replace this value with the client secret you created earlier. To generate a new key, use **Certificates & secrets** in the app registration settings in the Azure portal.
63+
64+
Using a plaintext secret in the source code poses an increased security risk for your application. Although the sample in this quickstart uses a plaintext client secret, it's only for simplicity. We recommend using [certificate credentials](../../active-directory-certificate-credentials.md) instead of client secrets in your confidential client applications, especially those apps you intend to deploy to production.
6365

64-
> [!WARNING]
65-
> Any plaintext secret in source code poses an increased security risk. This article uses a plaintext client secret for simplicity only. Use [certificate credentials](../../active-directory-certificate-credentials.md) instead of client secrets in your confidential client applications, especially those apps you intend to deploy to production.
66+
3. Edit *.env* and replace the Azure AD and Microsoft Graph endpoints with the following values:
67+
- For the Azure AD endpoint, replace `Enter_the_Cloud_Instance_Id_Here` with `https://login.microsoftonline.com`.
68+
- For the Microsoft Graph endpoint, replace `Enter_the_Graph_Endpoint_Here` with `https://graph.microsoft.com/`.
6669

6770
#### Step 4: Admin consent
6871

6972
If you try to run the application at this point, you'll receive *HTTP 403 - Forbidden* error: `Insufficient privileges to complete the operation`. This error happens because any *app-only permission* requires **admin consent**: a global administrator of your directory must give consent to your application. Select one of the options below depending on your role:
7073

7174
##### Global tenant administrator
7275

73-
If you are a global tenant administrator, go to **API Permissions** page in the Azure portal's Application Registration and select **Grant admin consent for {Tenant Name}** (where {Tenant Name} is the name of your directory).
76+
If you're a global tenant administrator, go to **API Permissions** page in the Azure portal's Application Registration and select **Grant admin consent for {Tenant Name}** (where {Tenant Name} is the name of your directory).
7477

7578
##### Standard user
7679

@@ -86,7 +89,7 @@ https://login.microsoftonline.com/Enter_the_Tenant_Id_Here/adminconsent?client_i
8689

8790
#### Step 5: Run the application
8891

89-
Locate the sample's root folder (where `package.json` resides) in a command prompt or console. You'll need to install the dependencies of this sample once:
92+
Locate the sample's root folder (where `package.json` resides) in a command prompt or console. You'll need to install the dependencies your sample app requires before running it for the first time:
9093

9194
```console
9295
npm install

articles/active-directory/devices/concept-primary-refresh-token.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ The following diagrams illustrate the underlying details in issuing, renewing, a
159159
| :---: | --- |
160160
| A | User enters their password in the sign in UI. LogonUI passes the credentials in an auth buffer to LSA, which in turns passes it internally to CloudAP. CloudAP forwards this request to the CloudAP plugin. |
161161
| B | CloudAP plugin initiates a realm discovery request to identify the identity provider for the user. If user’s tenant has a federation provider setup, Azure AD returns the federation provider’s Metadata Exchange endpoint (MEX) endpoint. If not, Azure AD returns that the user is managed indicating that user can authenticate with Azure AD. |
162-
| C | If the user is managed, CloudAP will get the nonce from Azure AD. If the user is federated, CloudAP plugin requests a SAML token from the federation provider with the user’s credentials. Once it receives, the SAML token, it requests a nonce from Azure AD. |
162+
| C | If the user is managed, CloudAP will get the nonce from Azure AD. If the user is federated, CloudAP plugin requests a SAML token from the federation provider with the user’s credentials. Nonce is requested before the SAML token is sent to Azure AD. |
163163
| D | CloudAP plugin constructs the authentication request with the user’s credentials, nonce, and a broker scope, signs the request with the Device key (dkpriv) and sends it to Azure AD. In a federated environment, CloudAP plugin uses the SAML token returned by the federation provider instead of the user’ credentials. |
164164
| E | Azure AD validates the user credentials, the nonce, and device signature, verifies that the device is valid in the tenant and issues the encrypted PRT. Along with the PRT, Azure AD also issues a symmetric key, called the Session key encrypted by Azure AD using the Transport key (tkpub). In addition, the Session key is also embedded in the PRT. This Session key acts as the Proof-of-possession (PoP) key for subsequent requests with the PRT. |
165165
| F | CloudAP plugin passes the encrypted PRT and Session key to CloudAP. CloudAP request the TPM to decrypt the Session key using the Transport key (tkpriv) and re-encrypt it using the TPM’s own key. CloudAP stores the encrypted Session key in its cache along with the PRT. |
@@ -173,7 +173,7 @@ The following diagrams illustrate the underlying details in issuing, renewing, a
173173
| A | User enters their password in the sign in UI. LogonUI passes the credentials in an auth buffer to LSA, which in turns passes it internally to CloudAP. CloudAP forwards this request to the CloudAP plugin. |
174174
| B | If the user has previously logged on to the user, Windows initiates cached sign in and validates credentials to log the user in. Every 4 hours, the CloudAP plugin initiates PRT renewal asynchronously. |
175175
| C | CloudAP plugin initiates a realm discovery request to identify the identity provider for the user. If user’s tenant has a federation provider setup, Azure AD returns the federation provider’s Metadata Exchange endpoint (MEX) endpoint. If not, Azure AD returns that the user is managed indicating that user can authenticate with Azure AD. |
176-
| D | If the user is federated, CloudAP plugin requests a SAML token from the federation provider with the user’s credentials. Once it receives, the SAML token, it requests a nonce from Azure AD. If the user is managed, CloudAP will directly get the nonce from Azure AD. |
176+
| D | If the user is federated, CloudAP plugin requests a SAML token from the federation provider with the user’s credentials. Nonce is requested before the SAML token is sent to Azure AD. If the user is managed, CloudAP will directly get the nonce from Azure AD. |
177177
| E | CloudAP plugin constructs the authentication request with the user’s credentials, nonce, and the existing PRT, signs the request with the Session key and sends it to Azure AD. In a federated environment, CloudAP plugin uses the SAML token returned by the federation provider instead of the user’ credentials. |
178178
| F | Azure AD validates the Session key signature by comparing it against the Session key embedded in the PRT, validates the nonce and verifies that the device is valid in the tenant and issues a new PRT. As seen before, the PRT is again accompanied with the Session key encrypted by Transport key (tkpub). |
179179
| G | CloudAP plugin passes the encrypted PRT and Session key to CloudAP. CloudAP requests the TPM to decrypt the Session key using the Transport key (tkpriv) and re-encrypt it using the TPM’s own key. CloudAP stores the encrypted Session key in its cache along with the PRT. |

articles/active-directory/fundamentals/add-users-azure-active-directory.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ If you have an environment with both Azure Active Directory (cloud) and Windows
7676
You can delete an existing user using Azure Active Directory portal.
7777

7878
>[!Note]
79-
>You must have a Global administrator or User administrator role assignment to delete users in your organization. Global admins can delete any users including other admins. User administrators can delete any non-admin users, Helpdesk administrators and other User administrators. For more information, see [Administrator role permissions in Azure AD](../roles/permissions-reference.md).
79+
>You must have a Global administrator, Privileged authentication administrator or User administrator role assignment to delete users in your organization. Global admins and Privileged authentication admins can delete any users including other admins. User administrators can delete any non-admin users, Helpdesk administrators and other User administrators. For more information, see [Administrator role permissions in Azure AD](../roles/permissions-reference.md).
8080
8181
To delete a user, follow these steps:
8282

@@ -109,4 +109,4 @@ After you've added your users, you can do the following basic processes:
109109

110110
- [Work with dynamic groups and users](../enterprise-users/groups-create-rule.md)
111111

112-
Or you can do other user management tasks, such as [adding guest users from another directory](../external-identities/what-is-b2b.md) or [restoring a deleted user](active-directory-users-restore.md). For more information about other available actions, see [Azure Active Directory user management documentation](../enterprise-users/index.yml).
112+
Or you can do other user management tasks, such as [adding guest users from another directory](../external-identities/what-is-b2b.md) or [restoring a deleted user](active-directory-users-restore.md). For more information about other available actions, see [Azure Active Directory user management documentation](../enterprise-users/index.yml).

0 commit comments

Comments
 (0)