Moved AccountController.cs to IdentityController.cs and defined roles on a route

Newsbot.Collector.Api/Controllers/CodeProjectController.cs

@@ -25,7 +25,7 @@ public class CodeProjectController
     }
 
     [HttpPost("check")]
-    [Authorize(Roles = AuthorizationRoles.Administrators)]
+    [Authorize(Roles = Authorization.AdministratorsRole)]
     public void PullNow()
     {
         BackgroundJob.Enqueue<CodeProjectWatcherJob>(x => x.InitAndExecute(new CodeProjectWatcherJobOptions

Newsbot.Collector.Api/Controllers/RssController.cs

@@ -28,7 +28,7 @@ public class RssController
     }
 
     [HttpPost("check")]
-    [Authorize(Roles = AuthorizationRoles.Administrators)]
+    [Authorize(Roles = Authorization.AdministratorsRole)]
     public void CheckReddit()
     {
         BackgroundJob.Enqueue<RssWatcherJob>(x => x.InitAndExecute(new RssWatcherJobOptions

Newsbot.Collector.Api/Controllers/SourcesController.cs

@@ -200,14 +200,14 @@ public class SourcesController : ControllerBase
         return SourceDto.Convert(item);
     }
 
-    [Authorize(Roles = AuthorizationRoles.Administrators)]
+    [Authorize(Roles = Authorization.AdministratorsRole)]
     [HttpPost("{id}/disable")]
     public void Disable(Guid id)
     {
         _sources.Disable(id);
     }
 
-    [Authorize(Roles = AuthorizationRoles.Administrators)]
+    [Authorize(Roles = Authorization.AdministratorsRole)]
     [HttpPost("{id}/enable")]
     public void Enable(Guid id)
     {
@@ -215,7 +215,7 @@ public class SourcesController : ControllerBase
     }
 
     [HttpDelete("{id}")]
-    [Authorize(Roles = AuthorizationRoles.Administrators)]
+    [Authorize(Roles = Authorization.AdministratorsRole)]
     public void Delete(Guid id, bool purgeOrphanedRecords)
     {
         _sources.Delete(id);

Newsbot.Collector.Api/Controllers/YoutubeController.cs

@@ -28,7 +28,7 @@ public class YoutubeController
     }
     
     [HttpPost("check")]
-    [Authorize(Policy = AuthorizationRoles.Administrators)]
+    [Authorize(Policy = Authorization.AdministratorsRole)]
     public void CheckYoutube()
     {
         BackgroundJob.Enqueue<YoutubeWatcherJob>(x => x.InitAndExecute(new YoutubeWatcherJobOptions

Newsbot.Collector.Api/Controllers/v1/IdentityController.cs

@@ -6,15 +6,15 @@ using Newsbot.Collector.Api.Domain.Response;
 using Newsbot.Collector.Api.Domain.Results;
 using Newsbot.Collector.Api.Services;
 
-namespace Newsbot.Collector.Api.Controllers;
+namespace Newsbot.Collector.Api.Controllers.v1;
 
 [ApiController]
-[Route("/api/account")]
-public class AccountController : ControllerBase
+[Route("/api/v1/account")]
+public class IdentityController : ControllerBase
 {
     private IIdentityService _identityService;
 
-    public AccountController(IIdentityService identityService)
+    public IdentityController(IIdentityService identityService)
     {
         _identityService = identityService;
     }
@@ -71,7 +71,7 @@ public class AccountController : ControllerBase
     }
 
     [HttpPost("addRole")]
-    [Authorize(Roles = AuthorizationRoles.Administrators)]
+    [Authorize(Roles = Authorization.AdministratorsRole)]
     public ActionResult AddRole([FromBody] AddRoleRequest request)
     {
         try

Newsbot.Collector.Api/Domain/Authorization.cs

@@ -0,0 +1,12 @@
+namespace Newsbot.Collector.Api.Domain;
+
+public static class Authorization
+{
+    public const string AdministratorPolicy = "Administrator";
+    public const string AdministratorClaim = "administrator";
+
+    public const string AdministratorsRole = AdministratorPolicy;
+
+    public const string UserPolicy = "User";
+    public const string UsersRole = UserPolicy;
+}

Newsbot.Collector.Api/Domain/AuthorizationRoles.cs

@@ -1,6 +0,0 @@
-namespace Newsbot.Collector.Api.Domain;
-
-public class AuthorizationRoles
-{
-    public const string Administrators = "Administrators";
-}

Newsbot.Collector.Api/Program.cs

@@ -1,27 +1,13 @@
-using System.Text;
 using Hangfire;
 using Hangfire.MemoryStorage;
 using HealthChecks.UI.Client;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.OpenApi.Models;
-using Newsbot.Collector.Api;
-using Newsbot.Collector.Api.Authentication;
-using Newsbot.Collector.Api.Domain;
-using Newsbot.Collector.Api.Services;
-using Newsbot.Collector.Database;
-using Newsbot.Collector.Database.Repositories;
+using Newsbot.Collector.Api.Startup;
 using Newsbot.Collector.Domain.Consts;
-using Newsbot.Collector.Domain.Entities;
-using Newsbot.Collector.Domain.Interfaces;
 using Newsbot.Collector.Domain.Models;
 using Newsbot.Collector.Domain.Models.Config;
 using Newsbot.Collector.Domain.Models.Config.Sources;
 using Serilog;
-using Serilog.Events;
 using ILogger = Serilog.ILogger;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -37,26 +23,10 @@ Log.Logger = GetLogger(config);
 Log.Information("Starting up");
 
 // configure Entity Framework
-var dbconn = config.GetConnectionString("Database");
-builder.Services.AddDbContext<DatabaseContext>(o => o.UseNpgsql(dbconn ?? ""));
-
-// Configure how Identity will be managed
-builder.Services.AddIdentity<IdentityUser, IdentityRole>()
-    .AddRoles<IdentityRole>()
-    .AddEntityFrameworkStores<DatabaseContext>();
-
 // Allow the controllers to access all the table repositories based on the interface
-builder.Services.AddScoped<IArticlesRepository, ArticlesTable>();
-builder.Services.AddScoped<IDiscordQueueRepository, DiscordQueueTable>();
-builder.Services.AddScoped<IDiscordWebHooksRepository, DiscordWebhooksTable>();
-builder.Services.AddScoped<IIconsRepository, IconsTable>();
-builder.Services.AddScoped<ISourcesRepository, SourcesTable>();
-builder.Services.AddScoped<IDiscordNotificationRepository, DiscordNotificationTable>();
-builder.Services.AddScoped<IUserSourceSubscription, UserSourceSubscriptionTable>();
-builder.Services.AddScoped<IRefreshTokenRepository, RefreshTokenTable>();
-
-// Configure Identity
-builder.Services.AddScoped<IIdentityService, IdentityService>();
+DatabaseStartup.BuildDatabase(builder.Services, config);
+DatabaseStartup.InjectTableClasses(builder.Services);
+DatabaseStartup.InjectIdentityService(builder.Services);
 
 // Configure Hangfire
 builder.Services.AddHangfire(f => f.UseMemoryStorage());
@@ -70,99 +40,14 @@ builder.Services.AddHealthChecks()
 
 builder.Services.AddControllers();
 
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+SwaggerStartup.ConfigureSwagger(builder.Services);
 
 builder.Services.Configure<ConnectionStrings>(config.GetSection("ConnectionStrings"));
 builder.Services.Configure<ConfigSectionConnectionStrings>(config.GetSection(ConfigSectionsConst.ConnectionStrings));
 builder.Services.Configure<ConfigSectionRssModel>(config.GetSection(ConfigSectionsConst.Rss));
 builder.Services.Configure<ConfigSectionYoutubeModel>(config.GetSection(ConfigSectionsConst.Youtube));
 
-// Configure JWT for auth and load it into DI so we can use it in the controllers
-var jwtSettings = new JwtSettings();
-config.Bind(nameof(jwtSettings), jwtSettings);
-builder.Services.AddSingleton(jwtSettings);
-
-// Configure how the Token Validation will be handled
-var tokenValidationParameters = new TokenValidationParameters
-{
-    ValidateIssuerSigningKey = true,
-    IssuerSigningKey = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(jwtSettings.Secret ?? "")),
-    ValidateIssuer = false,
-    ValidateAudience = false,
-    RequireExpirationTime = false,
-    ValidateLifetime = true
-};
-builder.Services.AddSingleton(tokenValidationParameters);    
-
-// Build the Authentication that will be used
-builder.Services.AddAuthentication(x =>
-{
-    x.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
-    x.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    x.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(x =>
-{
-    x.SaveToken = true;
-    x.TokenValidationParameters = tokenValidationParameters;
-});
-
-// Build the Authorization Policy that the users will conform to.
-builder.Services.AddAuthorization(options =>
-    options.AddPolicy(Authorization.AdministratorPolicy, b => b.RequireClaim( Authorization.AdministratorClaim, "true") ));
-
-// Configure swagger authentication 
-builder.Services.AddSwaggerGen(cfg =>
-{
-    cfg.AddSecurityDefinition("ApiKey", new OpenApiSecurityScheme
-    {
-        Description = "The API key to access the API",
-        Type = SecuritySchemeType.ApiKey,
-        Name = "x-api-key",
-        In = ParameterLocation.Header,
-        Scheme = "ApiKeyScheme"
-    });
-
-    cfg.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
-    {
-        Description = "JWT Authorization Header using the bearer scheme",
-        Name = "Authorization",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.ApiKey
-    });
-    
-    cfg.AddSecurityRequirement(new OpenApiSecurityRequirement
-    {
-        //{
-        //    new OpenApiSecurityScheme
-        //    {
-        //        Reference = new OpenApiReference
-        //        {
-        //            Type = ReferenceType.SecurityScheme,
-        //            Id = "ApiKey"
-        //        },
-        //        In = ParameterLocation.Header
-        //    },
-        //    new List<string>()
-        //},
-        { 
-            new OpenApiSecurityScheme
-            {
-                Reference = new OpenApiReference
-                {
-                    Type = ReferenceType.SecurityScheme,
-                    Id = "Bearer"
-                },
-                Scheme = "oauth2",
-                Name = "Bearer",
-                In = ParameterLocation.Header
-            }, 
-            new List<string>()
-        }
-    });
-});
-
+IdentityStartup.DefineJwtRequirements(builder.Services, config);
 
 var app = builder.Build();
 
@@ -199,9 +84,7 @@ app.MapControllers();
 using var serviceScope = app.Services.CreateScope();
 if (config.GetValue<bool>(ConfigConst.RunDatabaseMigrationsOnStartup))
 {
-    var dbContext = serviceScope.ServiceProvider.GetRequiredService<DatabaseContext>();
-    dbContext.Database.Migrate();
-    
+    await DatabaseStartup.RunDatabaseMigrationsAsync(serviceScope);
 }
 else
 {
@@ -209,18 +92,7 @@ else
 }
 
 // Inject the roles
-var roleManager = serviceScope.ServiceProvider.GetRequiredService<RoleManager<IdentityRole>>();
-if (!await roleManager.RoleExistsAsync("Administrators"))
-{
-    var adminRole = new IdentityRole("Administrators");
-    await roleManager.CreateAsync(adminRole);
-}
-
-if (!await roleManager.RoleExistsAsync("Users"))
-{
-    var userRole = new IdentityRole("Users");
-    await roleManager.CreateAsync(userRole);
-}
+await DatabaseStartup.InjectIdentityRolesAsync(serviceScope);
 
 // Start the application
 app.Run();

Newsbot.Collector.Api/Startup/BackgroundJobs.cs

@@ -3,7 +3,7 @@ using Newsbot.Collector.Domain.Consts;
 using Newsbot.Collector.Domain.Models.Config;
 using Newsbot.Collector.Services.Jobs;
 
-namespace Newsbot.Collector.Api;
+namespace Newsbot.Collector.Api.Startup;
 
 public static class BackgroundJobs
 {

Newsbot.Collector.Api/Startup/DatabaseStartup.cs

@@ -0,0 +1,61 @@
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Newsbot.Collector.Api.Domain;
+using Newsbot.Collector.Api.Services;
+using Newsbot.Collector.Database;
+using Newsbot.Collector.Database.Repositories;
+using Newsbot.Collector.Domain.Interfaces;
+
+namespace Newsbot.Collector.Api.Startup;
+
+public class DatabaseStartup
+{
+    public static void BuildDatabase(IServiceCollection services, IConfiguration config)
+    {
+        var dbconn = config.GetConnectionString("Database");
+        services.AddDbContext<DatabaseContext>(o => o.UseNpgsql(dbconn ?? ""));
+        
+        // Add identity to our ef connection
+        services.AddIdentity<IdentityUser, IdentityRole>()
+            .AddRoles<IdentityRole>()
+            .AddEntityFrameworkStores<DatabaseContext>();
+    }
+
+    public static void InjectTableClasses(IServiceCollection services)
+    {
+        services.AddScoped<IArticlesRepository, ArticlesTable>();
+        services.AddScoped<IDiscordQueueRepository, DiscordQueueTable>();
+        services.AddScoped<IDiscordWebHooksRepository, DiscordWebhooksTable>();
+        services.AddScoped<IIconsRepository, IconsTable>();
+        services.AddScoped<ISourcesRepository, SourcesTable>();
+        services.AddScoped<IDiscordNotificationRepository, DiscordNotificationTable>();
+        services.AddScoped<IUserSourceSubscription, UserSourceSubscriptionTable>();
+        services.AddScoped<IRefreshTokenRepository, RefreshTokenTable>();
+    }
+
+    public static void InjectIdentityService(IServiceCollection services)
+    {
+        // Configure Identity
+        services.AddScoped<IIdentityService, IdentityService>();
+    }
+
+    public static async Task RunDatabaseMigrationsAsync(IServiceScope serviceScope)
+    {
+        var dbContext = serviceScope.ServiceProvider.GetRequiredService<DatabaseContext>();
+        await dbContext.Database.MigrateAsync();
+    }
+
+    public static async Task InjectIdentityRolesAsync(IServiceScope serviceScope)
+    {
+        var roleManager = serviceScope.ServiceProvider.GetRequiredService<RoleManager<IdentityRole>>();
+        if (!await roleManager.RoleExistsAsync(Authorization.AdministratorsRole))
+        {
+            await roleManager.CreateAsync(new IdentityRole(Authorization.AdministratorsRole));
+        }
+
+        if (!await roleManager.RoleExistsAsync(Authorization.UsersRole))
+        {
+            await roleManager.CreateAsync(new IdentityRole(Authorization.UsersRole));
+        }
+    }
+}

Newsbot.Collector.Api/Startup/IdentityStartup.cs

@@ -0,0 +1,50 @@
+using System.Text;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.IdentityModel.Tokens;
+using Newsbot.Collector.Api.Domain;
+using Newsbot.Collector.Domain.Models.Config;
+
+namespace Newsbot.Collector.Api.Startup;
+
+public static class IdentityStartup
+{
+    public static void DefineJwtRequirements(IServiceCollection services, IConfiguration config)
+    {
+        // Configure JWT for auth and load it into DI so we can use it in the controllers
+
+        var jwtSettings = new JwtSettings();
+        config.Bind(nameof(jwtSettings), jwtSettings);
+        services.AddSingleton(jwtSettings);
+        
+        // Configure how the Token Validation will be handled
+        var tokenValidationParameters = new TokenValidationParameters
+        {
+            ValidateIssuerSigningKey = true,
+            IssuerSigningKey = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(jwtSettings.Secret ?? "")),
+            ValidateIssuer = false,
+            ValidateAudience = false,
+            RequireExpirationTime = false,
+            ValidateLifetime = true
+        };
+        services.AddSingleton(tokenValidationParameters);
+        
+        // Build the Authentication that will be used
+        services.AddAuthentication(x =>
+        {
+            x.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
+            x.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
+            x.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
+        }).AddJwtBearer(x =>
+        {
+            x.SaveToken = true;
+            x.TokenValidationParameters = tokenValidationParameters;
+        });
+        
+        // Build the Authorization Policy that the users will conform to.
+        services.AddAuthorization(options =>
+        {
+            options.AddPolicy(Authorization.AdministratorPolicy,
+                b => b.RequireClaim(Authorization.AdministratorClaim, "true"));
+        });
+    }
+}

Newsbot.Collector.Api/Startup/SwaggerStartup.cs

@@ -0,0 +1,67 @@
+using Microsoft.OpenApi.Models;
+
+namespace Newsbot.Collector.Api.Startup;
+
+public static class SwaggerStartup
+{
+    public static void ConfigureSwagger(IServiceCollection services)
+    {
+        // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+        services.AddEndpointsApiExplorer();
+        services.AddSwaggerGen();
+
+        services.AddEndpointsApiExplorer();
+        services.AddSwaggerGen();
+
+        // Configure swagger authentication 
+        services.AddSwaggerGen(cfg =>
+        {
+            cfg.AddSecurityDefinition("ApiKey", new OpenApiSecurityScheme
+            {
+                Description = "The API key to access the API",
+                Type = SecuritySchemeType.ApiKey,
+                Name = "x-api-key",
+                In = ParameterLocation.Header,
+                Scheme = "ApiKeyScheme"
+            });
+
+            cfg.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+            {
+                Description = "JWT Authorization Header using the bearer scheme",
+                Name = "Authorization",
+                In = ParameterLocation.Header,
+                Type = SecuritySchemeType.ApiKey
+            });
+
+            cfg.AddSecurityRequirement(new OpenApiSecurityRequirement
+            {
+                //{
+                //    new OpenApiSecurityScheme
+                //    {
+                //        Reference = new OpenApiReference
+                //        {
+                //            Type = ReferenceType.SecurityScheme,
+                //            Id = "ApiKey"
+                //        },
+                //        In = ParameterLocation.Header
+                //    },
+                //    new List<string>()
+                //},
+                {
+                    new OpenApiSecurityScheme
+                    {
+                        Reference = new OpenApiReference
+                        {
+                            Type = ReferenceType.SecurityScheme,
+                            Id = "Bearer"
+                        },
+                        Scheme = "oauth2",
+                        Name = "Bearer",
+                        In = ParameterLocation.Header
+                    },
+                    new List<string>()
+                }
+            });
+        });
+    }
+}

global.json

@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "7.0.100"
+  }
+}