From 6abe396dbb495c4de0ff5879324684cd1095bfa4 Mon Sep 17 00:00:00 2001
From: Jordan Nash <LayersOfAbstraction@users.noreply.github.com>
Date: Tue, 14 Mar 2023 00:43:46 +1000
Subject: [PATCH] Merge Startup.cs logic into Program.cs. (#81)

Co-authored-by: Frederik Prijck <frederik.prijck@auth0.com>
---
 Quickstart/Sample/Program.cs | 56 ++++++++++++++++++++++++----------
 Quickstart/Sample/Startup.cs | 58 ------------------------------------
 2 files changed, 40 insertions(+), 74 deletions(-)
 delete mode 100644 Quickstart/Sample/Startup.cs

diff --git a/Quickstart/Sample/Program.cs b/Quickstart/Sample/Program.cs
index f2017d1..848f20b 100644
--- a/Quickstart/Sample/Program.cs
+++ b/Quickstart/Sample/Program.cs
@@ -1,20 +1,44 @@
-using Microsoft.AspNetCore.Hosting;
+using Auth0.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using SampleMvcApp.Support;
+using System.Net;
 
-namespace SampleMvcApp
+using Microsoft.IdentityModel.Logging;
+
+var builder = WebApplication.CreateBuilder(args);
+
+//To use MVC we have to explicitly declare we are using it. Doing so will prevent a System.InvalidOperationException.
+builder.Services.AddControllersWithViews();
+builder.Services.AddAuth0WebAppAuthentication(options =>
+{
+    options.Domain = builder.Configuration["Auth0:Domain"];
+    options.ClientId = builder.Configuration["Auth0:ClientId"];
+});
+
+// Configure the HTTP request pipeline.
+builder.Services.ConfigureSameSiteNoneCookies();
+var app = builder.Build();
+
+if (!app.Environment.IsDevelopment())
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseExceptionHandler("/Home/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
+
+app.UseStaticFiles();
+app.UseCookiePolicy();
+
+app.UseRouting();
+app.UseAuthentication();
+app.UseAuthorization();
+app.UseEndpoints(endpoints =>
+{
+    endpoints.MapDefaultControllerRoute();
+});
+
+app.Run();
\ No newline at end of file
diff --git a/Quickstart/Sample/Startup.cs b/Quickstart/Sample/Startup.cs
deleted file mode 100644
index 0153f65..0000000
--- a/Quickstart/Sample/Startup.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using SampleMvcApp.Support;
-using Auth0.AspNetCore.Authentication;
-
-namespace SampleMvcApp
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.ConfigureSameSiteNoneCookies();
-
-            services.AddAuth0WebAppAuthentication(options => {
-                options.Domain = Configuration["Auth0:Domain"];
-                options.ClientId = Configuration["Auth0:ClientId"];
-            });
-
-            services.AddControllersWithViews();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Home/Error");
-                app.UseHsts();
-            }
-
-            app.UseStaticFiles();
-            app.UseCookiePolicy();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapDefaultControllerRoute();
-            });
-        }
-    }
-}