Revert "[Fixes #17014] Add an auth-enabled template for Blazor WASM projects (#18354)" (#18516)

This reverts commit e64b8a9.

Author: javiercn

eng/Versions.props

@@ -204,10 +204,6 @@
     <SystemThreadingTasksExtensionsPackageVersion>4.5.2</SystemThreadingTasksExtensionsPackageVersion>
     <!-- Packages developed by @aspnet, but manually updated as necessary. -->
     <LibuvPackageVersion>1.10.0</LibuvPackageVersion>
-    <MicrosoftAspNetCoreIdentityUIPackageVersion>3.1.0</MicrosoftAspNetCoreIdentityUIPackageVersion>
-    <MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>3.1.0</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
-    <MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>3.1.0</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
-    <MicrosoftAspNetCoreComponentsAuthorizationPackageVersion>3.1.0</MicrosoftAspNetCoreComponentsAuthorizationPackageVersion>
     <MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion>
     <!-- Partner teams -->
     <MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion>

src/ProjectTemplates/BlazorWasm.ProjectTemplates/BlazorWasm-CSharp.Client.csproj.in

@@ -10,7 +10,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="${MicrosoftAspNetCoreBlazorBuildPackageVersion}" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="${MicrosoftAspNetCoreBlazorDevServerPackageVersion}" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="${MicrosoftAspNetCoreBlazorHttpClientPackageVersion}" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="${MicrosoftAspNetCoreComponentsAuthorizationPackageVersion}" Condition="'$(IndividualLocalAuth)' == 'true'" />
   </ItemGroup>
   <!--#if Hosted -->
   <ItemGroup>

src/ProjectTemplates/BlazorWasm.ProjectTemplates/BlazorWasm-CSharp.Server.csproj.in

@@ -13,21 +13,4 @@
     <ProjectReference Include="..\Shared\BlazorWasm-CSharp.Shared.csproj" />
   </ItemGroup>
 
-  <!--#if (IndividualLocalAuth && !UseLocalDB) -->
-  <ItemGroup>
-    <None Update="app.db" CopyToOutputDirectory="PreserveNewest" ExcludeFromSingleFile="true" />
-  </ItemGroup>
-
-  <!--#endif -->
-  <!--#if (IndividualLocalAuth) -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="${MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion}" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="${MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion}" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="${MicrosoftAspNetCoreIdentityUIPackageVersion}" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="${MicrosoftEntityFrameworkCoreSqlServerPackageVersion}" Condition="'$(UseLocalDB)' == 'True'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition="'$(UseLocalDB)' != 'True'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="${MicrosoftEntityFrameworkCoreToolsPackageVersion}" />
-  </ItemGroup>
-
-  <!--#endif -->
 </Project>

src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj

@@ -20,15 +20,9 @@
       MicrosoftAspNetCoreBlazorBuildPackageVersion=$(MicrosoftAspNetCoreBlazorBuildPackageVersion);
       MicrosoftAspNetCoreBlazorDevServerPackageVersion=$(MicrosoftAspNetCoreBlazorDevServerPackageVersion);
       MicrosoftAspNetCoreBlazorHttpClientPackageVersion=$(MicrosoftAspNetCoreBlazorHttpClientPackageVersion);
-      MicrosoftAspNetCoreBlazorServerPackageVersion=$(MicrosoftAspNetCoreBlazorServerPackageVersion);
-      MicrosoftAspNetCoreComponentsAuthorizationPackageVersion=$(MicrosoftAspNetCoreComponentsAuthorizationPackageVersion);
-      MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion=$(MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion);
-      MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion=$(MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion);
-      MicrosoftAspNetCoreIdentityUIPackageVersion=$(MicrosoftAspNetCoreIdentityUIPackageVersion);
-      MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion);
-      MicrosoftEntityFrameworkCoreSqlitePackageVersion=$(MicrosoftEntityFrameworkCoreSqlitePackageVersion);
-      MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion);
       MonoWebAssemblyInteropPackageVersion=$(MonoWebAssemblyInteropPackageVersion);
+      MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion);
+      MicrosoftAspNetCoreBlazorServerPackageVersion=$(MicrosoftAspNetCoreBlazorServerPackageVersion);
     </GeneratedContentProperties>
   </PropertyGroup>
 

src/ProjectTemplates/BlazorWasm.ProjectTemplates/content/BlazorWasm-CSharp/.template.config/dotnetcli.host.json

@@ -5,31 +5,11 @@
       "longName": "no-restore",
       "shortName": ""
     },
-    "Hosted": {
-      "longName": "hosted"
-    },
+      "Hosted": {
+        "longName": "hosted"
+      },
     "Framework": {
       "longName": "framework"
-    },
-    "UseLocalDB": {
-      "longName": "use-local-db"
-    },
-    "HttpPort": {
-      "isHidden": true
-    },
-    "HttpsPort": {
-      "isHidden": true
-    },
-    "ExcludeLaunchSettings": {
-      "longName": "exclude-launch-settings",
-      "shortName": ""
-    },
-    "UserSecretsId": {
-      "isHidden": true
-    },
-    "NoHttps": {
-      "longName": "no-https",
-      "shortName": ""
     }
   }
-}
+}

src/ProjectTemplates/BlazorWasm.ProjectTemplates/content/BlazorWasm-CSharp/.template.config/template.json

@@ -74,82 +74,6 @@
           "exclude": [
             "*.sln"
           ]
-        },
-        {
-          "condition": "(!IndividualLocalAuth || UseLocalDB)",
-          "exclude": [
-            "Server/app.db"
-          ]
-        },
-        {
-          "condition": "(!IndividualLocalAuth)",
-          "exclude": [
-            "Server/Data/SqlLite/**",
-            "Server/Data/SqlServer/**",
-            "Server/Data/ApplicationDbContext.cs",
-            "Server/Areas/**"
-          ]
-        },
-        {
-          "condition": "(IndividualLocalAuth && UseLocalDB)",
-          "rename": {
-            "Server/Data/SqlServer/": "Server/Data/Migrations/"
-          },
-          "exclude": [
-            "Server/Data/SqlLite/**"
-          ]
-        },
-        {
-          "condition": "(IndividualLocalAuth && !UseLocalDB)",
-          "rename": {
-            "Server/Data/SqlLite/": "Server/Data/Migrations/"
-          },
-          "exclude": [
-            "Server/Data/SqlServer/**"
-          ]
-        },
-        {
-          "condition": "(NoAuth && Hosted)",
-          "rename": {
-            "Client/Shared/MainLayout.NoAuth.razor": "Client/Shared/MainLayout.razor"
-          },
-          "exclude": [
-            "Client/Shared/LoginDisplay.*.razor",
-            "Client/Shared/MainLayout.Auth.razor"
-          ]
-        },
-        {
-          "condition": "(!Hosted)",
-          "rename": {
-            "Client/Shared/MainLayout.NoAuth.razor": "Shared/MainLayout.razor"
-          },
-          "exclude": [
-            "Client/Shared/LoginDisplay.*.razor",
-            "Client/Shared/MainLayout.Auth.razor"
-          ]
-        },
-        {
-          "condition": "(!NoAuth && Hosted)",
-          "rename": {
-            "Client/Shared/MainLayout.Auth.razor": "Client/Shared/MainLayout.razor"
-          },
-          "exclude": [
-            "Client/Shared/MainLayout.NoAuth.razor"
-          ]
-        },
-        {
-          "condition": "(IndividualLocalAuth)",
-          "rename": {
-            "Client/Shared/LoginDisplay.IndividualLocalAuth.razor": "Client/Shared/LoginDisplay.razor"
-          }
-        },
-        {
-          "condition": "(NoAuth)",
-          "exclude": [
-            "Client/Services/HostAuthenticationStateProvider.cs",
-            "Server/Controllers/UserController.cs",
-            "Shared/Authorization/*"
-          ]
         }
       ]
     }
@@ -183,111 +107,6 @@
       "datatype": "bool",
       "defaultValue": "false",
       "description": "If specified, includes an ASP.NET Core host for the Blazor app."
-    },
-    "auth": {
-      "type": "parameter",
-      "datatype": "choice",
-      "choices": [
-        {
-          "choice": "None",
-          "description": "No authentication"
-        },
-        {
-          "choice": "Individual",
-          "description": "Individual authentication"
-        }
-      ],
-      "defaultValue": "None",
-      "description": "The type of authentication to use"
-    },
-    "UserSecretsId": {
-      "type": "parameter",
-      "datatype": "string",
-      "replaces": "aspnet-BlazorServerWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502",
-      "defaultValue": "aspnet-BlazorServerWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502",
-      "description": "The ID to use for secrets (use with OrgReadAccess or Individual auth)."
-    },
-    "ExcludeLaunchSettings": {
-      "type": "parameter",
-      "datatype": "bool",
-      "defaultValue": "false",
-      "description": "Whether to exclude launchSettings.json from the generated template."
-    },
-    "HttpPort": {
-      "type": "parameter",
-      "datatype": "integer",
-      "description": "Port number to use for the HTTP endpoint in launchSettings.json."
-    },
-    "HttpPortGenerated": {
-      "type": "generated",
-      "generator": "port"
-    },
-    "HttpPortReplacer": {
-      "type": "generated",
-      "generator": "coalesce",
-      "parameters": {
-        "sourceVariableName": "HttpPort",
-        "fallbackVariableName": "HttpPortGenerated"
-      },
-      "replaces": "8080"
-    },
-    "HttpsPort": {
-      "type": "parameter",
-      "datatype": "integer",
-      "description": "Port number to use for the HTTPS endpoint in launchSettings.json. This option is only applicable when the parameter no-https is not used (no-https will be ignored if either IndividualAuth or OrganizationalAuth is used)."
-    },
-    "HttpsPortGenerated": {
-      "type": "generated",
-      "generator": "port",
-      "parameters": {
-        "low": 44300,
-        "high": 44399
-      }
-    },
-    "HttpsPortReplacer": {
-      "type": "generated",
-      "generator": "coalesce",
-      "parameters": {
-        "sourceVariableName": "HttpsPort",
-        "fallbackVariableName": "HttpsPortGenerated"
-      },
-      "replaces": "44300"
-    },
-    "IndividualLocalAuth": {
-      "type": "computed",
-      "value": "(auth == \"Individual\")"
-    },
-    "NoAuth": {
-      "type": "computed",
-      "value": "(!(IndividualAuth))"
-    },
-    "IndividualAuth": {
-      "type": "computed",
-      "value": "(IndividualLocalAuth)"
-    },
-    "RequiresHttps": {
-      "type": "computed",
-      "value": "(IndividualAuth || !NoHttps)"
-    },
-    "NoHttps": {
-      "type": "parameter",
-      "datatype": "bool",
-      "defaultValue": "false",
-      "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth."
-    },
-    "UseLocalDB": {
-      "type": "parameter",
-      "datatype": "bool",
-      "defaultValue": "false",
-      "description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified."
-    },
-    "copyrightYear": {
-      "type": "generated",
-      "generator": "now",
-      "replaces": "copyrightYear",
-      "parameters": {
-        "format": "yyyy"
-      }
     }
   },
   "tags": {

src/ProjectTemplates/BlazorWasm.ProjectTemplates/content/BlazorWasm-CSharp/.template.config/vs-2017.3.host.json

@@ -18,30 +18,6 @@
   "additionalWizardParameters": {
     "$isMultiProjectTemplate$": "true"
   },
-  "supportedAuthentications": [
-    {
-      "auth": "None",
-      "authenticationType": "NoAuth",
-      "allowUnsecured": true
-    },
-    {
-      "auth": "Individual",
-      "authenticationType": "IndividualAuth",
-      "b2cAuthenticationOptions": "Local"
-    }
-  ],
-  "ports": [
-    {
-      "name": "HttpPort",
-      "useHttps": false
-    },
-    {
-      "name": "HttpsPort",
-      "useHttps": true
-    }
-  ],
-  "excludeLaunchSettings": false,
-  "disableHttpsSymbol": "NoHttps",
   "symbolInfo": [
     {
       "id": "Hosted",

src/ProjectTemplates/BlazorWasm.ProjectTemplates/content/BlazorWasm-CSharp/Client/App.razor

@@ -1,5 +1,4 @@
-@*#if (NoAuth)
-<Router AppAssembly="@typeof(Program).Assembly">
+<Router AppAssembly="@typeof(Program).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
     </Found>
@@ -9,17 +8,3 @@
         </LayoutView>
     </NotFound>
 </Router>
-#else
-<CascadingAuthenticationState>
-    <Router AppAssembly="@typeof(Program).Assembly">
-        <Found Context="routeData">
-            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-        </Found>
-        <NotFound>
-            <LayoutView Layout="@typeof(MainLayout)">
-                <p>Sorry, there's nothing at this address.</p>
-            </LayoutView>
-        </NotFound>
-    </Router>
-</CascadingAuthenticationState>
-#endif*@

src/ProjectTemplates/BlazorWasm.ProjectTemplates/content/BlazorWasm-CSharp/Client/Pages/FetchData.razor

@@ -1,13 +1,7 @@
 @page "/fetchdata"
-@*#if  (!NoAuth)
-@using Microsoft.AspNetCore.Authorization
-#endif*@
 @*#if  (Hosted)
 @using BlazorWasm_CSharp.Shared
 #endif*@
-@*#if  (!NoAuth)
-@attribute [Authorize]
-#endif*@
 @inject HttpClient Http
 
 <h1>Weather forecast</h1>

src/ProjectTemplates/BlazorWasm.ProjectTemplates/content/BlazorWasm-CSharp/Client/Program.cs

@@ -4,9 +4,6 @@
 using System.Text;
 using Microsoft.AspNetCore.Blazor.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-#if (!NoAuth)
-using Microsoft.AspNetCore.Components.Authorization;
-#endif
 
 #if (Hosted)
 namespace BlazorWasm_CSharp.Client
@@ -21,13 +18,6 @@ public static async Task Main(string[] args)
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
             builder.RootComponents.Add<App>("app");
 
-            // use builder.Services to configure application services.
-#if (IndividualLocalAuth)
-            builder.Services.AddOptions();
-            builder.Services.AddAuthorizationCore();
-            builder.Services.AddSingleton<AuthenticationStateProvider, HostAuthenticationStateProvider>();
-#endif
-
             await builder.Build().RunAsync();
         }
     }