Skip to content

Commit 93c7420

Browse files
authored
Merge pull request #181574 from MicrosoftDocs/master
12/01 PM Publish
2 parents 9567c42 + d638ade commit 93c7420

File tree

212 files changed

+2190
-1119
lines changed

Some content is hidden

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

212 files changed

+2190
-1119
lines changed

articles/active-directory/develop/msal-net-acquire-token-silently.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,39 @@ The recommended pattern is to call the `AcquireTokenSilent` method first. If `A
2626
In the following example, the application first attempts to acquire a token from the token cache. If a `MsalUiRequiredException` exception is thrown, the application acquires a token interactively.
2727

2828
```csharp
29-
AuthenticationResult result = null;
3029
var accounts = await app.GetAccountsAsync();
3130

31+
AuthenticationResult result = null;
3232
try
3333
{
34-
result = await app.AcquireTokenSilent(scopes, accounts.FirstOrDefault())
35-
.ExecuteAsync();
34+
result = await app.AcquireTokenSilent(scopes, accounts.FirstOrDefault())
35+
.ExecuteAsync();
3636
}
3737
catch (MsalUiRequiredException ex)
3838
{
39-
// A MsalUiRequiredException happened on AcquireTokenSilent.
40-
// This indicates you need to call AcquireTokenInteractive to acquire a token
41-
System.Diagnostics.Debug.WriteLine($"MsalUiRequiredException: {ex.Message}");
39+
// A MsalUiRequiredException happened on AcquireTokenSilent.
40+
// This indicates you need to call AcquireTokenInteractive to acquire a token
41+
Debug.WriteLine($"MsalUiRequiredException: {ex.Message}");
4242

43-
try
44-
{
45-
result = await app.AcquireTokenInteractive(scopes)
46-
.ExecuteAsync();
47-
}
48-
catch (MsalException msalex)
49-
{
50-
ResultText.Text = $"Error Acquiring Token:{System.Environment.NewLine}{msalex}";
51-
}
43+
try
44+
{
45+
result = await app.AcquireTokenInteractive(scopes)
46+
.ExecuteAsync();
47+
}
48+
catch (MsalException msalex)
49+
{
50+
ResultText.Text = $"Error Acquiring Token:{System.Environment.NewLine}{msalex}";
51+
}
5252
}
5353
catch (Exception ex)
5454
{
55-
ResultText.Text = $"Error Acquiring Token Silently:{System.Environment.NewLine}{ex}";
56-
return;
55+
ResultText.Text = $"Error Acquiring Token Silently:{System.Environment.NewLine}{ex}";
56+
return;
5757
}
5858

5959
if (result != null)
6060
{
61-
string accessToken = result.AccessToken;
62-
// Use the token
61+
string accessToken = result.AccessToken;
62+
// Use the token
6363
}
6464
```

articles/active-directory/identity-protection/howto-export-risk-data.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ Azure AD stores reports and security signals for a defined period of time. When
2828

2929
Organizations can choose to store data for longer periods by changing diagnostic settings in Azure AD to send **RiskyUsers** and **UserRiskEvents** data to a Log Analytics workspace, archive data to a storage account, stream data to an Event Hub, or send data to a partner solution. Find these options in the **Azure portal** > **Azure Active Directory**, **Diagnostic settings** > **Edit setting**. If you don't have a diagnostic setting, follow the instructions in the article [Create diagnostic settings to send platform logs and metrics to different destinations](../../azure-monitor/essentials/diagnostic-settings.md) to create one.
3030

31-
>[!NOTE]
32-
>The diagnostic settings for RiskyUsers and UserRiskEvents are currently in public preview.
33-
3431
[ ![Diagnostic settings screen in Azure AD showing existing configuration](./media/howto-export-risk-data/change-diagnostic-setting-in-portal.png) ](./media/howto-export-risk-data/change-diagnostic-setting-in-portal.png#lightbox)
3532

3633
## Log Analytics

articles/active-directory/manage-apps/f5-big-ip-ldap-header-easybutton.md

Lines changed: 41 additions & 41 deletions
Large diffs are not rendered by default.

articles/active-directory/roles/delegate-by-task.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.workload: identity
1010
ms.subservice: roles
1111
ms.topic: reference
12-
ms.date: 11/16/2021
12+
ms.date: 12/01/2021
1313
ms.author: rolyon
1414
ms.reviewer: vincesm
1515
ms.custom: it-pro
@@ -232,8 +232,8 @@ You can further restrict permissions by assigning roles at smaller scopes or by
232232
> | Task | Least privileged role | Additional roles |
233233
> | ---- | --------------------- | ---------------- |
234234
> | Delete all existing app passwords generated by the selected users | Global Administrator | |
235-
> | Disable MFA | Authentication Administrator (via PowerShell) | Privileged Authentication Administrator (via PowerShell) |
236-
> | Enable MFA | Authentication Administrator (via PowerShell) | Privileged Authentication Administrator (via PowerShell) |
235+
> | Disable per-user MFA ([see documentation](../authentication/howto-mfa-userstates.md)) | Authentication Administrator (via PowerShell) | Privileged Authentication Administrator (via PowerShell) |
236+
> | Enable per-user MFA ([see documentation](../authentication/howto-mfa-userstates.md)) | Authentication Administrator (via PowerShell) | Privileged Authentication Administrator (via PowerShell) |
237237
> | Manage MFA service settings | Authentication Policy Administrator | |
238238
> | Require selected users to provide contact methods again | Authentication Administrator | |
239239
> | Restore multi-factor authentication on all remembered devices  | Authentication Administrator | |
16.3 KB
Loading
2.62 KB
Loading
11.5 KB
Loading
8.22 KB
Loading

articles/active-directory/saas-apps/saucelabs-mobileandwebtesting-tutorial.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
6868

6969
![Edit Basic SAML Configuration](common/edit-urls.png)
7070

71-
4. On the **Basic SAML Configuration** section, the user does not have to perform any step as the app is already pre-integrated with Azure.
71+
1. On the **Basic SAML Configuration** section, the user does not have to perform any step as the app is already pre-integrated with Azure.
7272

73-
5. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Federation Metadata XML** from the given options as per your requirement and save it on your computer.
73+
1. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Federation Metadata XML** from the given options as per your requirement and save it on your computer.
7474

7575
![The Certificate download link](common/metadataxml.png)
7676

77-
6. On the **Set up Sauce Labs - Mobile and Web Testing** section, copy the appropriate URL(s) as per your requirement.
77+
1. On the **Set up Sauce Labs - Mobile and Web Testing** section, copy the appropriate URL(s) as per your requirement.
7878

7979
![Copy configuration URLs](common/copy-configuration-urls.png)
8080

@@ -106,31 +106,31 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
106106

107107
1. In a different web browser window, sign in to your Sauce Labs - Mobile and Web Testing company site as an administrator.
108108

109-
2. Click on the **User icon** and select **Team Management** tab.
109+
1. Click the **Account** dropdown and select the **Team Management** tab.
110110

111-
![Screenshot that shows the "User" icon and "Team Management" drop-down selected.](./media/saucelabs-mobileandwebtesting-tutorial/user.png)
111+
:::image type="content" source="./media/saucelabs-mobileandwebtesting-tutorial/user.png" alt-text="Screenshot that shows the Account dropdown and Team Management dropdown item selected.":::
112112

113-
3. Enter your **Domain name** in the textbox.
113+
1. Click **View Settings** under **Organization Settings**.
114114

115-
![Screenshot that shows an example domain name in the textbox.](./media/saucelabs-mobileandwebtesting-tutorial/domain.png)
115+
:::image type="content" source="./media/saucelabs-mobileandwebtesting-tutorial/org-settings.png" alt-text="Screenshot that shows the View Settings button in the Organization Settings box." border="true":::
116116

117-
4. Click **Configure** tab.
117+
1. Click the **Single Sign-On** tab.
118118

119-
![Screenshot that shows the "Configure" tab selected under "Single Sign On is Enabled".](./media/saucelabs-mobileandwebtesting-tutorial/configure.png)
119+
:::image type="content" source="./media/saucelabs-mobileandwebtesting-tutorial/configure.png" alt-text="Screenshot that shows the Single Sign-On tab selected under Organization Settings.":::
120120

121-
5. In the **Configure Single Sign On** section, perform the following steps.
121+
1. In the **Single Sign-On** section, perform the following steps.
122122

123-
![Configure Single Sign-On](./media/saucelabs-mobileandwebtesting-tutorial/browse.png)
123+
:::image type="content" source="./media/saucelabs-mobileandwebtesting-tutorial/browse.png" alt-text="Screenshot that shows selecting options on the Single Sign-On tab.":::
124124

125-
a. Click **Browse** and upload the downloaded metadata file from the Azure AD.
125+
1. Define your Unique Identifier String (UIS) and click **Save**.
126126

127-
b. Select the **ALLOW JUST-IN-TIME PROVISIONING** checkbox.
127+
1. Click **Upload New Metadata File** and upload the downloaded metadata file from Azure AD.
128128

129-
c. Click **Save**.
129+
1. Under **Enable Single Sign-On**, select **Enabled**.
130130

131131
### Create Sauce Labs - Mobile and Web Testing test user
132132

133-
In this section, a user called Britta Simon is created in Sauce Labs - Mobile and Web Testing. Sauce Labs - Mobile and Web Testing supports just-in-time user provisioning, which is enabled by default. There is no action item for you in this section. If a user doesn't already exist in Sauce Labs - Mobile and Web Testing, a new one is created after authentication.
133+
In this section, a user called B.Simon is created in Sauce Labs - Mobile and Web Testing. Sauce Labs - Mobile and Web Testing supports just-in-time user provisioning, which is always enabled. There is no action item for you in this section. If a user doesn't already exist in Sauce Labs - Mobile and Web Testing, a new one is created after authentication.
134134

135135
> [!Note]
136136
> If you need to create a user manually, contact [Sauce Labs - Mobile and Web Testing support team](mailto:[email protected]).
@@ -141,7 +141,7 @@ In this section, you test your Azure AD single sign-on configuration with follow
141141

142142
* Click on Test this application in Azure portal and you should be automatically signed in to the Sauce Labs - Mobile and Web Testing for which you set up the SSO.
143143

144-
* You can use Microsoft My Apps. When you click the Sauce Labs - Mobile and Web Testing tile in the My Apps, you should be automatically signed in to the Sauce Labs - Mobile and Web Testing for which you set up the SSO. For more information about the My Apps, see [Introduction to the My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
144+
* You can use Microsoft My Apps. When you click the Sauce Labs - Mobile and Web Testing tile in the My Apps, you should be automatically signed in to the Sauce Labs - Mobile and Web Testing for which you set up the SSO. For more information about My Apps, see [Introduction to My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
145145

146146
## Next steps
147147

0 commit comments

Comments
 (0)