Skip to content

Commit b8b45a9

Browse files
author
your name
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into yelevin/sap-incident-response-playbooks
2 parents 5629f88 + 6501f0a commit b8b45a9

File tree

196 files changed

+3390
-1808
lines changed

Some content is hidden

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

196 files changed

+3390
-1808
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6036,6 +6036,11 @@
60366036
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/monitoring-classic-retirement",
60376037
"redirect_document_id": false
60386038
},
6039+
{
6040+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-using-migration-tool.md",
6041+
"redirect_url": "previous-versions/azure/azure-monitor/alerts/alerts-using-migration-tool",
6042+
"redirect_document_id": false
6043+
},
60396044
{
60406045
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer.md",
60416046
"redirect_url": "/previous-versions/azure/azure-monitor/visualize/view-designer",

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22198,6 +22198,11 @@
2219822198
"redirect_url": "/azure/event-grid/event-schema-communication-services",
2219922199
"redirect_document_id": false
2220022200
},
22201+
{
22202+
"source_path_from_root": "/articles/communication-services/how-tos/calling-sdk/lobby-admit-and-reject.md",
22203+
"redirect_url": "/azure/communication-services/how-tos/calling-sdk/lobby",
22204+
"redirect_document_id": false
22205+
},
2220122206
{
2220222207
"source_path_from_root": "/articles/load-balancer/tutorial-load-balancer-standard-manage-portal.md",
2220322208
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",

articles/active-directory-b2c/whats-new-docs.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ Welcome to what's new in Azure Active Directory B2C documentation. This article
2525
### Updated articles
2626

2727
- [Tutorial: Create an Azure Active Directory B2C tenant](tutorial-create-tenant.md) - [Azure AD B2C] Azure AD B2C Go-Local opt-in feature
28-
- [Tutorial: Configure security analytics for Azure Active Directory B2C data with Microsoft Sentinel](configure-security-analytics-sentinel.md) - Removing product name from filename and links. Exempt from Acrolinx by prior arrangement
29-
- [Tutorial: Configure Azure Active Directory B2C with Azure Web Application Firewall](partner-web-application-firewall.md) - Removing product name from filename and links. Exempt from Acrolinx by prior arrangement
28+
- [Tutorial: Configure security analytics for Azure Active Directory B2C data with Microsoft Sentinel](configure-security-analytics-sentinel.md) - Removing product name from filename and links.
29+
- [Tutorial: Configure Azure Active Directory B2C with Azure Web Application Firewall](partner-web-application-firewall.md) - Removing product name from filename and links.
3030
- [Title not found in: #240919](azure-ad-external-identities-videos.md) - Delete azure-ad-external-identities-videos.md
31-
- [Build a global identity solution with funnel-based approach](b2c-global-identity-funnel-based-design.md) - Removing product name from filename and links. Exempt from Acrolinx by prior arrangement
32-
- [Azure Active Directory B2C global identity framework proof of concept for funnel-based configuration](b2c-global-identity-proof-of-concept-funnel.md) - Removing product name from filename and links. Exempt from Acrolinx by prior arrangement
33-
- [Azure Active Directory B2C global identity framework proof of concept for region-based configuration](b2c-global-identity-proof-of-concept-regional.md) - Removing product name from filename and links. Exempt from Acrolinx by prior arrangement
34-
- [Build a global identity solution with region-based approach](b2c-global-identity-region-based-design.md) - Removing product name from filename and links. Exempt from Acrolinx by prior arrangement
35-
- [Azure Active Directory B2C global identity framework](b2c-global-identity-solutions.md) - Removing product name from filename and links. Exempt from Acrolinx by prior arrangement
31+
- [Build a global identity solution with funnel-based approach](b2c-global-identity-funnel-based-design.md) - Removing product name from filename and links.
32+
- [Azure Active Directory B2C global identity framework proof of concept for funnel-based configuration](b2c-global-identity-proof-of-concept-funnel.md) - Removing product name from filename and links.
33+
- [Azure Active Directory B2C global identity framework proof of concept for region-based configuration](b2c-global-identity-proof-of-concept-regional.md) - Removing product name from filename and links.
34+
- [Build a global identity solution with region-based approach](b2c-global-identity-region-based-design.md) - Removing product name from filename and links.
35+
- [Azure Active Directory B2C global identity framework](b2c-global-identity-solutions.md) - Removing product name from filename and links.
3636
- [Azure Active Directory B2C: What's new](whats-new-docs.md) - [Azure AD B2C] What is new May 2023
3737
- [Use the Azure portal to create and delete consumer users in Azure AD B2C](manage-users-portal.md) - [Azure AD B2C] Revoke user's session
3838
- [Monitor Azure AD B2C with Azure Monitor](azure-monitor.md) - Added steps to disable Azure monitor

articles/active-directory/develop/howto-configure-app-instance-property-locks.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,8 @@ To configure an app instance lock using the Azure portal:
5252
| **Token Encryption KeyId** | Locks the ability to change the `tokenEncryptionKeyId` property. |
5353

5454
3. Select **Save** to save your changes.
55+
56+
57+
## Configure app instance lock using Microsoft Graph
58+
59+
You manage the app instance lock feature through the **servicePrincipalLockConfiguration** property of the [application](/graph/api/resources/application) object of the multi-tenant app. For more information, see [Lock sensitive properties for service principals](/graph/tutorial-applications-basics#lock-sensitive-properties-for-service-principals).

articles/active-directory/external-identities/leave-the-organization.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services: active-directory
88
ms.service: active-directory
99
ms.subservice: B2B
1010
ms.topic: how-to
11-
ms.date: 01/17/2023
11+
ms.date: 07/04/2023
1212

1313
ms.author: cmulligan
1414
author: csmulligan
@@ -91,7 +91,7 @@ Administrators can use the **External user leave settings** to control whether e
9191
- **Yes**: Users can leave the organization themselves without approval from your admin or privacy contact.
9292
- **No**: Users can't leave your organization themselves. They'll see a message guiding them to contact your admin, or privacy contact to request removal from your organization.
9393

94-
:::image type="content" source="media/leave-the-organization/external-user-leave-settings.png" alt-text="Screenshot showing External user leave settings in the portal.":::
94+
:::image type="content" source="media/leave-the-organization/external-user-leave-settings.png" alt-text="Screenshot showing External user leave settings in the portal." lightbox="media/leave-the-organization/external-user-leave-settings.png":::
9595

9696
### Account removal
9797

@@ -116,3 +116,4 @@ For B2B direct connect users, data removal begins as soon as the user selects **
116116

117117
- Learn more about [user deletion](/compliance/regulatory/gdpr-dsr-azure#step-5-delete) and about how to delete a user's data when there's [no account in the Azure tenant](/compliance/regulatory/gdpr-dsr-azure#delete-a-users-data-when-there-is-no-account-in-the-azure-tenant).
118118
- For more information about GDPR, see the GDPR section of the [Service Trust portal](https://servicetrust.microsoft.com/ViewPage/GDPRGetStarted).
119+
- Learn more about [audit logs and access reviews](auditing-and-reporting.md).
-54.8 KB
Loading

articles/active-directory/external-identities/tutorial-bulk-invite.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services: active-directory
77
ms.service: active-directory
88
ms.subservice: B2B
99
ms.topic: tutorial
10-
ms.date: 02/28/2023
10+
ms.date: 07/04/2023
1111

1212
ms.author: cmulligan
1313
author: csmulligan
@@ -29,13 +29,9 @@ If you use Azure Active Directory (Azure AD) B2B collaboration to work with exte
2929
> * Upload the .csv file to Azure AD
3030
> * Verify the users were added to the directory
3131
32-
If you don’t have Azure Active Directory, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
33-
34-
3532
## Prerequisites
36-
37-
You need two or more test email accounts that you can send the invitations to. The accounts must be from outside your organization. You can use any type of account, including social accounts such as gmail.com or outlook.com addresses.
38-
33+
- If you don’t have Azure Active Directory, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
34+
- You need two or more test email accounts that you can send the invitations to. The accounts must be from outside your organization. You can use any type of account, including social accounts such as gmail.com or outlook.com addresses.
3935

4036
## Invite guest users in bulk
4137

articles/active-directory/manage-apps/debug-saml-sso-issues.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ ms.service: active-directory
99
ms.subservice: app-mgmt
1010
ms.topic: troubleshooting
1111
ms.workload: identity
12-
ms.date: 05/27/2022
12+
ms.date: 06/15/2023
1313
ms.custom: enterprise-apps
1414
---
1515

1616
# Debug SAML-based single sign-on to applications
1717

18-
Learn how to find and fix [single sign-on](what-is-single-sign-on.md) issues for applications in Azure Active Directory (Azure AD) that use SAML-based single sign-on.
18+
In this article, you learn how to find and fix [single sign-on](what-is-single-sign-on.md) issues for applications in Azure Active Directory (Azure AD) that use SAML-based single sign-on.
1919

2020
## Before you begin
2121

@@ -33,10 +33,10 @@ To download and install the My Apps Secure Sign-in Extension, use one of the fol
3333
To test SAML-based single sign-on between Azure AD and a target application:
3434

3535
1. Sign in to the [Azure portal](https://portal.azure.com) as a global administrator or other administrator that is authorized to manage applications.
36-
1. In the left blade, select **Azure Active Directory**, and then select **Enterprise applications**.
37-
1. From the list of enterprise applications, select the application for which you want to test single sign-on, and then from the options on the left select **Single sign-on**.
36+
1. In the left navigation pane, select **Azure Active Directory**, and then select **Enterprise applications**.
37+
1. From the list of enterprise applications, select the application for which you want to test single sign-on, and then from the options on the left, select **Single sign-on**.
3838
1. To open the SAML-based single sign-on testing experience, go to **Test single sign-on** (step 5). If the **Test** button is greyed out, you need to fill out and save the required attributes first in the **Basic SAML Configuration** section.
39-
1. In the **Test single sign-on** blade, use your corporate credentials to sign in to the target application. You can sign in as the current user or as a different user. If you sign in as a different user, a prompt will ask you to authenticate.
39+
1. In the **Test single sign-on** page, use your corporate credentials to sign in to the target application. You can sign in as the current user or as a different user. If you sign in as a different user, a prompt asks you to authenticate.
4040

4141
![Screenshot showing the test SAML SSO page](./media/debug-saml-sso-issues/test-single-sign-on.png)
4242

@@ -54,10 +54,10 @@ To debug this error, you need the error message and the SAML request. The My App
5454

5555
### To resolve the sign-in error with the My Apps Secure Sign-in Extension installed
5656

57-
1. When an error occurs, the extension redirects you back to the Azure AD **Test single sign-on** blade.
58-
1. On the **Test single sign-on** blade, select **Download the SAML request**.
57+
1. When an error occurs, the extension redirects you back to the Azure AD **Test single sign-on** page.
58+
1. On the **Test single sign-on** page, select **Download the SAML request**.
5959
1. You should see specific resolution guidance based on the error and the values in the SAML request.
60-
1. You'll see a **Fix it** button to automatically update the configuration in Azure AD to resolve the issue. If you don't see this button, then the sign-in issue isn't due to a misconfiguration on Azure AD.
60+
1. You see a **Fix it** button to automatically update the configuration in Azure AD to resolve the issue. If you don't see this button, then the sign-in issue isn't due to a misconfiguration on Azure AD.
6161

6262
If no resolution is provided for the sign-in error, we suggest that you use the feedback textbox to inform us.
6363

@@ -66,7 +66,7 @@ If no resolution is provided for the sign-in error, we suggest that you use the
6666
1. Copy the error message at the bottom right corner of the page. The error message includes:
6767
- A CorrelationID and Timestamp. These values are important when you create a support case with Microsoft because they help the engineers to identify your problem and provide an accurate resolution to your issue.
6868
- A statement identifying the root cause of the problem.
69-
1. Go back to Azure AD and find the **Test single sign-on** blade.
69+
1. Go back to Azure AD and find the **Test single sign-on** page.
7070
1. In the text box above **Get resolution guidance**, paste the error message.
7171
1. Select **Get resolution guidance** to display steps for resolving the issue. The guidance might require information from the SAML request or SAML response. If you're not using the My Apps Secure Sign-in Extension, you might need a tool such as [Fiddler](https://www.telerik.com/fiddler) to retrieve the SAML request and response.
7272
1. Verify that the destination in the SAML request corresponds to the SAML Single Sign-on Service URL obtained from Azure AD.
@@ -75,13 +75,13 @@ If no resolution is provided for the sign-in error, we suggest that you use the
7575

7676
## Resolve a sign-in error on the application page
7777

78-
You might sign in successfully and then see an error on the application's page. This occurs when Azure AD issued a token to the application, but the application doesn't accept the response.
78+
You might sign in successfully and then see an error on the application's page. This error occurs when Azure AD issued a token to the application, but the application doesn't accept the response.
7979

8080
To resolve the error, follow these steps, or watch this [short video about how to use Azure AD to troubleshoot SAML SSO](https://www.youtube.com/watch?v=poQCJK0WPUk&list=PLLasX02E8BPBm1xNMRdvP6GtA6otQUqp0&index=8):
8181

8282
1. If the application is in the Azure AD Gallery, verify that you've followed all the steps for integrating the application with Azure AD. To find the integration instructions for your application, see the [list of SaaS application integration tutorials](../saas-apps/tutorial-list.md).
8383
1. Retrieve the SAML response.
84-
- If the My Apps Secure Sign-in extension is installed, from the **Test single sign-on** blade, select **download the SAML response**.
84+
- If the My Apps Secure Sign-in extension is installed, from the **Test single sign-on** page, select **download the SAML response**.
8585
- If the extension isn't installed, use a tool such as [Fiddler](https://www.telerik.com/fiddler) to retrieve the SAML response.
8686
1. Notice these elements in the SAML response token:
8787
- User unique identifier of NameID value and format
@@ -95,4 +95,4 @@ To resolve the error, follow these steps, or watch this [short video about how t
9595

9696
## Next steps
9797

98-
Now that single sign-on is working to your application, you could [Automate user provisioning and de-provisioning to SaaS applications](../app-provisioning/user-provisioning.md) or [get started with Conditional Access](../conditional-access/app-based-conditional-access.md).
98+
Now that single sign-on is working to your application, you could [Automate user provisioning and deprovisioning to SaaS applications](../app-provisioning/user-provisioning.md) or [get started with Conditional Access](../conditional-access/app-based-conditional-access.md).

articles/active-directory/manage-apps/howto-saml-token-encryption.md

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-mgmt
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 07/21/2022
11+
ms.date: 06/15/2023
1212
ms.author: jomondi
1313
ms.reviewer: alamaral
1414
ms.collection: M365-identity-device-management
@@ -42,8 +42,8 @@ To configure enterprise application's SAML token encryption, follow these steps:
4242

4343
Create an asymmetric key pair to use for encryption. Or, if the application supplies a public key to use for encryption, follow the application's instructions to download the X.509 certificate.
4444

45-
The public key should be stored in an X.509 certificate file in .cer format.
46-
45+
The public key should be stored in an X.509 certificate file in .cer format. You can copy the contents of the certificate file to a text editor and save it as a .cer file. The certificate file should contain only the public key and not the private key.
46+
4747
If the application uses a key that you create for your instance, follow the instructions provided by your application for installing the private key that the application will use to decrypt tokens from your Azure AD tenant.
4848

4949
1. Add the certificate to the application configuration in Azure AD.
@@ -54,7 +54,9 @@ You can add the public cert to your application configuration within the Azure p
5454

5555
1. Go to the [Azure portal](https://portal.azure.com).
5656

57-
1. Go to the **Azure Active Directory > Enterprise applications** blade and then select the application that you wish to configure token encryption for.
57+
1. Search for and select the **Azure Active Directory**.
58+
59+
1. Select **Enterprise applications** blade and then select the application that you wish to configure token encryption for.
5860

5961
1. On the application's page, select **Token encryption**.
6062

@@ -101,8 +103,6 @@ To configure token encryption, follow these steps:
101103

102104
1. In the application's page, select **Manifest** to edit the [application manifest](../develop/reference-app-manifest.md).
103105

104-
1. Set the value for the `tokenEncryptionKeyId` attribute.
105-
106106
The following example shows an application manifest configured with two encryption certificates, and with the second selected as the active one using the tokenEncryptionKeyId.
107107

108108
```json
@@ -172,7 +172,7 @@ To configure token encryption, follow these steps:
172172
}
173173
```
174174

175-
# [PowerShell](#tab/azure-powershell)
175+
# [Azure AD PowerShell](#tab/azuread-powershell)
176176

177177
1. Use the latest Azure AD PowerShell module to connect to your tenant.
178178

@@ -190,7 +190,29 @@ To configure token encryption, follow these steps:
190190
$app.TokenEncryptionKeyId
191191
```
192192

193+
# [Microsoft Graph PowerShell](#tab/msgraph-powershell)
193194

195+
1. Use the Microsoft Graph PowerShell module to connect to your tenant.
196+
197+
1. Set the token encryption settings using the **[Update-MgApplication](/powershell/module/microsoft.graph.applications/update-mgapplication?view=graph-powershell-1.0&preserve-view=true)** command.
198+
199+
```powershell
200+
201+
Update-MgApplication -ApplicationId <ApplicationObjectId> -KeyCredentials "<KeyCredentialsObject>" -TokenEncryptionKeyId <keyID>
202+
203+
```
204+
205+
1. Read the token encryption settings using the following commands.
206+
207+
```powershell
208+
209+
$app=Get-MgApplication -ApplicationId <ApplicationObjectId>
210+
211+
$app.KeyCredentials
212+
213+
$app.TokenEncryptionKeyId
214+
215+
```
194216
# [Microsoft Graph](#tab/microsoft-graph)
195217

196218
1. Update the application's `keyCredentials` with an X.509 certificate for encryption. The following example shows a Microsoft Graph JSON payload with a collection of key credentials associated with the application.
@@ -221,7 +243,6 @@ To configure token encryption, follow these steps:
221243

222244
---
223245

224-
225246
## Next steps
226247

227248
* Find out [How Azure AD uses the SAML protocol](../develop/active-directory-saml-protocol-reference.md)

0 commit comments

Comments
 (0)