Skip to content

Commit d2eb2e1

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents e39e321 + c2954cc commit d2eb2e1

File tree

160 files changed

+2754
-1305
lines changed

Some content is hidden

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

160 files changed

+2754
-1305
lines changed

articles/active-directory/authentication/concept-authentication-passwordless.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ The following providers offer FIDO2 security keys of different form factors that
122122
| [Feitian](https://shop.ftsafe.us/pages/microsoft) | ![y] | ![y]| ![y]| ![y]| ![y] |
123123
| [Fortinet](https://www.fortinet.com/) | ![n] | ![y]| ![n]| ![n]| ![n] |
124124
| [Giesecke + Devrient (G+D)](https://www.gi-de.com/en/identities/enterprise-security/hardware-based-authentication) | ![y] | ![y]| ![y]| ![y]| ![n] |
125+
| [Google](https://store.google.com/us/product/titan_security_key) | ![n] | ![y]| ![y]| ![n]| ![n] |
125126
| [GoTrustID Inc.](https://www.gotrustid.com/idem-key) | ![n] | ![y]| ![y]| ![y]| ![n] |
126127
| [HID](https://www.hidglobal.com/products/crescendo-key) | ![n] | ![y]| ![y]| ![n]| ![n] |
127128
| [HIDEEZ](https://hideez.com/products/hideez-key-4) | ![n] | ![y]| ![y]| ![y]| ![n] |
@@ -135,6 +136,7 @@ The following providers offer FIDO2 security keys of different form factors that
135136
| [Nymi](https://www.nymi.com/nymi-band) | ![y] | ![n]| ![y]| ![n]| ![n] |
136137
| [Octatco](https://octatco.com/) | ![y] | ![y]| ![n]| ![n]| ![n] |
137138
| [OneSpan Inc.](https://www.onespan.com/products/fido) | ![n] | ![y]| ![n]| ![y]| ![n] |
139+
| [PONE Biometrics](https://ponebiometrics.com/) | ![n] | ![n]| ![n]| ![y]| ![n] |
138140
| [Precision Biometric](https://www.innait.com/product/fido/) | ![n] | ![y]| ![n]| ![n]| ![n] |
139141
| [RSA](https://www.rsa.com/products/securid/) | ![n] | ![y]| ![n]| ![n]| ![n] |
140142
| [Sentry](https://sentryenterprises.com/) | ![n] | ![n]| ![y]| ![n]| ![n] |

articles/active-directory/authentication/concept-fido2-hardware-vendor.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ The following table lists partners who are Microsoft-compatible FIDO2 security k
4343
| [Feitian](https://shop.ftsafe.us/pages/microsoft) | ![y] | ![y]| ![y]| ![y]| ![y] |
4444
| [Fortinet](https://www.fortinet.com/) | ![n] | ![y]| ![n]| ![n]| ![n] |
4545
| [Giesecke + Devrient (G+D)](https://www.gi-de.com/en/identities/enterprise-security/hardware-based-authentication) | ![y] | ![y]| ![y]| ![y]| ![n] |
46+
| [Google](https://store.google.com/us/product/titan_security_key) | ![n] | ![y]| ![y]| ![n]| ![n] |
4647
| [GoTrustID Inc.](https://www.gotrustid.com/idem-key) | ![n] | ![y]| ![y]| ![y]| ![n] |
4748
| [HID](https://www.hidglobal.com/products/crescendo-key) | ![n] | ![y]| ![y]| ![n]| ![n] |
4849
| [HIDEEZ](https://hideez.com/products/hideez-key-4) | ![n] | ![y]| ![y]| ![y]| ![n] |
@@ -56,6 +57,7 @@ The following table lists partners who are Microsoft-compatible FIDO2 security k
5657
| [Nymi](https://www.nymi.com/nymi-band) | ![y] | ![n]| ![y]| ![n]| ![n] |
5758
| [Octatco](https://octatco.com/) | ![y] | ![y]| ![n]| ![n]| ![n] |
5859
| [OneSpan Inc.](https://www.onespan.com/products/fido) | ![n] | ![y]| ![n]| ![y]| ![n] |
60+
| [PONE Biometrics](https://ponebiometrics.com/) | ![n] | ![n]| ![n]| ![y]| ![n] |
5961
| [Precision Biometric](https://www.innait.com/product/fido/) | ![n] | ![y]| ![n]| ![n]| ![n] |
6062
| [RSA](https://www.rsa.com/products/securid/) | ![n] | ![y]| ![n]| ![n]| ![n] |
6163
| [Sentry](https://sentryenterprises.com/) | ![n] | ![n]| ![y]| ![n]| ![n] |

articles/active-directory/develop/quickstart-daemon-app-java-acquire-token.md

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,10 @@ To run this sample, you need:
2828
- [Java Development Kit (JDK)](https://openjdk.java.net/) 8 or greater
2929
- [Maven](https://maven.apache.org/)
3030

31-
32-
## Register and download your quickstart app
33-
34-
You have two options to start your quickstart application: Express (Option 1 below), and Manual (Option 2)
35-
36-
### Option 1: Register and auto configure your app and then download your code sample
37-
38-
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer).
39-
1. Browse to **Identity** > **Applications** > **Application registrations**.
40-
1. Select **New registration**.
41-
1. Enter a name for your application and select **Register**.
42-
1. Follow the instructions to download and automatically configure your new application with just one click.
43-
44-
### Option 2: Register and manually configure your application and code sample
45-
46-
#### Step 1: Register your application
47-
4831
[!INCLUDE [portal updates](~/articles/active-directory/includes/portal-update.md)]
4932

33+
### Step 1: Register the application
34+
5035
To register your application and add the app's registration information to your solution manually, follow these steps:
5136

5237
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer).
@@ -61,10 +46,10 @@ To register your application and add the app's registration information to your
6146
1. Select **Application permissions**.
6247
1. Under **User** node, select **User.Read.All**, then select **Add permissions**.
6348

64-
#### Step 2: Download the Java project
49+
### Step 2: Download the Java project
6550
[Download the Java daemon project](https://github.com/Azure-Samples/ms-identity-java-daemon/archive/master.zip)
6651

67-
#### Step 3: Configure the Java project
52+
### Step 3: Configure the Java project
6853

6954
1. Extract the zip file to a local folder close to the root of the disk, for example, *C:\Azure-Samples*.
7055
1. Navigate to the sub folder **msal-client-credential-secret**.
@@ -81,18 +66,18 @@ To register your application and add the app's registration information to your
8166
- `Enter_the_Client_Secret_Here` - replace this value with the client secret created on step 1.
8267

8368
>[!TIP]
84-
>To find the values of **Application (client) ID**, **Directory (tenant) ID**, go to the app's **Overview** page in the Azure portal. To generate a new key, go to **Certificates & secrets** page.
69+
>To find the values of **Application (client) ID**, **Directory (tenant) ID**, go to the app's **Overview** page. To generate a new key, go to **Certificates & secrets** page.
8570
86-
#### Step 4: Admin consent
71+
### Step 4: Admin consent
8772

8873
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:
8974

90-
##### Global tenant administrator
75+
#### Global tenant administrator
9176

9277

93-
If you are a global tenant administrator, go to **API Permissions** page in **App registrations** in the Azure portal and select **Grant admin consent for {Tenant Name}** (Where {Tenant Name} is the name of your directory).
78+
If you are a global tenant administrator, go to **API Permissions** page in **App registrations** and select **Grant admin consent for {Tenant Name}** (Where {Tenant Name} is the name of your directory).
9479

95-
##### Standard user
80+
#### Standard user
9681

9782
If you're a standard user of your tenant, then you need to ask a global administrator to grant admin consent for your application. To do this, give the following URL to your administrator:
9883

@@ -105,7 +90,7 @@ https://login.microsoftonline.com/Enter_the_Tenant_Id_Here/adminconsent?client_i
10590
* `Enter_the_Application_Id_Here` - is the **Application (client) ID** for the application you registered.
10691

10792

108-
#### Step 5: Run the application
93+
### Step 5: Run the application
10994

11095
You can test the sample directly by running the main method of ClientCredentialGrant.java from your IDE.
11196

@@ -172,8 +157,8 @@ ConfidentialClientApplication cca =
172157

173158
| Where: |Description |
174159
|---------|---------|
175-
| `CLIENT_SECRET` | Is the client secret created for the application in Azure portal. |
176-
| `CLIENT_ID` | Is the **Application (client) ID** for the application registered in the Azure portal. You can find this value in the app's **Overview** page in the Azure portal. |
160+
| `CLIENT_SECRET` | Is the client secret created for the application. |
161+
| `CLIENT_ID` | Is the **Application (client) ID** for the registered application. You can find this value in the app's **Overview** page. |
177162
| `AUTHORITY` | The STS endpoint for user to authenticate. Usually `https://login.microsoftonline.com/{tenant}` for public cloud, where {tenant} is the name of your tenant or your tenant ID.|
178163

179164
### Requesting tokens
@@ -212,7 +197,7 @@ IAuthenticationResult result;
212197

213198
|Where:| Description |
214199
|---------|---------|
215-
| `SCOPE` | Contains the scopes requested. For confidential clients, this should use the format similar to `{Application ID URI}/.default` to indicate that the scopes being requested are the ones statically defined in the app object set in the Azure portal (for Microsoft Graph, `{Application ID URI}` points to `https://graph.microsoft.com`). For custom web APIs, `{Application ID URI}` is defined under the **Expose an API** section in **App registrations** in the Azure portal.|
200+
| `SCOPE` | Contains the scopes requested. For confidential clients, this should use the format similar to `{Application ID URI}/.default` to indicate that the scopes being requested are the ones statically defined in the app object (for Microsoft Graph, `{Application ID URI}` points to `https://graph.microsoft.com`). For custom web APIs, `{Application ID URI}` is defined under the **Expose an API** section in **App registrations**.|
216201

217202
[!INCLUDE [Help and support](includes/error-handling-and-tips/help-support-include.md)]
218203

articles/active-directory/develop/quickstart-single-page-app-angular-sign-in.md

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,14 @@ This quickstart uses MSAL Angular v2 with the authorization code flow.
2929
* [Node.js](https://nodejs.org/en/download/)
3030
* [Visual Studio Code](https://code.visualstudio.com/download) or another code editor
3131

32-
33-
## Register and download your quickstart application
32+
## Register your quickstart application
3433

3534
[!INCLUDE [portal updates](~/articles/active-directory/includes/portal-update.md)]
3635

37-
To start your quickstart application, use either of the following options.
38-
39-
### Option 1 (Express): Register and auto configure your app and then download your code sample
40-
41-
1. Go to the [Azure portal - App registrations](https://portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationsListBlade/quickStartType/AngularSpaQuickstartPage/sourceType/docs) quickstart experience.
42-
1. Enter a name for your application.
43-
1. Under **Supported account types**, select **Accounts in any organizational directory and personal Microsoft accounts**.
44-
1. Select **Register**.
45-
1. Go to the quickstart pane and follow the instructions to download and automatically configure your new application.
46-
47-
### Option 2 (Manual): Register and manually configure your application and code sample
48-
49-
#### Step 1: Register your application
50-
51-
1. Sign in to the [Azure portal](https://portal.azure.com/).
52-
1. If you have access to multiple tenants, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
53-
1. Search for and select **Azure Active Directory**.
54-
1. Under **Manage**, select **App registrations** > **New registration**.
36+
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer).
37+
1. If access to multiple tenants is available, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
38+
1. Browse to **Identity** > **Applications** > **Application registrations**.
39+
1. Select **New registration**.
5540
1. Enter a **Name** for your application. Users of your app might see this name, and you can change it later.
5641
1. Under **Supported account types**, select **Accounts in any organizational directory and personal Microsoft accounts**.
5742
1. Select **Register**. On the app **Overview** page, note the **Application (client) ID** value for later use.
@@ -90,17 +75,17 @@ Modify the values in the `auth` section as described here:
9075
9176
- `Enter_the_Application_Id_Here` is the **Application (client) ID** for the application you registered.
9277
93-
To find the value of **Application (client) ID**, go to the app registration's **Overview** page in the Azure portal.
78+
To find the value of **Application (client) ID**, go to the app registration's **Overview** page.
9479
- `Enter_the_Cloud_Instance_Id_Here` is the instance of the Azure cloud. For the main or global Azure cloud, enter `https://login.microsoftonline.com`. For **national** clouds (for example, China), see [National clouds](authentication-national-cloud.md).
9580
- `Enter_the_Tenant_info_here` is set to one of the following:
9681
- If your application supports *accounts in this organizational directory*, replace this value with the **Tenant ID** or **Tenant name**. For example, `contoso.microsoft.com`.
9782

98-
To find the value of the **Directory (tenant) ID**, go to the app registration's **Overview** page in the Azure portal.
83+
To find the value of the **Directory (tenant) ID**, go to the app registration's **Overview** page.
9984
- If your application supports *accounts in any organizational directory*, replace this value with `organizations`.
10085
- If your application supports *accounts in any organizational directory and personal Microsoft accounts*, replace this value with `common`. **For this quickstart**, use `common`.
10186
- To restrict support to *personal Microsoft accounts only*, replace this value with `consumers`.
10287
103-
To find the value of **Supported account types**, go to the app registration's **Overview** page in the Azure portal.
88+
To find the value of **Supported account types**, go to the app registration's **Overview** page.
10489
- `Enter_the_Redirect_Uri_Here` is `http://localhost:4200/`.
10590

10691
The `authority` value in your *app.module.ts* should be similar to the following if you're using the main (global) Azure cloud:

articles/active-directory/develop/quickstart-single-page-app-javascript-sign-in.md

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,12 @@ See [How the sample works](#how-the-sample-works) for an illustration.
3333

3434
[!INCLUDE [portal updates](~/articles/active-directory/includes/portal-update.md)]
3535

36-
To start your quickstart application, use either of the following options.
36+
### Step 1: Register your application
3737

38-
### Option 1 (Express): Register and auto configure your app and then download your code sample
39-
40-
1. Go to the [Azure portal - App registrations](https://portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationsListBlade/quickStartType/AngularSpaQuickstartPage/sourceType/docs) quickstart experience.
41-
1. Enter a name for your application.
42-
1. Under **Supported account types**, select **Accounts in any organizational directory and personal Microsoft accounts**.
43-
1. Select **Register**.
44-
1. Go to the quickstart pane and follow the instructions to download and automatically configure your new application.
45-
46-
### Option 2 (Manual): Register and manually configure your application and code sample
47-
48-
#### Step 1: Register your application
49-
50-
1. Sign in to the [Azure portal](https://portal.azure.com/).
51-
1. If you have access to multiple tenants, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
52-
1. Search for and select **Azure Active Directory**.
53-
1. Under **Manage**, select **App registrations** > **New registration**.
38+
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer).
39+
1. If access to multiple tenants is available, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
40+
1. Browse to **Identity** > **Applications** > **Application registrations**.
41+
1. Select **New registration**.
5442
1. Enter a **Name** for your application. Users of your app might see this name, and you can change it later.
5543
1. Under **Supported account types**, select **Accounts in any organizational directory and personal Microsoft accounts**.
5644
1. Select **Register**. On the app **Overview** page, note the **Application (client) ID** value for later use.
@@ -59,12 +47,11 @@ To start your quickstart application, use either of the following options.
5947
1. Set the **Redirect URI** value to `http://localhost:3000/`.
6048
1. Select **Configure**.
6149

62-
#### Step 2: Download the project
50+
### Step 2: Download the project
6351

6452
To run the project with a web server by using Node.js, [download the core project files](https://github.com/Azure-Samples/ms-identity-javascript-v2/archive/master.zip).
6553

66-
67-
#### Step 3: Configure your JavaScript app
54+
### Step 3: Configure your JavaScript app
6855

6956
In the *app* folder, open the *authConfig.js* file, and then update the `clientID`, `authority`, and `redirectUri` values in the `msalConfig` object.
7057

@@ -87,17 +74,17 @@ Modify the values in the `msalConfig` section:
8774

8875
- `Enter_the_Application_Id_Here` is the **Application (client) ID** for the application you registered.
8976

90-
To find the value of **Application (client) ID**, go to the app registration's **Overview** page in the Azure portal.
77+
To find the value of **Application (client) ID**, go to the app registration's **Overview** page.
9178
- `Enter_the_Cloud_Instance_Id_Here` is the Azure cloud instance. For the main or global Azure cloud, enter `https://login.microsoftonline.com`. For **national** clouds (for example, China), see [National clouds](authentication-national-cloud.md).
9279
- `Enter_the_Tenant_info_here` is one of the following:
9380
- If your application supports *accounts in this organizational directory*, replace this value with the **Tenant ID** or **Tenant name**. For example, `contoso.microsoft.com`.
9481

95-
To find the value of the **Directory (tenant) ID**, go to the app registration's **Overview** page in the Azure portal.
82+
To find the value of the **Directory (tenant) ID**, go to the app registration's **Overview** page.
9683
- If your application supports *accounts in any organizational directory*, replace this value with `organizations`.
9784
- If your application supports *accounts in any organizational directory and personal Microsoft accounts*, replace this value with `common`. **For this quickstart**, use `common`.
9885
- To restrict support to *personal Microsoft accounts only*, replace this value with `consumers`.
9986

100-
To find the value of **Supported account types**, go to the app registration's **Overview** page in the Azure portal.
87+
To find the value of **Supported account types**, go to the app registration's **Overview** page.
10188
- `Enter_the_Redirect_Uri_Here` is `http://localhost:3000/`.
10289

10390
The `authority` value in your *authConfig.js* should be similar to the following if you're using the main (global) Azure cloud:
@@ -130,7 +117,7 @@ graphMeEndpoint: "https://graph.microsoft.com/v1.0/me",
130117
graphMailEndpoint: "https://graph.microsoft.com/v1.0/me/messages"
131118
```
132119

133-
#### Step 4: Run the project
120+
### Step 4: Run the project
134121

135122
Run the project with a web server by using Node.js.
136123

0 commit comments

Comments
 (0)