Skip to content

Commit d6dbd24

Browse files
authored
Merge pull request #250242 from MicrosoftDocs/main
9/4/2023 PM Publish
2 parents d22d41f + ef0fb80 commit d6dbd24

File tree

84 files changed

+300
-158
lines changed

Some content is hidden

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

84 files changed

+300
-158
lines changed

articles/app-service/app-service-key-vault-references.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: cephalin
55

66
ms.topic: article
77
ms.date: 07/31/2023
8-
ms.author: mahender
8+
ms.author: cephalin
99
ms.custom: seodec18, AppServiceConnectivity
1010

1111
---

articles/app-service/app-service-sql-asp-github-actions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: "Tutorial: Use GitHub Actions to deploy to App Service and connect to a database"
33
description: Deploy a database-backed ASP.NET core app to Azure with GitHub Actions
4+
author: cephalin
45
ms.devlang: csharp
56
ms.topic: tutorial
67
ms.date: 01/09/2023

articles/app-service/app-service-sql-github-actions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: "Tutorial: Use GitHub Actions to deploy to an App Service custom container and connect to a database"
33
description: Learn how to deploy an ASP.NET core app to Azure and to Azure SQL Database with GitHub Actions
4+
author: cephalin
45
ms.devlang: csharp
56
ms.topic: tutorial
67
ms.date: 01/09/2023

articles/app-service/app-service-web-tutorial-dotnet-sqldatabase.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ ms.devlang: csharp
66
ms.topic: tutorial
77
ms.date: 01/27/2022
88
ms.custom: devx-track-csharp, mvc, devcenter, vs-azure, seodec18, AppServiceConnectivity
9+
author: cephalin
10+
ms.author: cephalin
911
---
1012

1113
# Tutorial: Deploy an ASP.NET app to Azure with Azure SQL Database
@@ -260,7 +262,7 @@ Run a few commands to make updates to your local database.
260262
261263
1. Type `Ctrl+F5` to run the app. Test the edit, details, and create links.
262264
263-
If the application loads without errors, then Code First Migrations has succeeded. However, your page still looks the same because your application logic is not using this new property yet.
265+
If the application loads without errors, then Code First Migrations has succeeded. However, your page still looks the same because your application logic isn't using this new property yet.
264266
265267
#### Use the new property
266268
@@ -340,7 +342,7 @@ Now that you enabled Code First Migrations in your Azure app, publish your code
340342
341343
![Azure app after Code First Migration](./media/app-service-web-tutorial-dotnet-sqldatabase/this-one-is-done.png)
342344
343-
All your existing to-do items are still displayed. When you republish your ASP.NET application, existing data in your SQL Database is not lost. Also, Code First Migrations only changes the data schema and leaves your existing data intact.
345+
All your existing to-do items are still displayed. When you republish your ASP.NET application, existing data in your SQL Database isn't lost. Also, Code First Migrations only changes the data schema and leaves your existing data intact.
344346
345347
## Stream application logs
346348
@@ -377,7 +379,7 @@ Each action starts with a `Trace.WriteLine()` method. This code is added to show
377379
> [!TIP]
378380
> You can experiment with different trace levels to see what types of messages are displayed for each level. For example, the **Information** level includes all logs created by `Trace.TraceInformation()`, `Trace.TraceWarning()`, and `Trace.TraceError()`, but not logs created by `Trace.WriteLine()`.
379381
380-
1. In your browser navigate to your app again at *http://<your app name>.azurewebsites.net*, then try clicking around the to-do list application in Azure. The trace messages are now streamed to the **Output** window in Visual Studio.
382+
1. In your browser, navigate to your app again at *http://<your app name>.azurewebsites.net*, then try clicking around the to-do list application in Azure. The trace messages are now streamed to the **Output** window in Visual Studio.
381383
382384
```console
383385
Application: 2017-04-06T23:30:41 PID[8132] Verbose GET /Todos/Index

articles/app-service/app-service-web-tutorial-rest-api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ms.topic: tutorial
77
ms.date: 01/31/2023
88
ms.custom: "UpdateFrequency3, devx-track-csharp, mvc, devcenter, devx-track-azurecli"
99
ms.author: msangapu
10+
author: msangapu-msft
1011
---
1112

1213
# Tutorial: Host a RESTful API with CORS in Azure App Service

articles/app-service/configure-authentication-api-version.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ description: Upgrade your App Service authentication API to V2 or pin it to a sp
44
ms.topic: article
55
ms.date: 02/17/2023
66
ms.custom: seodec18, devx-track-azurecli, AppServiceIdentity
7+
author: cephalin
8+
ms.author: cephalin
79
---
810

911
# Manage the API and runtime versions of App Service authentication
@@ -17,17 +19,17 @@ There are two versions of the management API for App Service authentication. The
1719
> [!WARNING]
1820
> Migration to V2 will disable management of the App Service Authentication/Authorization feature for your application through some clients, such as its existing experience in the Azure portal, Azure CLI, and Azure PowerShell. This cannot be reversed.
1921
20-
The V2 API does not support creation or editing of Microsoft Account as a distinct provider as was done in V1. Rather, it leverages the converged [Microsoft identity platform](../active-directory/develop/v2-overview.md) to sign-in users with both Azure AD and personal Microsoft accounts. When switching to the V2 API, the V1 Azure Active Directory (Azure AD) configuration is used to configure the Microsoft identity platform provider. The V1 Microsoft Account provider will be carried forward in the migration process and continue to operate as normal, but it is recommended that you move to the newer Microsoft Identity Platform model. See [Support for Microsoft Account provider registrations](#support-for-microsoft-account-provider-registrations) to learn more.
22+
The V2 API doesn't support creation or editing of Microsoft Account as a distinct provider as was done in V1. Rather, it uses the converged [Microsoft identity platform](../active-directory/develop/v2-overview.md) to sign-in users with both Azure AD and personal Microsoft accounts. When switching to the V2 API, the V1 Azure Active Directory (Azure AD) configuration is used to configure the Microsoft identity platform provider. The V1 Microsoft Account provider will be carried forward in the migration process and continue to operate as normal, but you should move to the newer Microsoft Identity Platform model. See [Support for Microsoft Account provider registrations](#support-for-microsoft-account-provider-registrations) to learn more.
2123

2224
The automated migration process will move provider secrets into application settings and then convert the rest of the configuration into the new format. To use the automatic migration:
2325

2426
1. Navigate to your app in the portal and select the **Authentication** menu option.
2527
1. If the app is configured using the V1 model, you'll see an **Upgrade** button.
26-
1. Review the description in the confirmation prompt. If you're ready to perform the migration, click **Upgrade** in the prompt.
28+
1. Review the description in the confirmation prompt. If you're ready to perform the migration, select **Upgrade** in the prompt.
2729

2830
### Manually managing the migration
2931

30-
The following steps will allow you to manually migrate the application to the V2 API if you do not wish to use the automatic version mentioned above.
32+
The following steps will allow you to manually migrate the application to the V2 API if you don't wish to use the automatic version mentioned above.
3133

3234
#### Moving secrets to application settings
3335

@@ -63,9 +65,9 @@ The following steps will allow you to manually migrate the application to the V2
6365
> [!NOTE]
6466
> The application settings for this configuration should be marked as slot-sticky, meaning that they will not move between environments during a [slot swap operation](./deploy-staging-slots.md). This is because your authentication configuration itself is tied to the environment.
6567
66-
1. Create a new JSON file named `authsettings.json`. Take the output that you received previously and remove each secret value from it. Write the remaining output to the file, making sure that no secret is included. In some cases, the configuration may have arrays containing empty strings. Make sure that `microsoftAccountOAuthScopes` does not, and if it does, switch that value to `null`.
68+
1. Create a new JSON file named `authsettings.json`. Take the output that you received previously and remove each secret value from it. Write the remaining output to the file, making sure that no secret is included. In some cases, the configuration may have arrays containing empty strings. Make sure that `microsoftAccountOAuthScopes` doesn't, and if it does, switch that value to `null`.
6769

68-
1. Add a property to `authsettings.json` which points to the application setting name you created earlier for each provider:
70+
1. Add a property to `authsettings.json` that points to the application setting name you created earlier for each provider:
6971

7072
* Azure AD: `clientSecretSettingName`
7173
* Google: `googleClientSecretSettingName`
@@ -137,10 +139,10 @@ You've now migrated the app to store identity provider secrets as application se
137139

138140
#### Support for Microsoft Account provider registrations
139141

140-
If your existing configuration contains a Microsoft Account provider and does not contain an Azure AD provider, you can switch the configuration over to the Azure AD provider and then perform the migration. To do this:
142+
If your existing configuration contains a Microsoft Account provider and doesn't contain an Azure AD provider, you can switch the configuration over to the Azure AD provider and then perform the migration. To do this:
141143

142144
1. Go to [**App registrations**](https://portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationsListBlade) in the Azure portal and find the registration associated with your Microsoft Account provider. It may be under the "Applications from personal account" heading.
143-
1. Navigate to the "Authentication" page for the registration. Under "Redirect URIs" you should see an entry ending in `/.auth/login/microsoftaccount/callback`. Copy this URI.
145+
1. Navigate to the "Authentication" page for the registration. Under "Redirect URIs", you should see an entry ending in `/.auth/login/microsoftaccount/callback`. Copy this URI.
144146
1. Add a new URI that matches the one you just copied, except instead have it end in `/.auth/login/aad/callback`. This will allow the registration to be used by the App Service Authentication / Authorization configuration.
145147
1. Navigate to the App Service Authentication / Authorization configuration for your app.
146148
1. Collect the configuration for the Microsoft Account provider.

articles/app-service/configure-authentication-customize-sign-in-out.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ description: Use the built-in authentication and authorization in App Service an
44
ms.topic: article
55
ms.date: 03/29/2021
66
ms.custom: AppServiceIdentity
7+
author: cephalin
8+
ms.author: cephalin
79
---
810

911
# Customize sign-in and sign-out in Azure App Service authentication

articles/app-service/configure-authentication-file-based.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ description: Configure authentication and authorization in App Service using a c
44
ms.topic: article
55
ms.date: 07/15/2021
66
ms.custom: AppServiceIdentity
7+
author: cephalin
8+
ms.author: cephalin
79
---
810

911
# File-based configuration in Azure App Service authentication
1012

11-
With [App Service authentication](overview-authentication-authorization.md), the authentication settings can be configured with a file. You may need to use file-based configuration to use certain preview capabilities of App Service authentication / authorization before they are exposed via [Azure Resource Manager](../azure-resource-manager/management/overview.md) APIs.
13+
With [App Service authentication](overview-authentication-authorization.md), the authentication settings can be configured with a file. You may need to use file-based configuration to use certain preview capabilities of App Service authentication / authorization before they're exposed via [Azure Resource Manager](../azure-resource-manager/management/overview.md) APIs.
1214

1315
> [!IMPORTANT]
1416
> Remember that your app payload, and therefore this file, may move between environments, as with [slots](./deploy-staging-slots.md). It is likely you would want a different app registration pinned to each slot, and in these cases, you should continue to use the standard configuration method instead of using the configuration file.
@@ -17,7 +19,7 @@ With [App Service authentication](overview-authentication-authorization.md), the
1719

1820
1. Create a new JSON file for your configuration at the root of your project (deployed to D:\home\site\wwwroot in your web / function app). Fill in your desired configuration according to the [file-based configuration reference](#configuration-file-reference). If modifying an existing Azure Resource Manager configuration, make sure to translate the properties captured in the `authsettings` collection into your configuration file.
1921

20-
2. Modify the existing configuration, which is captured in the [Azure Resource Manager](../azure-resource-manager/management/overview.md) APIs under `Microsoft.Web/sites/<siteName>/config/authsettingsV2`. To modify this, you can use an [Azure Resource Manager template](../azure-resource-manager/templates/overview.md) or a tool like [Azure Resource Explorer](https://resources.azure.com/). Within the authsettingsV2 collection, you will need to set two properties (and may remove others):
22+
2. Modify the existing configuration, which is captured in the [Azure Resource Manager](../azure-resource-manager/management/overview.md) APIs under `Microsoft.Web/sites/<siteName>/config/authsettingsV2`. To modify it, you can use an [Azure Resource Manager template](../azure-resource-manager/templates/overview.md) or a tool like [Azure Resource Explorer](https://resources.azure.com/). Within the authsettingsV2 collection, set two properties (you may remove others):
2123

2224
1. Set `platform.enabled` to "true"
2325
2. Set `platform.configFilePath` to the name of the file (for example, "auth.json")
@@ -29,7 +31,7 @@ Once you have made this configuration update, the contents of the file will be u
2931

3032
## Configuration file reference
3133

32-
Any secrets that will be referenced from your configuration file must be stored as [application settings](./configure-common.md#configure-app-settings). You may name the settings anything you wish. Just make sure that the references from the configuration file uses the same keys.
34+
Any secrets that will be referenced from your configuration file must be stored as [application settings](./configure-common.md#configure-app-settings). You may name the settings anything you wish. Just make sure that the references from the configuration file use the same keys.
3335

3436
The following exhausts possible configuration options within the file:
3537

articles/app-service/configure-authentication-oauth-tokens.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ description: Learn how to retrieve tokens and refresh tokens and extend sessions
44
ms.topic: article
55
ms.date: 03/29/2021
66
ms.custom: AppServiceIdentity
7+
author: cephalin
8+
ms.author: cephalin
79
---
810

911
# Work with OAuth tokens in Azure App Service authentication

0 commit comments

Comments
 (0)