Skip to content

Commit 83c0080

Browse files
authored
Merge pull request #197229 from MicrosoftDocs/main
5/05 AM Publish
2 parents 0bb9c87 + b21b9fd commit 83c0080

24 files changed

+211
-118
lines changed

articles/active-directory-b2c/configure-authentication-sample-angular-spa-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export const b2cPolicies = {
145145
export const msalConfig: Configuration = {
146146
auth: {
147147
clientId: '<your-MyApp-application-ID>',
148-
authority: b2cPolicies.authorities.signUpSignIn,
148+
authority: b2cPolicies.authorities.signUpSignIn.authority,
149149
knownAuthorities: [b2cPolicies.authorityDomain],
150150
redirectUri: '/',
151151
},

articles/active-directory/develop/tutorial-v2-react.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: develop
1010
ms.topic: tutorial
1111
ms.workload: identity
12-
ms.date: 04/16/2021
12+
ms.date: 05/05/2022
1313
ms.author: jamesmantu
1414
ms.custom: aaddev, devx-track-js
1515
---
@@ -37,9 +37,9 @@ MSAL React supports the authorization code flow in the browser instead of the im
3737

3838
:::image type="content" source="media/tutorial-v2-javascript-auth-code/diagram-01-auth-code-flow.png" alt-text="Diagram showing the authorization code flow in a single-page application":::
3939

40-
The application you create in this tutorial enables a React SPA to query the Microsoft Graph API by acquiring security tokens from the the Microsoft identity platform. It uses the Microsoft Authentication Library (MSAL) for React, a wrapper of the MSAL.js v2 library. MSAL React enables React 16+ applications to authenticate enterprise users by using Azure Active Directory (Azure AD), and also users with Microsoft accounts and social identities like Facebook, Google, and LinkedIn. The library also enables applications to get access to Microsoft cloud services and Microsoft Graph.
40+
The application you create in this tutorial enables a React SPA to query the Microsoft Graph API by acquiring security tokens from the Microsoft identity platform. It uses the MSAL for React, a wrapper of the MSAL.js v2 library. MSAL React enables React 16+ applications to authenticate enterprise users by using Azure Active Directory (Azure AD), and also users with Microsoft accounts and social identities like Facebook, Google, and LinkedIn. The library also enables applications to get access to Microsoft cloud services and Microsoft Graph.
4141

42-
In this scenario, after a user signs in, an access token is requested and added to HTTP requests in the authorization header. Token acquisition and renewal are handled by the Microsoft Authentication Library for React (MSAL React).
42+
In this scenario, after a user signs in, an access token is requested and added to HTTP requests in the authorization header. Token acquisition and renewal are handled by the MSAL for React (MSAL React).
4343

4444
### Libraries
4545

@@ -58,7 +58,7 @@ Prefer to download this tutorial's completed sample project instead? To run the
5858

5959
Then, to configure the code sample before you execute it, skip to the [configuration step](#register-your-application).
6060

61-
To continue with the tutorial and build the application yourself, move on to the next section, [Prerequisites](#prerequisites).
61+
To continue with the tutorial and build the application yourself, move on to the next section, [Create your project](#create-your-project).
6262

6363
## Create your project
6464

@@ -71,13 +71,13 @@ npm install @azure/msal-browser @azure/msal-react # Install the MSAL packages
7171
npm install react-bootstrap bootstrap # Install Bootstrap for styling
7272
```
7373

74-
You have now bootstrapped a small React project using [Create React App](https://create-react-app.dev/docs/getting-started). This will be the starting point the rest of this tutorial will build on. If you would like to see the changes to your app as you are working through this tutorial you can run the following command:
74+
You've now bootstrapped a small React project using [Create React App](https://create-react-app.dev/docs/getting-started). This will be the starting point the rest of this tutorial will build on. If you'd like to see the changes to your app as you're working through this tutorial you can run the following command:
7575

7676
```console
7777
npm start
7878
```
7979

80-
A browser window should be opened to your app automatically. If it does not, open your browser and navigate to http://localhost:3000. Each time you save a file with updated code the page will reload to reflect the changes.
80+
A browser window should be opened to your app automatically. If it doesn't, open your browser and navigate to http://localhost:3000. Each time you save a file with updated code the page will reload to reflect the changes.
8181

8282
## Register your application
8383

@@ -262,7 +262,7 @@ export const SignInButton = () => {
262262
export default App;
263263
```
264264

265-
Your app now has a sign-in button which is only displayed for unauthenticated users!
265+
Your app now has a sign-in button, which is only displayed for unauthenticated users!
266266

267267
When a user selects the **Sign in using Popup** or **Sign in using Redirect** button for the first time, the `onClick` handler calls `loginPopup` (or `loginRedirect`) to sign in the user. The `loginPopup` method opens a pop-up window with the *Microsoft identity platform endpoint* to prompt and validate the user's credentials. After a successful sign-in, *msal.js* initiates the [authorization code flow](v2-oauth2-auth-code-flow.md).
268268
@@ -439,7 +439,7 @@ In order to render certain components only for authenticated or unauthenticated
439439
};
440440
```
441441

442-
1. Update your imports in *src/App.js* to match the following:
442+
1. Update your imports in *src/App.js* to match the following snippet:
443443

444444
```js
445445
import React, { useState } from "react";
@@ -477,8 +477,7 @@ After a user signs in, your app shouldn't ask users to reauthenticate every time
477477

478478
Calling `acquireTokenPopup` opens a pop-up window (or `acquireTokenRedirect` redirects users to the Microsoft identity platform). In that window, users need to interact by confirming their credentials, giving consent to the required resource, or completing the two-factor authentication.
479479

480-
> [!NOTE]
481-
> If you're using Internet Explorer, we recommend that you use the `loginRedirect` and `acquireTokenRedirect` methods due to a [known issue](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/internet-explorer.md#popups) with Internet Explorer and pop-up windows.
480+
If you're using Internet Explorer, we recommend that you use the `loginRedirect` and `acquireTokenRedirect` methods due to a [known issue](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/internet-explorer.md#popups) with Internet Explorer and pop-up windows.
482481
483482
## Call the Microsoft Graph API
484483
@@ -527,7 +526,7 @@ Calling `acquireTokenPopup` opens a pop-up window (or `acquireTokenRedirect` red
527526
};
528527
```
529528
530-
1. Next, open *src/App.js* and add these to the imports:
529+
1. Next, open *src/App.js* and add the following imports:
531530
532531
```javascript
533532
import { ProfileData } from "./components/ProfileData";
@@ -583,7 +582,7 @@ You've completed creation of the application and are now ready to launch the web
583582
```console
584583
npm start
585584
```
586-
1. A browser window should be opened to your app automatically. If it does not, open your browser and navigate to `http://localhost:3000`. You should see a page that looks like the one below.
585+
1. A browser window should be opened to your app automatically. If it doesn't, open your browser and navigate to `http://localhost:3000`. You should see a page that looks like the one below.
587586
588587
:::image type="content" source="media/tutorial-v2-react/react-01-unauthenticated.png" alt-text="Web browser displaying sign-in dialog":::
589588

articles/active-directory/external-identities/external-collaboration-settings-configure.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: B2B
88
ms.topic: how-to
9-
ms.date: 04/26/2022
9+
ms.date: 05/05/2022
1010

1111
ms.author: mimart
1212
author: msmimart
1313
manager: celestedg
14-
ms.reviewer: mal
1514

1615
ms.collection: M365-identity-device-management
1716
---
@@ -41,7 +40,7 @@ For B2B collaboration with other Azure AD organizations, you should also review
4140

4241
- **Guest users have the same access as members (most inclusive)**: This option gives guests the same access to Azure AD resources and directory data as member users.
4342

44-
- **Guest users have limited access to properties and memberships of directory objects**: (Default) This setting blocks guests from certain directory tasks, like enumerating users, groups, or other directory resources. Guests can see membership of all non-hidden groups.
43+
- **Guest users have limited access to properties and memberships of directory objects**: (Default) This setting blocks guests from certain directory tasks, like enumerating users, groups, or other directory resources. Guests can see membership of all non-hidden groups. [Learn more about default guest permissions](../fundamentals/users-default-permissions.md#member-and-guest-users).
4544

4645
- **Guest user access is restricted to properties and memberships of their own directory objects (most restrictive)**: With this setting, guests can access only their own profiles. Guests are not allowed to see other users' profiles, groups, or group memberships.
4746

articles/aks/http-proxy.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,18 @@ For example, assuming a new file has been created with the base64 encoded string
143143
az aks update -n $clusterName -g $resourceGroup --http-proxy-config aks-proxy-config-2.json
144144
```
145145

146-
## Monitoring Addon Configurations
146+
## Monitoring add-on configuration
147147

148-
Below list the supported and not supported configuration for the monitoring addon.
149-
150-
Supported configuration(s)
148+
When using the HTTP proxy with the Monitoring add-on, the following configurations are supported:
151149

152150
- Outbound proxy without authentication
153151
- Outbound proxy with username & password authentication
154152
- Outbound proxy with trusted cert for Log Analytics endpoint
155153

156-
Not supported configuration(s)
154+
The following configurations are not supported:
157155

158-
- Custom Metrics and Recommended alerts feature are not supported in Proxy with trusted cert
159-
- Outbound proxy support with Azure Monitor Private Link Scope (AMPLS)
156+
- The Custom Metrics and Recommended Alerts features are not supported when using proxy with trusted cert
157+
- Outbound proxy is not supported with Azure Monitor Private Link Scope (AMPLS)
160158

161159
## Next steps
162160
- For more on the network requirements of AKS clusters, see [control egress traffic for cluster nodes in AKS][aks-egress].

articles/automation/automation-windows-hrw-install.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ The Hybrid Runbook Worker role requires the [Log Analytics agent](../azure-monit
3838

3939
The Hybrid Runbook Worker feature supports the following operating systems:
4040

41+
* Windows Server 2022 (including Server Core)
4142
* Windows Server 2019 (including Server Core)
4243
* Windows Server 2016, version 1709 and 1803 (excluding Server Core)
4344
* Windows Server 2012, 2012 R2

articles/automation/extension-based-hybrid-runbook-worker-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Azure Automation stores and manages runbooks and then delivers them to one or mo
3535

3636
| Windows | Linux (x64)|
3737
|---|---|
38-
| &#9679; Windows Server 2019 (including Server Core), <br> &#9679; Windows Server 2016, version 1709 and 1803 (excluding Server Core), and <br> &#9679; Windows Server 2012, 2012 R2 <br><br> | &#9679; Debian GNU/Linux 7 and 8, <br> &#9679; Ubuntu 18.04, and 20.04 LTS, <br> &#9679; SUSE Linux Enterprise Server 15, and 15.1 (SUSE didn't release versions numbered 13 or 14), and <br> &#9679; Red Hat Enterprise Linux Server 7 and 8 |
38+
| &#9679; Windows Server 2022 (including Server Core) <br> &#9679; Windows Server 2019 (including Server Core) <br> &#9679; Windows Server 2016, version 1709 and 1803 (excluding Server Core), and <br> &#9679; Windows Server 2012, 2012 R2 | &#9679; Debian GNU/Linux 7 and 8 <br> &#9679; Ubuntu 18.04, and 20.04 LTS <br> &#9679; SUSE Linux Enterprise Server 15, and 15.1 (SUSE didn't release versions numbered 13 or 14), and <br> &#9679; Red Hat Enterprise Linux Server 7 and 8 |
3939

4040
### Other Requirements
4141

0 commit comments

Comments
 (0)