#oauth changed GoogleController for the jwt flow ( using a common token if we connect from our app or from google )

src/Web/Program.cs

@@ -3,12 +3,7 @@ using Hutopy.Infrastructure;
 using Hutopy.Infrastructure.Data;
 using Hutopy.Web;
 using Azure.Identity;
-using Hutopy.Infrastructure.Identity;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authentication.Facebook;
-using Microsoft.AspNetCore.Authentication.Google;
 using Microsoft.AspNetCore.HttpOverrides;
-using Microsoft.AspNetCore.Identity;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -50,49 +45,8 @@ builder.Services.AddKeyVaultIfConfigured(builder.Configuration);
 builder.Services.AddApplicationServices();
 builder.Services.AddInfrastructureServices(builder.Configuration);
 builder.Services.AddWebServices();
-
-// OAuth
-builder.Services.AddAuthentication(options =>
-    {
-        options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme;
-        options.DefaultChallengeScheme = CookieAuthenticationDefaults.AuthenticationScheme;
-    })
-    .AddCookie()
-    .AddGoogle(
-        GoogleDefaults.AuthenticationScheme,
-        options =>
-    {
-        options.ClientId = builder.Configuration["Google:ClientId"] ??
-                           throw new ArgumentNullException("The Google ClientId is missing.");
-        options.ClientSecret = builder.Configuration["Google:ClientSecret"] ??
-                               throw new ArgumentNullException("The Google ClientSecret is missing.");
-        //options.AccessDeniedPath = "/AccessDeniedPathInfo";
-    })
-    .AddFacebook(
-        FacebookDefaults.AuthenticationScheme,
-        options =>
-    {
-        options.ClientId = builder.Configuration["Facebook:ClientId"] ??
-                           throw new ArgumentNullException("The Facebook ClientId is missing.");
-        options.ClientSecret = builder.Configuration["Facebook:ClientSecret"] ??
-                               throw new ArgumentNullException("The Facebook ClientSecret is missing.");
-        //options.AccessDeniedPath = "/AccessDeniedPathInfo";
-    });
-
-// Password hashing
-builder.Services.AddIdentity<ApplicationUser, IdentityRole>(options =>
-    {
-        options.Password.RequireDigit = false;
-        options.Password.RequireLowercase = false;
-        options.Password.RequireUppercase = false;
-        options.Password.RequireNonAlphanumeric = false;
-        options.Password.RequiredLength = 16;
-    })
-    .AddEntityFrameworkStores<ApplicationDbContext>()
-    .AddDefaultTokenProviders();
-
+builder.Services.AddAuthorizationAndAuthentication(builder.Configuration);
 builder.Services.AddControllers();
-builder.Services.AddScoped<IUserService, UserService>();
 
 var app = builder.Build();
 
@@ -100,13 +54,15 @@ app.UseForwardedHeaders(
     new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.XForwardedProto }
 );
 
-app.UseAuthentication();
-app.UseAuthorization();
-
 app.UseCors("AllowAll");
 app.UseCors("AllowHutopyUi");
 app.UseCors("AllowHutopyUiPreview");
 
+app.UseAuthentication();
+app.UseAuthorization();
+
+
+
 // Initialize and seed the db.
 await app.InitialiseDatabaseAsync();