Skip to content

Commit 849bb17

Browse files
authored
Merge pull request #112937 from MicrosoftDocs/master
4/27 PM Publish
2 parents b1e25a8 + 8a92beb commit 849bb17

File tree

173 files changed

+2604
-1799
lines changed

Some content is hidden

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

173 files changed

+2604
-1799
lines changed

.openpublishing.redirection.json

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2352,6 +2352,16 @@
23522352
"redirect_url": "/azure/cosmos-db/conflict-resolution-policies",
23532353
"redirect_document_id": true
23542354
},
2355+
{
2356+
"source_path": "articles/cosmos-db/provision-throughput-autopilot.md",
2357+
"redirect_url": "/azure/cosmos-db/provision-throughput-autoscale",
2358+
"redirect_document_id": true
2359+
},
2360+
{
2361+
"source_path": "articles/cosmos-db/autopilot-faq.md",
2362+
"redirect_url": "/azure/cosmos-db/autoscale-faq",
2363+
"redirect_document_id": true
2364+
},
23552365
{
23562366
"source_path": "articles/cosmos-db/how-to-custom-synchronization.md",
23572367
"redirect_url": "/azure/cosmos-db/how-to-multi-master",
@@ -4347,6 +4357,11 @@
43474357
"redirect_url": "/azure/azure-portal/azure-portal-dashboards",
43484358
"redirect_document_id": false
43494359
},
4360+
{
4361+
"source_path": "articles/azure-resource-manager/templates/template-tutorial-secure-artifacts.md",
4362+
"redirect_url": "/azure/azure-resource-manager/templates/secure-template-with-sas-token",
4363+
"redirect_document_id": false
4364+
},
43504365
{
43514366
"source_path": "articles/azure-resource-manager/templates/template-tutorial-create-linked-templates.md",
43524367
"redirect_url": "/azure/azure-resource-manager/templates/deployment-tutorial-linked-template",
@@ -7367,6 +7382,11 @@
73677382
"redirect_url": "/azure/logic-apps/logic-apps-using-sap-connector",
73687383
"redirect_document_id": true
73697384
},
7385+
{
7386+
"source_path": "articles/logic-apps/logic-apps-schema-2015-08-01.md",
7387+
"redirect_url": "/azure/logic-apps/logic-apps-schema-2016-04-01",
7388+
"redirect_document_id": true
7389+
},
73707390
{
73717391
"source_path": "articles/scheduler/get-started-portal.md",
73727392
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps"
@@ -14200,7 +14220,7 @@
1420014220
"source_path": "articles/event-hubs/event-hubs-api-overview.md",
1420114221
"redirect_url": "/azure/event-hubs/event-hubs-samples",
1420214222
"redirect_document_id": false
14203-
},
14223+
},
1420414224
{
1420514225
"source_path": "articles/event-hubs/event-hubs-archive-overview.md",
1420614226
"redirect_url": "/azure/event-hubs/event-hubs-capture-overview",
@@ -14265,7 +14285,7 @@
1426514285
"source_path": "articles/event-hubs/event-hubs-dotnet-framework-api-overview.md",
1426614286
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-framework-getstarted-send",
1426714287
"redirect_document_id": false
14268-
},
14288+
},
1426914289
{
1427014290
"source_path": "articles/event-hubs/event-hubs-dotnet-framework-getstarted-receive-eph.md",
1427114291
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-framework-getstarted-send",
@@ -14275,7 +14295,7 @@
1427514295
"source_path": "articles/event-hubs/event-hubs-dotnet-standard-api-overview.md",
1427614296
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
1427714297
"redirect_document_id": false
14278-
},
14298+
},
1427914299
{
1428014300
"source_path": "articles/event-hubs/event-hubs-dotnet-standard-getstarted-receive-eph.md",
1428114301
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
@@ -14345,7 +14365,7 @@
1434514365
"source_path": "articles/event-hubs/event-hubs-spark-connector.md",
1434614366
"redirect_url": "/azure/event-hubs/event-hubs-kafka-spark-tutorial",
1434714367
"redirect_document_id": false
14348-
},
14368+
},
1434914369
{
1435014370
"source_path": "articles/event-hubs/event-hubs-tutorial-virtual-networks-firewalls.md",
1435114371
"redirect_url": "/azure/event-hubs/event-hubs-service-endpoints",
@@ -51740,6 +51760,11 @@
5174051760
"redirect_url": "/azure/developer/jenkins/",
5174151761
"redirect_document_id": false
5174251762
},
51763+
{
51764+
"source_path": "articles/jenkins/overview.md",
51765+
"redirect_url": "/azure/developer/jenkins/overview",
51766+
"redirect_document_id": false
51767+
},
5174351768
{
5174451769
"source_path": "articles/terraform/terraform-backend.md",
5174551770
"redirect_url": "/azure/developer/terraform/store-state-in-azure-storage",
@@ -51851,7 +51876,7 @@
5185151876
"redirect_document_id": false
5185251877
},
5185351878
{
51854-
"source_path": "articles/terraform/index",
51879+
"source_path": "articles/terraform/index.yml",
5185551880
"redirect_url": "/azure/developer/terraform/",
5185651881
"redirect_document_id": false
5185751882
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ The following providers offer FIDO2 security keys of different form factors that
116116
| eWBM | [https://www.ewbm.com/support](https://www.ewbm.com/support) |
117117
| AuthenTrend | [https://authentrend.com/about-us/#pg-35-3](https://authentrend.com/about-us/#pg-35-3) |
118118
| Gemalto (Thales Group) | [https://safenet.gemalto.com/multi-factor-authentication/authenticators/passwordless-authentication/](https://safenet.gemalto.com/multi-factor-authentication/authenticators/passwordless-authentication/) |
119-
| OneSpan Inc. | [https://www.onespan.com/sites/default/files/2019-08/Digipass-SecureClick_datasheet.pdf](https://www.onespan.com/sites/default/files/2019-08/Digipass-SecureClick_datasheet.pdf) |
119+
| OneSpan Inc. | [https://www.onespan.com/sites/default/files/2019-01/OneSpan-FIDO-Authentication.pdf](https://www.onespan.com/sites/default/files/2019-01/OneSpan-FIDO-Authentication.pdf) |
120120
| IDmelon Technologies Inc. | [https://www.idmelon.com/#idmelon](https://www.idmelon.com/#idmelon) |
121121

122122
> [!NOTE]

articles/active-directory/develop/msal-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ MSAL can be used in many application scenarios, including the following:
5151
| [MSAL.js](https://github.com/AzureAD/microsoft-authentication-library-for-js)| JavaScript/TypeScript frameworks such as AngularJS, Ember.js, or Durandal.js|
5252
| [MSAL for Android](https://github.com/AzureAD/microsoft-authentication-library-for-android)|Android|
5353
| [MSAL for iOS and macOS](https://github.com/AzureAD/microsoft-authentication-library-for-objc)|iOS and macOS|
54-
| [MSAL Java (preview)](https://github.com/AzureAD/microsoft-authentication-library-for-java)|Java|
55-
| [MSAL Python (preview)](https://github.com/AzureAD/microsoft-authentication-library-for-python)|Python|
54+
| [MSAL Java](https://github.com/AzureAD/microsoft-authentication-library-for-java)|Windows, macOS, Linux|
55+
| [MSAL Python](https://github.com/AzureAD/microsoft-authentication-library-for-python)|Windows, macOS, Linux|
5656

5757
## Differences between ADAL and MSAL
5858

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,12 @@ This tutorial demonstrates how an Angular single-page application (SPA) can:
3232

3333
![Diagram that shows how the sample app generated in this tutorial works](media/active-directory-develop-guidedsetup-javascriptspa-introduction/javascriptspa-intro.svg)
3434

35-
<!--start-collapse-->
3635
### More information
3736

3837
The sample application created in this tutorial enables an Angular SPA to query the Microsoft Graph API or a web API that accepts tokens from the Microsoft identity platform endpoint. The MSAL for Angular library is a wrapper of the core MSAL.js library. It enables Angular (6+) applications to authenticate enterprise users by using Microsoft Azure Active Directory, Microsoft account users, and social identity users (such as Facebook, Google, and LinkedIn). The library also enables the applications to get access to Microsoft cloud services or Microsoft Graph.
3938

4039
In this scenario, after a user signs in, an access token is requested and added to HTTP requests through the authorization header. Token acquisition and renewal are handled by MSAL.
4140

42-
<!--end-collapse-->
43-
44-
<!--start-collapse-->
4541
### Libraries
4642

4743
This tutorial uses the following library:
@@ -52,9 +48,6 @@ This tutorial uses the following library:
5248

5349
You can find the source code for the MSAL.js library in the [AzureAD/microsoft-authentication-library-for-js](https://github.com/AzureAD/microsoft-authentication-library-for-js) repository on GitHub.
5450

55-
<!--end-collapse-->
56-
57-
5851
## Prerequisites
5952

6053
To run this tutorial, you need:
@@ -331,10 +324,7 @@ The first time that you start to sign in to your application, you're prompted to
331324

332325
![The "Permissions requested" window](media/active-directory-develop-guidedsetup-javascriptspa-test/javascriptspaconsent.png)
333326

334-
335-
336-
<!--start-collapse-->
337-
### Add scopes and delegated permissions
327+
## Add scopes and delegated permissions
338328

339329
The Microsoft Graph API requires the *user.read* scope to read a user's profile. By default, this scope is automatically added in every application that's registered on the registration portal. Other APIs for Microsoft Graph, as well as custom APIs for your back-end server, might require additional scopes. For example, the Microsoft Graph API requires the *Calendars.Read* scope in order to list the user's calendars.
340330
@@ -345,8 +335,6 @@ To access the user's calendars in the context of an application, add the *Calend
345335

346336
If a back-end API doesn't require a scope (not recommended), you can use *clientId* as the scope in the calls to acquire tokens.
347337
348-
<!--end-collapse-->
349-
350338
[!INCLUDE [Help and support](../../../includes/active-directory-develop-help-support-include.md)]
351339
352340
## Next steps

articles/active-directory/develop/tutorial-v2-asp-webapp.md

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ This section describes how to install and configure the authentication pipeline
6666
Install-Package Microsoft.Owin.Host.SystemWeb
6767
```
6868
69-
<!--start-collapse-->
70-
> ### About these libraries
71-
> These libraries enable single sign-on (SSO) by using OpenID Connect through cookie-based authentication. After authentication is completed and the token representing the user is sent to your application, OWIN middleware creates a session cookie. The browser then uses this cookie on subsequent requests so that the user doesn't have to retype the password, and no additional verification is needed.
72-
<!--end-collapse-->
69+
### About these libraries
70+
These libraries enable single sign-on (SSO) by using OpenID Connect through cookie-based authentication. After authentication is completed and the token representing the user is sent to your application, OWIN middleware creates a session cookie. The browser then uses this cookie on subsequent requests so that the user doesn't have to retype the password, and no additional verification is needed.
7371
7472
## Configure the authentication pipeline
7573
@@ -167,10 +165,9 @@ The following steps are used to create an OWIN middleware Startup class to confi
167165
> Setting `ValidateIssuer = false` is a simplification for this quickstart. In real applications, you must validate the issuer.
168166
> See the samples to learn how to do that.
169167
170-
<!--start-collapse-->
171-
> ### More information
172-
> The parameters you provide in *OpenIDConnectAuthenticationOptions* serve as coordinates for the application to communicate with Microsoft identity platform. Because the OpenID Connect middleware uses cookies in the background, you must also set up cookie authentication as the preceding code shows. The *ValidateIssuer* value tells OpenIdConnect not to restrict access to one specific organization.
173-
<!--end-collapse-->
168+
### More information
169+
170+
The parameters you provide in *OpenIDConnectAuthenticationOptions* serve as coordinates for the application to communicate with Microsoft identity platform. Because the OpenID Connect middleware uses cookies in the background, you must also set up cookie authentication as the preceding code shows. The *ValidateIssuer* value tells OpenIdConnect not to restrict access to one specific organization.
174171
175172
## Add a controller to handle sign-in and sign-out requests
176173
@@ -262,10 +259,8 @@ In Visual Studio, create a new view to add the sign-in button and to display use
262259
</html>
263260
```
264261
265-
<!--start-collapse-->
266-
> ### More information
267-
> This page adds a sign-in button in SVG format with a black background:<br/>![Sign in with Microsoft](media/active-directory-develop-guidedsetup-aspnetwebapp-use/aspnetsigninbuttonsample.png)<br/> For more sign-in buttons, go to the [Branding guidelines](https://docs.microsoft.com/azure/active-directory/develop/active-directory-branding-guidelines "Branding guidelines").
268-
<!--end-collapse-->
262+
### More information
263+
This page adds a sign-in button in SVG format with a black background:<br/>![Sign in with Microsoft](media/active-directory-develop-guidedsetup-aspnetwebapp-use/aspnetsigninbuttonsample.png)<br/> For more sign-in buttons, go to the [Branding guidelines](https://docs.microsoft.com/azure/active-directory/develop/active-directory-branding-guidelines "Branding guidelines").
269264
270265
## Add a controller to display user's claims
271266
This controller demonstrates the uses of the `[Authorize]` attribute to protect a controller. This attribute restricts access to the controller by allowing only authenticated users. The following code makes use of the attribute to display user claims that were retrieved as part of sign-in:
@@ -305,10 +300,8 @@ This controller demonstrates the uses of the `[Authorize]` attribute to protect
305300
}
306301
```
307302
308-
<!--start-collapse-->
309-
> ### More information
310-
> Because of the use of the `[Authorize]` attribute, all methods of this controller can be executed only if the user is authenticated. If the user isn't authenticated and tries to access the controller, OWIN initiates an authentication challenge and forces the user to authenticate. The preceding code looks at the list of claims for specific user attributes included in the user’s Id token. These attributes include the user’s full name and username, as well as the global user identifier subject. It also contains the *Tenant ID*, which represents the ID for the user’s organization.
311-
<!--end-collapse-->
303+
### More information
304+
Because of the use of the `[Authorize]` attribute, all methods of this controller can be executed only if the user is authenticated. If the user isn't authenticated and tries to access the controller, OWIN initiates an authentication challenge and forces the user to authenticate. The preceding code looks at the list of claims for specific user attributes included in the user’s Id token. These attributes include the user’s full name and username, as well as the global user identifier subject. It also contains the *Tenant ID*, which represents the ID for the user’s organization.
312305
313306
## Create a view to display the user's claims
314307
@@ -399,16 +392,16 @@ When you're ready to run your test, use an Azure AD account (work or school acco
399392
<br/><br/>
400393
![Sign in to your Microsoft account](media/active-directory-develop-guidedsetup-aspnetwebapp-test/aspnetbrowsersignin2.png)
401394
402-
<!--start-collapse-->
403-
> ### Permissions and consent in the Microsoft identity platform endpoint
404-
> Applications that integrate with Microsoft identity platform follow an authorization model that gives users and administrators control over how data can be accessed. After a user authenticates with Microsoft identity platform to access this application, they will be prompted to consent to the permissions requested by the application ("View your basic profile" and "Maintain access to data you have given it access to"). After accepting these permissions, the user will continue on to the application results. However, the user may instead be prompted with a **Need admin consent** page if either of the following occur:
405-
> > - The application developer adds any additional permissions that require **Admin consent**.
406-
> > - Or the tenant is configured (in **Enterprise Applications -> User Settings**) where users cannot consent to apps accessing company data on their behalf.
407-
>
408-
> For more information, refer to [Permissions and consent in the Microsoft identity platform endpoint](https://docs.microsoft.com/azure/active-directory/develop/v2-permissions-and-consent).
409-
<!--end-collapse-->
395+
#### Permissions and consent in the Microsoft identity platform endpoint
396+
397+
Applications that integrate with Microsoft identity platform follow an authorization model that gives users and administrators control over how data can be accessed. After a user authenticates with Microsoft identity platform to access this application, they will be prompted to consent to the permissions requested by the application ("View your basic profile" and "Maintain access to data you have given it access to"). After accepting these permissions, the user will continue on to the application results. However, the user may instead be prompted with a **Need admin consent** page if either of the following occur:
410398
411-
#### View application results
399+
- The application developer adds any additional permissions that require **Admin consent**.
400+
- Or the tenant is configured (in **Enterprise Applications -> User Settings**) where users cannot consent to apps accessing company data on their behalf.
401+
402+
For more information, refer to [Permissions and consent in the Microsoft identity platform endpoint](https://docs.microsoft.com/azure/active-directory/develop/v2-permissions-and-consent).
403+
404+
### View application results
412405
413406
After you sign in, the user is redirected to the home page of your website. The home page is the HTTPS URL that's specified in your application registration info in the Microsoft Application Registration Portal. The home page includes a *"Hello \<user>"* welcome message, a link to sign out, and a link to view the user’s claims. The link for the user's claims connects to the Claims controller that you created earlier.
414407
@@ -442,14 +435,13 @@ You're prompted to authenticate to use the protected controller view.
442435
443436
## Advanced options
444437
445-
<!--start-collapse-->
446438
### Protect your entire website
439+
447440
To protect your entire website, in the **Global.asax** file, add the `AuthorizeAttribute` attribute to the `GlobalFilters` filter in the `Application_Start` method:
448441
449442
```csharp
450443
GlobalFilters.Filters.Add(new AuthorizeAttribute());
451444
```
452-
<!--end-collapse-->
453445

454446
### Restrict who can sign in to your application
455447

0 commit comments

Comments
 (0)