.NET 6.0 Update for Social Login Tutorials (#24242)

* Updated instructions and code snippets for social authentication in .net 6 (ms, facebook, google and twitter)

* Update microsoft-logins.md

Moniker issue is blocking the build, but a little strange since it looks OK to me.  Testing with a more explicit > 3.0 and < 6.0 range.

* Update microsoft-logins.md

Reverted back to original moniker that received a build warning.

* Update facebook-logins.md

Removed specific mention of 3.0

* Update google-logins.md

Removed specific mention of 3.0

* Update microsoft-logins.md

Removed specific mention of 3.0

* Update twitter-logins.md

Removed specific mention of 3.0

* .NET 6 update Social Login Tutorials

* Edit pass

Co-authored-by: Johan Danforth <[email protected]>

Author: wadepickett

aspnetcore/security/authentication/social/facebook-logins.md

@@ -4,7 +4,7 @@ author: rick-anderson
 description: Tutorial with code examples demonstrating the integration of Facebook account user authentication into an existing ASP.NET Core app.
 ms.author: riande
 ms.custom: "seoapril2019, mvc, seodec18"
-ms.date: 03/19/2020
+ms.date: 12/08/2021
 monikerRange: '>= aspnetcore-3.0'
 no-loc: [Home, Privacy, Kestrel, appsettings.json, "ASP.NET Core Identity", cookie, Cookie, Blazor, "Blazor Server", "Blazor WebAssembly", "Identity", "Let's Encrypt", Razor, SignalR]
 uid: security/authentication/facebook-logins
@@ -17,31 +17,32 @@ By [Valeriy Novytskyy](https://github.com/01binary) and [Rick Anderson](https://
 <!-- per @rick-anderson and scott addie, don't update images. Remove images and point the customer to the FB set up page. FB needs to maintain  instructions to get key and secret.
 -->
 
-This tutorial with code examples shows how to enable your users to sign in with their Facebook account using a sample ASP.NET Core 3.0 project created on the [previous page](xref:security/authentication/social/index). We start by creating a Facebook App ID by following the [official steps](https://developers.facebook.com).
+This tutorial with code examples shows how to enable your users to sign in with their Facebook account using a sample ASP.NET Core project created on the [previous page](xref:security/authentication/social/index). We start by creating a Facebook App ID by following the [official steps](https://developers.facebook.com).
 
 ## Create the app in Facebook
 
 * Add the [Microsoft.AspNetCore.Authentication.Facebook](https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication.Facebook) NuGet package to the project.
 
 * Navigate to the [Facebook Developers app](https://developers.facebook.com/apps/) page and sign in. If you don't already have a Facebook account, use the **Sign up for Facebook** link on the login page to create one.  Once you have a Facebook account, follow the instructions to register as a Facebook Developer.
 
-* From the **My Apps** menu select **Create App** to create a new App ID.
-
+* From the **My Apps** menu select **Create App**. The **Create an app** form appears.
    ![Facebook for developers portal open in Microsoft Edge](index/_static/FBMyApps.png)
 
-* Fill out the form and tap the **Create App ID** button.
+* Select an app type that best fits your project. For this project, select **Consumer**, and then **Next**. A new App ID is created.
+
+* Fill out the form and tap the **Create App** button.
 
   ![Create a New App ID form](index/_static/FBNewAppId.png)
 
-* On the new App card, select **Add a Product**.  On the **Facebook Login** card, click **Set Up** 
+* On the **Add Products to Your App** page, select **Set Up** on the **Facebook Login** card.
 
   ![Product Setup page](index/_static/FBProductSetup.png)
 
 * The **Quickstart** wizard launches with **Choose a Platform** as the first page. Bypass the wizard for now by clicking the **FaceBook Login** **Settings** link in the menu on the lower left:
 
   ![Skip Quick Start](index/_static/FBSkipQuickStart.png)
 
-* You are presented with the **Client OAuth Settings** page:
+* The **Client OAuth Settings** page is presented:
 
   ![Client OAuth Settings page](index/_static/FBOAuthSetup.png)
 
@@ -50,13 +51,13 @@ This tutorial with code examples shows how to enable your users to sign in with
 > [!NOTE]
 > The URI */signin-facebook* is set as the default callback of the Facebook authentication provider. You can change the default callback URI while configuring the Facebook authentication middleware via the inherited [RemoteAuthenticationOptions.CallbackPath](/dotnet/api/microsoft.aspnetcore.authentication.remoteauthenticationoptions.callbackpath) property of the [FacebookOptions](/dotnet/api/microsoft.aspnetcore.authentication.facebook.facebookoptions) class.
 
-* Click **Save Changes**.
+* Select **Save Changes**.
 
-* Click **Settings** > **Basic** link in the left navigation.
+* Select **Settings** > **Basic** link in the left navigation.
 
-  On this page, make a note of your `App ID` and your `App Secret`. You will add both into your ASP.NET Core application in the next section:
+* Make a note of your `App ID` and your `App Secret`. You will add both into your ASP.NET Core application in the next section:
 
-* When deploying the site you need to revisit the **Facebook Login** setup page and register a new public URI.
+* When deploying the site you need to revisit the **Facebook Login** setup page, and register a new public URI.
 
 ## Store the Facebook app ID and secret
 
@@ -74,7 +75,9 @@ Store sensitive settings such as the Facebook app ID and secret values with [Sec
 
 ## Configure Facebook Authentication
 
-Add the Facebook service in the `ConfigureServices` method in the *Startup.cs* file:
+::: moniker range="< aspnetcore-6.0"
+
+Add the Authentication service to the `Startup.ConfigureServices`:
 
 ```csharp
 services.AddAuthentication().AddFacebook(facebookOptions =>
@@ -84,6 +87,16 @@ services.AddAuthentication().AddFacebook(facebookOptions =>
 });
 ```
 
+::: moniker-end
+
+::: moniker range=">= aspnetcore-6.0"
+
+Add the Authentication service to the `Program`:
+
+[!code-csharp[](~/security/authentication/social/social-code/6.x/ProgramFacebook.cs)]
+
+::: moniker-end
+
 [!INCLUDE [default settings configuration](includes/default-settings.md)]
 
 ## Sign in with Facebook
@@ -106,7 +119,7 @@ The following code sets the `AccessDeniedPath` to `"/AccessDeniedPathInfo"`:
 
 [!code-csharp[](~/security/authentication/social/social-code/StartupAccessDeniedPath.cs?name=snippetFB)]
 
-We recommend the `AccessDeniedPath` page contain the following information:
+We recommend the `AccessDeniedPath` page contains the following information:
 
 *  Remote authentication was canceled.
 * This app requires authentication.
@@ -124,7 +137,7 @@ We recommend the `AccessDeniedPath` page contain the following information:
 
 [!INCLUDE[](includes/chain-auth-providers.md)]
 
-See the [FacebookOptions](/dotnet/api/microsoft.aspnetcore.builder.facebookoptions) API reference for more information on configuration options supported by Facebook authentication. Configuration options can be used to:
+ For more information on configuration options supported by Facebook authentication, see the [FacebookOptions](/dotnet/api/microsoft.aspnetcore.builder.facebookoptions) API reference. Configuration options can be used to:
 
 * Request different information about the user.
 * Add query string arguments to customize the login experience.

aspnetcore/security/authentication/social/google-logins.md

@@ -12,17 +12,36 @@ uid: security/authentication/google-logins
 
 By [Valeriy Novytskyy](https://github.com/01binary) and [Rick Anderson](https://twitter.com/RickAndMSFT)
 
-This tutorial shows you how to enable users to sign in with their Google account using the ASP.NET Core 3.0 project created on the [previous page](xref:security/authentication/social/index).
+This tutorial shows you how to enable users to sign in with their Google account using the ASP.NET Core project created on the [previous page](xref:security/authentication/social/index).
 
 ## Create a Google API Console project and client ID
 
 * Add the [Microsoft.AspNetCore.Authentication.Google](https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication.Google) NuGet package to the app.
+
 * Follow the guidance in [Integrating Google Sign-In into your web app](https://developers.google.com/identity/sign-in/web/sign-in) (Google documentation).
-* In the **Credentials** page of the [Google console](https://console.developers.google.com/apis/credentials), select **CREATE CREDENTIALS** > **OAuth client ID**.
-* In the **Application type** dialog, select **Web application**. Provide a **Name** for the app.
+
+* Go to [Google API & Services](https://console.cloud.google.com/apis).
+
+* A **Project** must exist first, you may have to create one. Just a name is required. Once a project is selected, you will enter the **Dashboard**.
+
+* In the **Oauth consent screen** of the **Dashboard**: 
+  * Select **User Type - External** and **CREATE**.
+  * In the **App information** dialog, Provide an **app name** for the app, **user support email**, and **developer contact information**.
+  * Step through the **Scopes** step.
+  * Step through the **Test users** step.
+  * Review the **OAuth consent screen** and go back to the app **Dashboard**.
+
+
+* In the **Credentials** tab of the application Dashboard, select **CREATE CREDENTIALS** > **OAuth client ID**.
+
+* Select **Application type** > **Web application**, choose a **name**.
+
 * In the **Authorized redirect URIs** section, select **ADD URI** to set the redirect URI. Example redirect URI: `https://localhost:{PORT}/signin-google`, where the `{PORT}` placeholder is the app's port.
+
 * Select the **CREATE** button.
+
 * Save the **Client ID** and **Client Secret** for use in the app's configuration.
+
 * When deploying the site, either:
   * Update the app's redirect URI in the **Google Console** to the app's deployed redirect URI.
   * Create a new Google API registration in the **Google Console** for the production app with its production redirect URI.
@@ -45,23 +64,35 @@ You can manage your API credentials and usage in the [API Console](https://conso
 
 ## Configure Google authentication
 
-Add the Google service to `Startup.ConfigureServices`:
+::: moniker range="< aspnetcore-6.0"
+
+Add the Authentication service to the `Startup.ConfigureServices`:
 
 [!code-csharp[](~/security/authentication/social/social-code/3.x/StartupGoogle3x.cs?highlight=11-19)]
 
+::: moniker-end
+
+::: moniker range=">= aspnetcore-6.0"
+
+Add the Authentication service to the `Program`:
+
+[!code-csharp[](~/security/authentication/social/social-code/6.x/ProgramGoogle.cs)]
+
+::: moniker-end
+
 [!INCLUDE [default settings configuration](includes/default-settings2-2.md)]
 
 ## Sign in with Google
 
-* Run the app and click **Log in**. An option to sign in with Google appears.
-* Click the **Google** button, which redirects to Google for authentication.
+* Run the app and select **Log in**. An option to sign in with Google appears.
+* Select the **Google** button, which redirects to Google for authentication.
 * After entering your Google credentials, you are redirected back to the web site.
 
 [!INCLUDE[Forward request information when behind a proxy or load balancer section](includes/forwarded-headers-middleware.md)]
 
 [!INCLUDE[](includes/chain-auth-providers.md)]
 
-See the <xref:Microsoft.AspNetCore.Authentication.Google.GoogleOptions> API reference for more information on configuration options supported by Google authentication. This can be used to request different information about the user.
+For more information on configuration options supported by Google authentication, see the <xref:Microsoft.AspNetCore.Authentication.Google.GoogleOptions> API reference . This can be used to request different information about the user.
 
 ## Change the default callback URI
 
@@ -70,7 +101,7 @@ The URI segment `/signin-google` is set as the default callback of the Google au
 ## Troubleshooting
 
 * If the sign-in doesn't work and you aren't getting any errors, switch to development mode to make the issue easier to debug.
-* If Identity isn't configured by calling `services.AddIdentity` in `ConfigureServices`, attempting to authenticate results in *ArgumentException: The 'SignInScheme' option must be provided*. The project template used in this tutorial ensures that this is done.
+* If Identity isn't configured by calling `services.AddIdentity` in `ConfigureServices`, attempting to authenticate results in *ArgumentException: The 'SignInScheme' option must be provided*. The project template used in this tutorial ensures Identity is configured.
 * If the site database has not been created by applying the initial migration, you get *A database operation failed while processing the request* error. Select **Apply Migrations** to create the database, and refresh the page to continue past the error.
 
 ## Next steps

aspnetcore/security/authentication/social/index/_static/FBProductSetup.png

@@ -4,7 +4,7 @@ author: rick-anderson
 description: This sample demonstrates the integration of Microsoft account user authentication into an existing ASP.NET Core app.
 ms.author: riande
 ms.custom: mvc
-ms.date: 03/19/2020
+ms.date: 12/08/2021
 monikerRange: '>= aspnetcore-3.1'
 no-loc: [Home, Privacy, Kestrel, appsettings.json, "ASP.NET Core Identity", cookie, Cookie, Blazor, "Blazor Server", "Blazor WebAssembly", "Identity", "Let's Encrypt", Razor, SignalR]
 uid: security/authentication/microsoft-logins
@@ -15,7 +15,7 @@ By [Valeriy Novytskyy](https://github.com/01binary) and [Rick Anderson](https://
 
 :::moniker range=">= aspnetcore-6.0"
 
-This sample shows you how to enable users to sign in with their work, school, or personal Microsoft account using the ASP.NET Core 3.0 project created on the [previous page](xref:security/authentication/social/index).
+This sample shows you how to enable users to sign in with their work, school, or personal Microsoft account using the ASP.NET Core 6.0 project created on the [previous page](xref:security/authentication/social/index).
 
 ## Create the app in Microsoft Developer Portal
 
@@ -58,19 +58,19 @@ Store sensitive settings such as the Microsoft **Application (client) ID** found
 
 ## Configure Microsoft Account Authentication
 
-Add the Microsoft Account service to the `Startup.ConfigureServices`:
+Add the Authentication service to the `Program`:
 
-:::code language="csharp" source="~/security/authentication/social/social-code/3.x/StartupMS3x.cs" id="snippet" highlight="10-14":::
+[!code-csharp[](~/security/authentication/social/social-code/6.x/ProgramMS.cs)]
 
 [!INCLUDE [default settings configuration](includes/default-settings.md)]
 
 For more information about configuration options supported by Microsoft Account authentication, see the [MicrosoftAccountOptions](/dotnet/api/microsoft.aspnetcore.builder.microsoftaccountoptions) API reference. This can be used to request different information about the user.
 
 ## Sign in with Microsoft Account
 
-Run the app and click **Log in**. An option to sign in with Microsoft appears. When you click on Microsoft, you are redirected to Microsoft for authentication. After signing in with your Microsoft Account, you will be prompted to let the app access your info:
-
-Tap **Yes** and you will be redirected back to the web site where you can set your email.
+* Run the app and select **Log in**. An option to sign in with Microsoft appears.
+* Select to sign in with Microsoft. You are redirected to Microsoft for authentication. After signing in with your Microsoft Account, you will be prompted to let the app access your info:
+* Select **Yes**. You are redirected back to the web site where you can set your email.
 
 You are now logged in using your Microsoft credentials:
 
@@ -83,7 +83,9 @@ You are now logged in using your Microsoft credentials:
 * If the Microsoft Account provider redirects you to a sign in error page, note the error title and description query string parameters directly following the `#` (hashtag) in the Uri.
 
   Although the error message seems to indicate a problem with Microsoft authentication, the most common cause is your application Uri not matching any of the **Redirect URIs** specified for the **Web** platform.
+
 * If Identity isn't configured by calling `services.AddIdentity` in `ConfigureServices`, attempting to authenticate will result in *ArgumentException: The 'SignInScheme' option must be provided*. The project template used in this sample ensures that this is done.
+
 * If the site database has not been created by applying the initial migration, you will get *A database operation failed while processing the request* error. Tap **Apply Migrations** to create the database and refresh to continue past the error.
 
 ## Next steps
@@ -149,7 +151,7 @@ For more information about configuration options supported by Microsoft Account
 
 ## Sign in with Microsoft Account
 
-Run the app and click **Log in**. An option to sign in with Microsoft appears. When you click on Microsoft, you are redirected to Microsoft for authentication. After signing in with your Microsoft Account, you will be prompted to let the app access your info:
+Run the app and select **Log in**. An option to sign in with Microsoft appears. When you select on Microsoft, you are redirected to Microsoft for authentication. After signing in with your Microsoft Account, you will be prompted to let the app access your info:
 
 Tap **Yes** and you will be redirected back to the web site where you can set your email.
 

aspnetcore/security/authentication/social/microsoft-logins.md

@@ -0,0 +1,9 @@
+var builder = WebApplication.CreateBuilder(args);
+var services = builder.Services;
+var configuration = builder.Configuration;
+
+services.AddAuthentication().AddFacebook(facebookOptions =>
+    {
+        facebookOptions.AppId = configuration["Authentication:Facebook:AppId"];
+        facebookOptions.AppSecret = configuration["Authentication:Facebook:AppSecret"];
+    });

aspnetcore/security/authentication/social/social-code/6.x/ProgramFacebook.cs

@@ -0,0 +1,9 @@
+var builder = WebApplication.CreateBuilder(args);
+var services = builder.Services;
+var configuration = builder.Configuration;
+
+services.AddAuthentication().AddGoogle(googleOptions =>
+    {
+        googleOptions.ClientId = configuration["Authentication:Google:ClientId"];
+        googleOptions.ClientSecret = configuration["Authentication:Google:ClientSecret"];
+    });

aspnetcore/security/authentication/social/social-code/6.x/ProgramGoogle.cs

@@ -0,0 +1,9 @@
+var builder = WebApplication.CreateBuilder(args);
+var services = builder.Services;
+var configuration = builder.Configuration;
+
+services.AddAuthentication().AddMicrosoftAccount(microsoftOptions =>
+    {
+        microsoftOptions.ClientId = configuration["Authentication:Microsoft:ClientId"];
+        microsoftOptions.ClientSecret = configuration["Authentication:Microsoft:ClientSecret"];
+    });

aspnetcore/security/authentication/social/social-code/6.x/ProgramMS.cs

@@ -0,0 +1,9 @@
+var builder = WebApplication.CreateBuilder(args);
+var services = builder.Services;
+var configuration = builder.Configuration;
+
+services.AddAuthentication().AddTwitter(twitterOptions =>
+    {
+        twitterOptions.ConsumerKey = configuration["Authentication:Twitter:ConsumerAPIKey"];
+        twitterOptions.ConsumerSecret = configuration["Authentication:Twitter:ConsumerSecret"];
+    });