Skip to content

Commit 39403b4

Browse files
v-thepetv-thepet
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into azurecli2
2 parents dcf378a + 778e07a commit 39403b4

File tree

85 files changed

+863
-731
lines changed

Some content is hidden

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

85 files changed

+863
-731
lines changed

‎articles/active-directory-domain-services/troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ If one or more users in your Azure AD tenant can't sign in to the Azure AD DS ma
134134
* You've deployed, or updated to, the [latest recommended release of Azure AD Connect](https://www.microsoft.com/download/details.aspx?id=47594).
135135
* You've configured Azure AD Connect to [perform a full synchronization][hybrid-phs].
136136
* Depending on the size of your directory, it may take a while for user accounts and credential hashes to be available in Azure AD DS. Make sure you wait long enough before trying to authenticate against the managed domain.
137-
* If the issue persists after verifying the previous steps, try restarting the *Microsoft Azure AD Sync Service*. From your [management VM][management-vm], open a command prompt and run the following commands:
137+
* If the issue persists after verifying the previous steps, try restarting the *Microsoft Azure AD Sync Service*. From your Azure AD Connect server, open a command prompt and run the following commands:
138138

139139
```console
140140
net stop 'Microsoft Azure AD Sync'

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

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -64,35 +64,7 @@ Organizations can choose to use the device identity as part of their Conditional
6464

6565
Organizations can require that an access attempt to the selected cloud apps needs to be made from an approved client app. These approved client apps support [Intune app protection policies](/intune/app-protection-policy) independent of any mobile-device management (MDM) solution.
6666

67-
This setting applies to the following client apps:
68-
69-
- Microsoft Azure Information Protection
70-
- Microsoft Bookings
71-
- Microsoft Cortana
72-
- Microsoft Dynamics 365
73-
- Microsoft Edge
74-
- Microsoft Excel
75-
- Microsoft Flow
76-
- Microsoft Intune Managed Browser
77-
- Microsoft Invoicing
78-
- Microsoft Kaizala
79-
- Microsoft Launcher
80-
- Microsoft OneDrive
81-
- Microsoft OneNote
82-
- Microsoft Outlook
83-
- Microsoft Planner
84-
- Microsoft PowerApps
85-
- Microsoft Power BI
86-
- Microsoft PowerPoint
87-
- Microsoft SharePoint
88-
- Microsoft Skype for Business
89-
- Microsoft StaffHub
90-
- Microsoft Stream
91-
- Microsoft Teams
92-
- Microsoft To-Do
93-
- Microsoft Visio
94-
- Microsoft Word
95-
- Microsoft Yammer
67+
Supported applications can be found in the article, [Microsoft Intune protected apps](/intune/apps/apps-supported-intune-apps).
9668

9769
**Remarks**
9870

@@ -105,12 +77,7 @@ This setting applies to the following client apps:
10577

10678
In your Conditional Access policy, you can require an [Intune app protection policy](/intune/app-protection-policy) be present on the client app before access is available to the selected cloud apps.
10779

108-
This setting applies to the following client apps:
109-
110-
- Microsoft Cortana
111-
- Microsoft OneDrive
112-
- Microsoft Outlook
113-
- Microsoft Planner
80+
Supported applications can be found in the article, [Microsoft Intune protected apps](/intune/apps/apps-supported-intune-apps).
11481

11582
**Remarks**
11683

‎articles/active-directory/develop/quickstart-v2-java-webapp.md

Lines changed: 62 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@ ms.custom: aaddev, scenarios:getting-started, languages:Java
1818

1919
In this quickstart, you'll learn how to integrate a Java web application with the Microsoft identity platform. Your app will sign in a user, get an access token to call the Microsoft Graph API, and make a request to the Microsoft Graph API.
2020

21-
When you've completed this quickstart, your application will accept sign-ins of personal Microsoft accounts (including outlook.com, live.com, and others) and work or school accounts from any company or organization that uses Azure Active Directory.
22-
23-
![Shows how the sample app generated by this quickstart works](media/quickstart-v2-java-webapp/java-quickstart.svg)
21+
When you've completed this quickstart, your application will accept sign-ins of personal Microsoft accounts (including outlook.com, live.com, and others) and work or school accounts from any company or organization that uses Azure Active Directory. (See [How the sample works](#how-the-sample-works) for an illustration.)
2422

2523
## Prerequisites
2624

2725
To run this sample you will need:
2826

2927
- [Java Development Kit (JDK)](https://openjdk.java.net/) 8 or greater, and [Maven](https://maven.apache.org/).
30-
- An Azure Active Directory (Azure AD) tenant. For more information on how to get an Azure AD tenant, see [How to get an Azure AD tenant](https://azure.microsoft.com/documentation/articles/active-directory-howto-tenant/).
3128

3229
> [!div renderon="docs"]
3330
> ## Register and download your quickstart app
@@ -69,7 +66,7 @@ To run this sample you will need:
6966
>
7067
> For the code sample for this quickstart to work, you need to:
7168
>
72-
> 1. Add reply URLs as `https://localhost:8080/msal4jsamples/secure/aad` and `https://localhost:8080/msal4jsamples/graph/me`.
69+
> 1. Add reply URLs as `https://localhost:8080/msal4jsample/secure/aad` and `https://localhost:8080/msal4jsample/graph/me`.
7370
> 1. Create a Client Secret.
7471
> > [!div renderon="portal" id="makechanges" class="nextstepaction"]
7572
> > [Make these changes for me]()
@@ -78,46 +75,65 @@ To run this sample you will need:
7875
> > ![Already configured](media/quickstart-v2-aspnet-webapp/green-check.png) Your application is configured with these attributes.
7976
8077
#### Step 2: Download the code sample
78+
> [!div renderon="docs"]
79+
> [Download the Code Sample](https://github.com/Azure-Samples/ms-identity-java-webapp/archive/master.zip)
8180
82-
[Download the Code Sample](https://github.com/Azure-Samples/ms-identity-java-webapp/archive/master.zip)
83-
84-
#### Step 3: Configure the code sample
85-
86-
1. Extract the zip file to a local folder.
87-
1. If you use an integrated development environment, open the sample in your favorite IDE (optional).
88-
1. Open the application.properties file, which can be found in src/main/resources/ folder and replace the value of the fields *aad.clientId*, *aad.authority* and *aad.secretKey* with the respective values of **Application Id**, **Tenant Id** and **Client Secret** as the following:
89-
90-
```file
91-
aad.clientId=Enter_the_Application_Id_here
92-
aad.authority=https://login.microsoftonline.com/Enter_the_Tenant_Info_Here/
93-
aad.secretKey=Enter_the_Client_Secret_Here
94-
aad.redirectUriSignin=https://localhost:8080/msal4jsample/secure/aad
95-
aad.redirectUriGraph=https://localhost:8080/msal4jsample/graph/me
96-
aad.msGraphEndpointHost="https://graph.microsoft.com/"
97-
```
98-
99-
> [!div renderon="docs"]
100-
> Where:
101-
>
102-
> - `Enter_the_Application_Id_here` - is the Application Id for the application you registered.
103-
> - `Enter_the_Client_Secret_Here` - is the **Client Secret** you created in **Certificates & Secrets** for the application you registered.
104-
> - `Enter_the_Tenant_Info_Here` - is the **Directory (tenant) ID** value of the application you registered.
105-
106-
1. To use https with localhost, fill in the server.ssl.key properties. To generate a self-signed certificate, use the keytool utility (included in JRE).
107-
108-
```
109-
Example:
110-
keytool -genkeypair -alias testCert -keyalg RSA -storetype PKCS12 -keystore keystore.p12 -storepass password
81+
> [!div class="sxs-lookup" renderon="portal"]
82+
> Download the project and extract the zip file to a local folder closer to the root folder - for example, **C:\Azure-Samples**
83+
>
84+
> To use https with localhost, fill in the server.ssl.key properties. To generate a self-signed certificate, use the keytool utility (included in JRE).
85+
>
86+
> ```
87+
> Example:
88+
> keytool -genkeypair -alias testCert -keyalg RSA -storetype PKCS12 -keystore keystore.p12 -storepass password
89+
>
90+
> server.ssl.key-store-type=PKCS12
91+
> server.ssl.key-store=classpath:keystore.p12
92+
> server.ssl.key-store-password=password
93+
> server.ssl.key-alias=testCert
94+
> ```
95+
> Put the generated keystore file in the "resources" folder.
96+
97+
> [!div renderon="portal" id="autoupdate" class="nextstepaction"]
98+
> [Download the code sample]()
11199
112-
server.ssl.key-store-type=PKCS12
113-
server.ssl.key-store=classpath:keystore.p12
114-
server.ssl.key-store-password=password
115-
server.ssl.key-alias=testCert
116-
```
100+
> [!div renderon="docs"]
101+
> #### Step 3: Configure the code sample
102+
> 1. Extract the zip file to a local folder.
103+
> 1. If you use an integrated development environment, open the sample in your favorite IDE (optional).
104+
> 1. Open the application.properties file, which can be found in src/main/resources/ folder and replace the value of the fields *aad.clientId*, *aad.authority* and *aad.secretKey* with the respective values of **Application Id**, **Tenant Id** and **Client Secret** as the following:
105+
>
106+
> ```file
107+
> aad.clientId=Enter_the_Application_Id_here
108+
> aad.authority=https://login.microsoftonline.com/Enter_the_Tenant_Info_Here/
109+
> aad.secretKey=Enter_the_Client_Secret_Here
110+
> aad.redirectUriSignin=https://localhost:8080/msal4jsample/secure/aad
111+
> aad.redirectUriGraph=https://localhost:8080/msal4jsample/graph/me
112+
> aad.msGraphEndpointHost="https://graph.microsoft.com/"
113+
> ```
114+
> Where:
115+
>
116+
> - `Enter_the_Application_Id_here` - is the Application Id for the application you registered.
117+
> - `Enter_the_Client_Secret_Here` - is the **Client Secret** you created in **Certificates & Secrets** for the application you registered.
118+
> - `Enter_the_Tenant_Info_Here` - is the **Directory (tenant) ID** value of the application you registered.
119+
> 1. To use https with localhost, fill in the server.ssl.key properties. To generate a self-signed certificate, use the keytool utility (included in JRE).
120+
>
121+
> ```
122+
> Example:
123+
> keytool -genkeypair -alias testCert -keyalg RSA -storetype PKCS12 -keystore keystore.p12 -storepass password
124+
>
125+
> server.ssl.key-store-type=PKCS12
126+
> server.ssl.key-store=classpath:keystore.p12
127+
> server.ssl.key-store-password=password
128+
> server.ssl.key-alias=testCert
129+
> ```
130+
> Put the generated keystore file in the "resources" folder.
117131
118-
Put the generated keystore file in the "resources" folder.
119132
120-
#### Step 4: Run the code sample
133+
> [!div class="sxs-lookup" renderon="portal"]
134+
> #### Step 3: Run the code sample
135+
> [!div renderon="docs"]
136+
> #### Step 4: Run the code sample
121137
122138
To run the project, you can either:
123139
@@ -133,11 +149,16 @@ If you are running the web application from an IDE, click on run, then navigate
133149
- *Sign Out*: Signs the current user out of the application and redirects them to the home page.
134150
- *Show User Info*: Acquires a token for Microsoft Graph and calls Microsoft Graph with a request containing the token, which returns basic information about the signed-in user.
135151
152+
153+
136154
> [!IMPORTANT]
137155
> This quickstart application uses a client secret to identify itself as confidential client. Because the client secret is added as a plain-text to your project files, for security reasons it is recommended that you use a certificate instead of a client secret before considering the application as production application. For more information on how to use a certificate, see [Certificate credentials for application authentication](https://docs.microsoft.com/azure/active-directory/develop/active-directory-certificate-credentials).
138156
139157
## More information
140158
159+
### How the sample works
160+
![Shows how the sample app generated by this quickstart works](media/quickstart-v2-java-webapp/java-quickstart.svg)
161+
141162
### Getting MSAL
142163
143164
MSAL for Java (MSAL4J) is the Java library used to sign in users and request tokens used to access an API protected by the Microsoft identity Platform.

‎articles/active-directory/develop/quickstart-v2-javascript.md

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ In this quickstart, you use a code sample to learn how a JavaScript single-page
2525
## Prerequisites
2626

2727
* Azure subscription - [create one for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F)
28-
* [Node.js](https://nodejs.org/en/download/).
28+
* [Node.js](https://nodejs.org/en/download/)
2929
* [Visual Studio Code](https://code.visualstudio.com/download) (to edit project files)
3030

31+
3132
> [!div renderon="docs"]
3233
> ## Register and download your quickstart application
3334
> To start your quickstart application, use either of the following options.
@@ -70,38 +71,39 @@ In this quickstart, you use a code sample to learn how a JavaScript single-page
7071
7172
#### Step 2: Download the project
7273

73-
Select the option that's suitable to your development environment:
74+
> [!div renderon="docs"]
75+
> To run the project with a web server by using Node.js, [download the core project files](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2/archive/quickstart.zip).
7476
75-
* To run the project with a web server by using Node.js, [download the core project files](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2/archive/quickstart.zip). To open the files, use an editor such as [Visual Studio Code](https://code.visualstudio.com/).
77+
> [!div renderon="portal"]
78+
> Run the project with a web server by using Node.js
7679
77-
#### Step 3: Configure your JavaScript app
80+
> [!div renderon="portal" id="autoupdate" class="nextstepaction"]
81+
> [Download the code sample]()
7882
7983
> [!div renderon="docs"]
84+
> #### Step 3: Configure your JavaScript app
85+
>
8086
> In the *JavaScriptSPA* folder, edit *authConfig.js*, and set the `clientID` and `authority` values under `msalConfig`.
87+
> ```javascript
88+
>
89+
> // Config object to be passed to Msal on creation
90+
> const msalConfig = {
91+
> auth: {
92+
> clientId: "Enter_the_Application_Id_Here",
93+
> authority: "Enter_the_Cloud_Instance_Id_HereEnter_the_Tenant_Info_Here",
94+
> redirectUri: "Enter_the_Redirect_Uri_Here",
95+
> },
96+
> cache: {
97+
> cacheLocation: "sessionStorage", // This configures where your cache will be stored
98+
> storeAuthStateInCookie: false, // Set this to "true" if you are having issues on IE11 or Edge
99+
> forceRefresh: false // Set this to "true" to skip a cached token and go to the server to get a new
100+
> }
101+
> };
102+
> ```
81103
82-
> [!div class="sxs-lookup" renderon="portal"]
83-
> In the *JavaScriptSPA* folder, edit *authConfig.js*, and replace `msalConfig` with the following code:
84-
85-
```javascript
86-
87-
// Config object to be passed to Msal on creation
88-
const msalConfig = {
89-
auth: {
90-
clientId: "Enter_the_Application_Id_Here",
91-
authority: "Enter_the_Cloud_Instance_Id_HereEnter_the_Tenant_Info_Here",
92-
redirectUri: "Enter_the_Redirect_Uri_Here",
93-
},
94-
cache: {
95-
cacheLocation: "sessionStorage", // This configures where your cache will be stored
96-
storeAuthStateInCookie: false, // Set this to "true" if you are having issues on IE11 or Edge
97-
forceRefresh: false // Set this to "true" to skip a cached token and go to the server to get a new
98-
}
99-
};
100-
101-
```
102104
> [!div renderon="portal"]
103105
> > [!NOTE]
104-
> > This quickstart supports Enter_the_Supported_Account_Info_Here.
106+
> > Enter_the_Supported_Account_Info_Here
105107
106108
> [!div renderon="docs"]
107109
>
@@ -116,19 +118,22 @@ Select the option that's suitable to your development environment:
116118
> > [!TIP]
117119
> > To find the values of **Application (client) ID**, **Directory (tenant) ID**, and **Supported account types**, go to the app's **Overview** page in the Azure portal.
118120
>
121+
> [!div class="sxs-lookup" renderon="portal"]
122+
> #### Step 3: Your app is configured and ready to run
123+
> We have configured your project with values of your app's properties.
119124
120-
#### Step 4: Run the project
125+
> [!div renderon="docs"]
126+
> #### Step 4: Run the project
121127
122-
If you're using [Node.js](https://nodejs.org/en/download/):
128+
Run the project with a web server by using [Node.js](https://nodejs.org/en/download/):
123129
124130
1. To start the server, run the following command from the project directory:
125-
126-
```batch
127-
npm install
128-
npm start
129-
```
130-
131+
```batch
132+
npm install
133+
npm start
134+
```
131135
1. Open a web browser and go to `http://localhost:3000/`.
136+
132137
1. Select **Sign In** to start the sign-in, and then call Microsoft Graph API.
133138
134139
After the browser loads the application, select **Sign In**. The first time that you sign in, you're prompted to provide your consent to allow the application to access your profile and to sign you in. After you're signed in successfully, your user profile information should be displayed on the page.

‎articles/active-directory/hybrid/reference-connect-accounts-permissions.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@ In addition to these three accounts used to run Azure AD Connect, you will also
5050
> [!NOTE]
5151
> It is supported to manage the administrative accounts used in Azure AD Connect from an ESAE Administrative Forest (also know as "Red forest").
5252
> Dedicated administrative forests allow organizations to host administrative accounts, workstations, and groups in an environment that has stronger security controls than the production environment.
53-
> To learn more about dedicated administrative forests please refer to [ESAE Administrative Forest Design Approach](https://docs.microsoft.com/windows-server/identity/securing-privileged-access/securing-privileged-access-reference-material#esae-administrative-forest-design-approach)
54-
>>>>>>> e683a61b0ed62ae739941410f658a127534e2481
53+
> To learn more about dedicated administrative forests please refer to [ESAE Administrative Forest Design Approach](https://docs.microsoft.com/windows-server/identity/securing-privileged-access/securing-privileged-access-reference-material#esae-administrative-forest-design-approach).
5554
5655
> [!NOTE]
57-
> The Global Administrator role is not required after the initial setup and the only required account will be the **Directory Synchronization Accounts** role account. That does not necssarily mean that you will want to just remove the account with the Global Administrator role. It is better to change the role to a less powerful role, as totally removing the account may introduce issues if you ever need to re-run the wizard again. By reducing the privilege of the role you can always re-elevate the priviliges if you have to utilize the Azure AD Connect wizard again.
56+
> The Global Administrator role is not required after the initial setup and the only required account will be the **Directory Synchronization Accounts** role account. That does not necessarily mean that you will want to just remove the account with the Global Administrator role. It is better to change the role to a less powerful role, as totally removing the account may introduce issues if you ever need to re-run the wizard again. By reducing the privilege of the role you can always re-elevate the privileges if you have to utilize the Azure AD Connect wizard again.
5857
5958
## Installing Azure AD Connect
6059
The Azure AD Connect installation wizard offers two different paths:

‎articles/active-directory/manage-apps/application-proxy-configure-custom-domain.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ There's no restriction on the certificate signature methods. Elliptic Curve Cryp
127127

128128
You can use wildcard certificates as long as the wildcard matches the external URL. You must use wildcard certificates for [wildcard applications](application-proxy-wildcard.md). If you want to use the certificate to also access subdomains, you must add the subdomain wildcards as subject alternative names in the same certificate. For example, a certificate for *\*.adventure-works.com* won't work for *\*.apps.adventure-works.com* unless you add *\*.apps.adventure-works.com* as a subject alternative name.
129129

130-
You can use certificates issued by your own public key infrastructure (PKI) if the certificate chain is installed on your client devices. Intune can deploy these certificates to managed devices. For non-managed devices, you must manually install these certificates.
130+
You can use certificates issued by your own public key infrastructure (PKI) if the certificate chain is installed on your client devices. Intune can deploy these certificates to managed devices. For non-managed devices, you must manually install these certificates.
131131

132-
It's not a good idea to use a private root CA. The private root CA would also need to be pushed to client machines, which introduces many challenges.
132+
We do not recommend using a private root CA since the private root CA would also need to be pushed to client machines, which may introduce many challenges.
133133

134134
### Certificate management
135135

0 commit comments

Comments
 (0)