JwtSettings has been added to config

Newsbot.Collector.Api/Controllers/ArticlesController.cs

@@ -1,6 +1,7 @@
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using Newsbot.Collector.Database.Repositories;
 using Newsbot.Collector.Domain.Dto;
 using Newsbot.Collector.Domain.Interfaces;
 using Newsbot.Collector.Domain.Models;
@@ -9,17 +10,18 @@ namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/articles")]
+[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class ArticlesController : ControllerBase
 {
-    private readonly IArticlesRepository _articles;
     private readonly ILogger<ArticlesController> _logger;
+    private readonly IArticlesRepository _articles;
     private readonly ISourcesRepository _sources;
 
-    public ArticlesController(ILogger<ArticlesController> logger, IOptions<ConnectionStrings> settings)
+    public ArticlesController(ILogger<ArticlesController> logger, IArticlesRepository articles, ISourcesRepository sources)
     {
         _logger = logger;
-        _articles = new ArticlesTable(settings.Value.Database);
-        _sources = new SourcesTable(settings.Value.Database);
+        _articles = articles;
+        _sources = sources;
     }
 
     [HttpGet(Name = "GetArticles")]

Newsbot.Collector.Api/Controllers/CodeProjectController.cs

@@ -1,4 +1,6 @@
 using Hangfire;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newsbot.Collector.Domain.Models.Config;
@@ -8,6 +10,7 @@ namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/codeprojects")]
+[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class CodeProjectController
 {
     private readonly ConfigSectionConnectionStrings _connectionStrings;

Newsbot.Collector.Api/Controllers/DiscordWebHooksController.cs

@@ -1,4 +1,6 @@
 using System.Net;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newsbot.Collector.Database.Repositories;
@@ -11,17 +13,16 @@ namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/discord/webhooks")]
+[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class DiscordWebHookController : ControllerBase
 {
     private readonly ILogger<DiscordWebHookController> _logger;
-    private readonly ConnectionStrings _settings;
     private readonly IDiscordWebHooksRepository _webhooks;
 
-    public DiscordWebHookController(ILogger<DiscordWebHookController> logger, IOptions<ConnectionStrings> settings)
+    public DiscordWebHookController(ILogger<DiscordWebHookController> logger, IOptions<ConnectionStrings> settings, IDiscordWebHooksRepository webhooks)
     {
         _logger = logger;
-        _settings = settings.Value;
-        _webhooks = new DiscordWebhooksTable(_settings.Database);
+        _webhooks = webhooks;
     }
 
     [HttpGet(Name = "GetDiscordWebhooks")]

Newsbot.Collector.Api/Controllers/RssController.cs

@@ -1,13 +1,17 @@
 using Hangfire;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newsbot.Collector.Domain.Models.Config;
+using Newsbot.Collector.Domain.Models.Config.Sources;
 using Newsbot.Collector.Services.Jobs;
 
 namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/rss")]
+[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class RssController
 {
     private readonly ConfigSectionConnectionStrings _connectionStrings;

Newsbot.Collector.Api/Controllers/SourcesController.cs

@@ -1,3 +1,5 @@
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newsbot.Collector.Database.Repositories;
@@ -12,22 +14,18 @@ namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/sources")]
+[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class SourcesController : ControllerBase
 {
-    private readonly IArticlesRepository _articles;
-
-    //private readonly ConnectionStrings _settings;
-    private readonly IIconsRepository _icons;
     private readonly ILogger<SourcesController> _logger;
+    private readonly IIconsRepository _icons;
     private readonly ISourcesRepository _sources;
 
-    public SourcesController(ILogger<SourcesController> logger, IOptions<ConnectionStrings> settings)
+    public SourcesController(ILogger<SourcesController> logger, IIconsRepository icons, ISourcesRepository sources)
     {
         _logger = logger;
-        //_settings = settings.Value;
-        _sources = new SourcesTable(settings.Value.Database);
-        _icons = new IconsTable(settings.Value.Database);
-        _articles = new ArticlesTable(settings.Value.Database);
+        _icons = icons;
+        _sources = sources;
     }
 
     [HttpGet(Name = "GetSources")]

Newsbot.Collector.Api/Controllers/SubscriptionsController.cs

@@ -1,3 +1,5 @@
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newsbot.Collector.Database.Repositories;
@@ -10,19 +12,20 @@ namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/subscriptions")]
+[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class SubscriptionsController : ControllerBase
 {
-    private readonly IDiscordWebHooksRepository _discord;
     private readonly ILogger<SubscriptionsController> _logger;
+    private readonly IDiscordWebHooksRepository _discord;
     private readonly ISourcesRepository _sources;
     private readonly ISubscriptionRepository _subscription;
 
-    public SubscriptionsController(ILogger<SubscriptionsController> logger, IOptions<ConnectionStrings> settings)
+    public SubscriptionsController(ILogger<SubscriptionsController> logger, IDiscordWebHooksRepository discord, ISourcesRepository sources, ISubscriptionRepository subscription)
     {
         _logger = logger;
-        _subscription = new SubscriptionsTable(settings.Value.Database);
-        _discord = new DiscordWebhooksTable(settings.Value.Database);
-        _sources = new SourcesTable(settings.Value.Database);
+        _discord = discord;
+        _sources = sources;
+        _subscription = subscription;
     }
 
     [HttpGet(Name = "ListSubscriptions")]

Newsbot.Collector.Api/Controllers/YoutubeController.cs

@@ -1,7 +1,10 @@
 using Hangfire;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newsbot.Collector.Domain.Models.Config;
+using Newsbot.Collector.Domain.Models.Config.Sources;
 using Newsbot.Collector.Services.Jobs;
 using ILogger = Grpc.Core.Logging.ILogger;
 
@@ -9,6 +12,7 @@ namespace Newsbot.Collector.Api.Controllers;
 
 [ApiController]
 [Route("api/youtube")]
+[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
 public class YoutubeController
 {
     private readonly ILogger<YoutubeController> _logger;

Newsbot.Collector.Api/Domain/Requests/RegisterUserRequest.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Newsbot.Collector.Api.Domain.Requests;
+
+public class RegisterUserRequest
+{
+    //public string? Name { get; set; }
+    [EmailAddress]
+    public string? Email { get; set; }
+    public string? Password { get; set; }
+    
+}

Newsbot.Collector.Api/Domain/Requests/UserLoginRequest.cs

@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Newsbot.Collector.Api.Domain.Requests;
+
+public class UserLoginRequest
+{
+    [EmailAddress]
+    public string? Email { get; set; }
+    public string? Password { get; set; }
+}

Newsbot.Collector.Api/Domain/Response/AuthFailedResponse.cs

@@ -0,0 +1,6 @@
+namespace Newsbot.Collector.Api.Domain.Response;
+
+public class AuthFailedResponse
+{
+    public IEnumerable<string>? Errors { get; set; }
+}

Newsbot.Collector.Api/Domain/Response/AuthSuccessfulResponse.cs

@@ -0,0 +1,8 @@
+namespace Newsbot.Collector.Api.Domain.Response;
+
+public class AuthSuccessfulResponse
+{
+    // might want to validate the user before we return the token
+    
+    public string? Token { get; set; }
+}

Newsbot.Collector.Api/Domain/Results/AuthenticationResult.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+
+namespace Newsbot.Collector.Api.Domain.Results;
+
+public class AuthenticationResult
+{
+    public string? Token { get; set; }
+    
+    public bool IsSuccessful { get; set; }
+    public IEnumerable<string>? ErrorMessage { get; set; }
+}

Newsbot.Collector.Api/Newsbot.Collector.Api.csproj

@@ -13,6 +13,7 @@
         <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
         <PackageReference Include="Hangfire.AspNetCore" Version="1.7.33" />
         <PackageReference Include="Hangfire.MemoryStorage" Version="1.7.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.8" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">
@@ -36,4 +37,8 @@
         <ProjectReference Include="..\Newsbot.Collector.Database\Newsbot.Collector.Database.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Controllers\v1\" />
+    </ItemGroup>
+
 </Project>

Newsbot.Collector.Api/Program.cs

@@ -1,14 +1,24 @@
+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.Services;
 using Newsbot.Collector.Database;
+using Newsbot.Collector.Database.Repositories;
 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;
@@ -23,30 +33,76 @@ var config = GetConfiguration();
 builder.Configuration.AddConfiguration(config);
 
 Log.Logger = GetLogger(config);
-
 Log.Information("Starting up");
+
+// configure Entity Framework
+var dbconn = config.GetConnectionString("Database");
+builder.Services.AddDbContext<DatabaseContext>(o => o.UseNpgsql(dbconn ?? ""));
+
+builder.Services.AddIdentity<IdentityUser, IdentityRole>()
+    .AddRoles<IdentityRole>()
+    .AddEntityFrameworkStores<DatabaseContext>();
+
+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<ISubscriptionRepository, SubscriptionsTable>();
+
+// Configure Identity
+builder.Services.AddScoped<IIdentityService, IdentityService>();
+
 // Configure Hangfire
 builder.Services.AddHangfire(f => f.UseMemoryStorage());
 builder.Services.AddHangfireServer();
 GlobalConfiguration.Configuration.UseSerilogLogProvider();
 
+// Add Health Checks
 builder.Services.AddHealthChecks()
     .AddNpgSql(config.GetValue<string>(ConfigConnectionStringConst.Database) ?? "");
 
+
 builder.Services.AddControllers();
+
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
 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));
 //builder.Services.Configure<
 
+// Configure JWT for auth
+var jwtSettings = new JwtSettings();
+config.Bind(nameof(jwtSettings), jwtSettings);
+builder.Services.AddSingleton(jwtSettings);
+
+
+builder.Services.AddAuthentication(x =>
+{
+    x.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
+    x.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
+    x.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
+}).AddJwtBearer(x =>
+{
+    x.SaveToken = true;
+    x.TokenValidationParameters = new TokenValidationParameters
+    {
+        ValidateIssuerSigningKey = true,
+        IssuerSigningKey = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(jwtSettings.Secret ?? "")),
+        ValidateIssuer = false,
+        ValidateAudience = false,
+        RequireExpirationTime = false,
+        ValidateLifetime = true
+    };
+});
+    
 builder.Services.AddSwaggerGen(cfg =>
 {
+    
     cfg.AddSecurityDefinition("ApiKey", new OpenApiSecurityScheme
     {
         Description = "The API key to access the API",
@@ -56,23 +112,45 @@ builder.Services.AddSwaggerGen(cfg =>
         Scheme = "ApiKeyScheme"
     });
 
-    var scheme = new OpenApiSecurityScheme
+    cfg.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
     {
-        Reference = new OpenApiReference
-        {
-            Type = ReferenceType.SecurityScheme,
-            Id = "ApiKey"
-        },
-        In = ParameterLocation.Header
-    };
-    var requirement = new OpenApiSecurityRequirement
+        Description = "JWT Authorization Header using the bearer scheme",
+        Name = "Authorization",
+        In = ParameterLocation.Header,
+        Type = SecuritySchemeType.ApiKey
+    });
+    
+    cfg.AddSecurityRequirement(new OpenApiSecurityRequirement
     {
-        { scheme, new List<string>() }
-    };
-    cfg.AddSecurityRequirement(requirement);
+        //{
+        //    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>()
+        }
+    });
 });
 
-builder.Services.AddDbContext<DatabaseContext>();
 
 var app = builder.Build();
 
@@ -88,9 +166,10 @@ app.UseHttpsRedirection();
 app.UseHangfireDashboard();
 BackgroundJobs.SetupRecurringJobs(config);
 
-app.UseAuthorization();
+//app.UseAuthorization();
+app.UseAuthentication();
 
-app.UseMiddleware<ApiKeyAuthAuthentication>();
+//app.UseMiddleware<ApiKeyAuthAuthentication>();
 
 app.MapHealthChecks("/health", new HealthCheckOptions
 {

Newsbot.Collector.Api/Services/IdentityService.cs

@@ -0,0 +1,114 @@
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using System.Text;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.IdentityModel.Tokens;
+using Newsbot.Collector.Api.Domain.Results;
+using Newsbot.Collector.Domain.Models.Config;
+
+namespace Newsbot.Collector.Api.Services;
+
+public interface IIdentityService
+{
+    AuthenticationResult Register(string email, string password);
+    AuthenticationResult Login(string email, string password);
+}
+
+public class IdentityService : IIdentityService
+{
+    private readonly UserManager<IdentityUser> _userManager;
+    private readonly JwtSettings _jwtSettings;
+
+    public IdentityService(UserManager<IdentityUser> userManager, JwtSettings jwtSettings)
+    {
+        _userManager = userManager;
+        _jwtSettings = jwtSettings;
+    }
+
+    public AuthenticationResult Register(string email, string password)
+    {
+        var userExists = _userManager.FindByEmailAsync(email);
+        userExists.Wait();
+
+        if (userExists.Result != null)
+        {
+            return new AuthenticationResult
+            {
+                ErrorMessage = new[] { "A user with this email address already exists" }
+            };
+        }
+
+        var newUser = new IdentityUser
+        {
+            UserName = email,
+            Email = email
+        };
+
+        var createdUser = _userManager.CreateAsync(newUser, password);
+        createdUser.Wait();
+
+        if (!createdUser.Result.Succeeded)
+        {
+            return new AuthenticationResult
+            {
+                ErrorMessage = new[] { createdUser.Result.Errors.Select(x => x.Description).ToString() }
+            };
+        }
+
+        return  GenerateJwtToken(newUser);
+    }
+
+    public AuthenticationResult Login(string email, string password)
+    {
+        var user =_userManager.FindByEmailAsync(email);
+        user.Wait();
+
+        if (user.Result == null)
+        {
+            return new AuthenticationResult
+            {
+                ErrorMessage = new[] { "User does not exist" }
+            };
+        }
+
+        var hasValidPassword = _userManager.CheckPasswordAsync(user.Result ?? new IdentityUser(), password);
+        hasValidPassword.Wait();
+
+        if (!hasValidPassword.Result)
+        {
+            return new AuthenticationResult()
+            {
+                ErrorMessage = new[] { "Password is invalid" }
+            };
+        }
+
+        return GenerateJwtToken(user.Result ?? new IdentityUser());
+    }
+
+    private AuthenticationResult GenerateJwtToken(IdentityUser user)
+    {
+        var tokenHandler = new JwtSecurityTokenHandler();
+        var key = Encoding.ASCII.GetBytes(_jwtSettings.Secret ?? "");
+        var tokenDescriptor = new SecurityTokenDescriptor
+        {
+            Subject = new ClaimsIdentity(new[]
+            {
+                new Claim(JwtRegisteredClaimNames.Sub, user.Email ?? ""),
+                new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
+                new Claim(JwtRegisteredClaimNames.Email, user.Email ?? ""),
+                new Claim("id", user.Id)
+            }),
+            Expires = DateTime.UtcNow.AddHours(3),
+            SigningCredentials =
+                new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
+        };
+
+        var token = tokenHandler.CreateToken(tokenDescriptor);
+
+        return new AuthenticationResult
+        {
+            IsSuccessful = true,
+            Token = tokenHandler.WriteToken(token)
+        };
+    }
+}

Newsbot.Collector.Database/DatabaseContext.cs

@@ -1,3 +1,5 @@
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Newsbot.Collector.Domain.Consts;
@@ -5,7 +7,7 @@ using Newsbot.Collector.Domain.Entities;
 
 namespace Newsbot.Collector.Database;
 
-public class DatabaseContext : DbContext
+public class DatabaseContext : IdentityDbContext
 {
     public DbSet<ArticlesEntity> Articles { get; set; } = null!;
     public DbSet<DiscordQueueEntity> DiscordQueue { get; set; } = null!;
@@ -13,38 +15,51 @@ public class DatabaseContext : DbContext
     public DbSet<IconEntity> Icons { get; set; } = null!;
     public DbSet<SourceEntity> Sources { get; set; } = null!;
     public DbSet<SubscriptionEntity> Subscriptions { get; set; } = null!;
-    
-    private string ConnectionString { get; set; }
 
-    public DatabaseContext(IConfiguration appsettings, string connectionString)
-    {
-        var connString = appsettings.GetConnectionString(ConfigConnectionStringConst.Database);
-        ConnectionString = connString ?? "";
-    }
+    //public DbSet<UserEntity> Users { get; set; } = null!;
+
+    private string ConnectionString { get; set; } = "";
+
+    //public DatabaseContext(IConfiguration appsettings, string connectionString)
+    //{
+    //    var connString = appsettings.GetConnectionString(ConfigConnectionStringConst.Database);
+    //    ConnectionString = connString ?? "";
+    //}
 
     public DatabaseContext(string connectionString)
     {
         ConnectionString = connectionString;
     }
     
-    public DatabaseContext(DbContextOptions<DatabaseContext> connectionString)
-    {
-        ConnectionString = "";
-    }
-
-    public DatabaseContext()
-    {
-        ConnectionString = "";
-    }
-
     protected override void OnConfiguring(DbContextOptionsBuilder options)
     {
-        options.UseNpgsql(ConnectionString);
+        if (ConnectionString != "")
+        {
+            options.UseNpgsql(ConnectionString);
+        }
+    }
+    
+    //public DatabaseContext(DbContextOptions<DatabaseContext> connectionString)
+    //{
+    //    ConnectionString = "";
+    //}
+
+    //public DatabaseContext()
+    //{
+    //    ConnectionString = "";
+    //}
+
+    
+    public DatabaseContext(DbContextOptions<DatabaseContext> options)
+        : base(options)
+    {
+        //ConnectionString = "";
+        
     }
     
     public DatabaseContext(DbContextOptions<DatabaseContext> options, string connectionString)
         : base(options)
     {
-        ConnectionString = connectionString;
+        //ConnectionString = connectionString;
     }
 }

Newsbot.Collector.Database/Migrations/20230629222603_identity.Designer.cs

@@ -0,0 +1,470 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Newsbot.Collector.Database;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Newsbot.Collector.Database.Migrations
+{
+    [DbContext(typeof(DatabaseContext))]
+    [Migration("20230629222603_identity")]
+    partial class identity
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.8")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.ArticlesEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AuthorImage")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuthorName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("CodeIsCommit")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("CodeIsRelease")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("PubDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("SourceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Tags")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Thumbnail")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Video")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("VideoHeight")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("VideoWidth")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Articles");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordQueueEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ArticleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DiscordQueue");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.DiscordWebhookEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Channel")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Server")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DiscordWebhooks");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.IconEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Site")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SourceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Icons");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.SourceEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Site")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Source")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tags")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("YoutubeId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Sources");
+                });
+
+            modelBuilder.Entity("Newsbot.Collector.Domain.Entities.SubscriptionEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("CodeAllowCommits")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("CodeAllowReleases")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("DiscordWebHookId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("SourceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscriptions");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Newsbot.Collector.Database/Migrations/20230629222603_identity.cs

@@ -0,0 +1,223 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Newsbot.Collector.Database.Migrations
+{
+    /// <inheritdoc />
+    public partial class identity : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "AspNetRoles",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    Name = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    NormalizedName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetRoles", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetUsers",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    UserName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    NormalizedUserName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    Email = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    NormalizedEmail = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
+                    EmailConfirmed = table.Column<bool>(type: "boolean", nullable: false),
+                    PasswordHash = table.Column<string>(type: "text", nullable: true),
+                    SecurityStamp = table.Column<string>(type: "text", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "text", nullable: true),
+                    PhoneNumber = table.Column<string>(type: "text", nullable: true),
+                    PhoneNumberConfirmed = table.Column<bool>(type: "boolean", nullable: false),
+                    TwoFactorEnabled = table.Column<bool>(type: "boolean", nullable: false),
+                    LockoutEnd = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: true),
+                    LockoutEnabled = table.Column<bool>(type: "boolean", nullable: false),
+                    AccessFailedCount = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUsers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetRoleClaims",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    RoleId = table.Column<string>(type: "text", nullable: false),
+                    ClaimType = table.Column<string>(type: "text", nullable: true),
+                    ClaimValue = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AspNetRoleClaims_AspNetRoles_RoleId",
+                        column: x => x.RoleId,
+                        principalTable: "AspNetRoles",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetUserClaims",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    UserId = table.Column<string>(type: "text", nullable: false),
+                    ClaimType = table.Column<string>(type: "text", nullable: true),
+                    ClaimValue = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUserClaims", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AspNetUserClaims_AspNetUsers_UserId",
+                        column: x => x.UserId,
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetUserLogins",
+                columns: table => new
+                {
+                    LoginProvider = table.Column<string>(type: "text", nullable: false),
+                    ProviderKey = table.Column<string>(type: "text", nullable: false),
+                    ProviderDisplayName = table.Column<string>(type: "text", nullable: true),
+                    UserId = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey });
+                    table.ForeignKey(
+                        name: "FK_AspNetUserLogins_AspNetUsers_UserId",
+                        column: x => x.UserId,
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetUserRoles",
+                columns: table => new
+                {
+                    UserId = table.Column<string>(type: "text", nullable: false),
+                    RoleId = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId });
+                    table.ForeignKey(
+                        name: "FK_AspNetUserRoles_AspNetRoles_RoleId",
+                        column: x => x.RoleId,
+                        principalTable: "AspNetRoles",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_AspNetUserRoles_AspNetUsers_UserId",
+                        column: x => x.UserId,
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AspNetUserTokens",
+                columns: table => new
+                {
+                    UserId = table.Column<string>(type: "text", nullable: false),
+                    LoginProvider = table.Column<string>(type: "text", nullable: false),
+                    Name = table.Column<string>(type: "text", nullable: false),
+                    Value = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
+                    table.ForeignKey(
+                        name: "FK_AspNetUserTokens_AspNetUsers_UserId",
+                        column: x => x.UserId,
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AspNetRoleClaims_RoleId",
+                table: "AspNetRoleClaims",
+                column: "RoleId");
+
+            migrationBuilder.CreateIndex(
+                name: "RoleNameIndex",
+                table: "AspNetRoles",
+                column: "NormalizedName",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AspNetUserClaims_UserId",
+                table: "AspNetUserClaims",
+                column: "UserId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AspNetUserLogins_UserId",
+                table: "AspNetUserLogins",
+                column: "UserId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AspNetUserRoles_RoleId",
+                table: "AspNetUserRoles",
+                column: "RoleId");
+
+            migrationBuilder.CreateIndex(
+                name: "EmailIndex",
+                table: "AspNetUsers",
+                column: "NormalizedEmail");
+
+            migrationBuilder.CreateIndex(
+                name: "UserNameIndex",
+                table: "AspNetUsers",
+                column: "NormalizedUserName",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AspNetRoleClaims");
+
+            migrationBuilder.DropTable(
+                name: "AspNetUserClaims");
+
+            migrationBuilder.DropTable(
+                name: "AspNetUserLogins");
+
+            migrationBuilder.DropTable(
+                name: "AspNetUserRoles");
+
+            migrationBuilder.DropTable(
+                name: "AspNetUserTokens");
+
+            migrationBuilder.DropTable(
+                name: "AspNetRoles");
+
+            migrationBuilder.DropTable(
+                name: "AspNetUsers");
+        }
+    }
+}

Newsbot.Collector.Database/Migrations/DatabaseContextModelSnapshot.cs

@@ -17,11 +17,207 @@ namespace Newsbot.Collector.Database.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.7")
+                .HasAnnotation("ProductVersion", "7.0.8")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
             modelBuilder.Entity("Newsbot.Collector.Domain.Entities.ArticlesEntity", b =>
                 {
                     b.Property<Guid>("Id")
@@ -214,6 +410,57 @@ namespace Newsbot.Collector.Database.Migrations
 
                     b.ToTable("Subscriptions");
                 });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
 #pragma warning restore 612, 618
         }
     }

Newsbot.Collector.Database/Newsbot.Collector.Database.csproj

@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="dapper" Version="2.0.123" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.8" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Newsbot.Collector.Database/Repositories/ArticlesTable.cs

@@ -11,29 +11,34 @@ namespace Newsbot.Collector.Database.Repositories;
 
 public class ArticlesTable : IArticlesRepository
 {
-    private readonly string _connectionString;
+    //private readonly string _connectionString;
 
     private DatabaseContext _context;  
 
     public ArticlesTable(string connectionString)
     {
-        _connectionString = connectionString;
+        //_connectionString = connectionString;
         _context = new DatabaseContext(connectionString);
     }
 
-    public ArticlesTable(IConfiguration configuration)
+    public ArticlesTable(DatabaseContext context)
     {
-        var conn = configuration.GetConnectionString("database");
-        if (conn is null) conn = "";
-
-        _connectionString = conn;
-        _context = new DatabaseContext(conn);
+        _context = context;
     }
 
+    //public ArticlesTable(IConfiguration configuration)
+    //{
+    //    var conn = configuration.GetConnectionString("database");
+    //    if (conn is null) conn = "";
+    //    
+    //    _context = new DatabaseContext(conn);
+    //}
+
     public List<ArticlesEntity> List(int page = 0, int count = 25)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var query = context.Articles
+        //using var context = new DatabaseContext(_connectionString);
+        
+        var query = _context.Articles
             .Skip(page * count)
             .OrderBy(d => d.PubDate)
             .Take(25);
@@ -43,8 +48,8 @@ public class ArticlesTable : IArticlesRepository
 
     public ArticlesEntity GetById(Guid id)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var query = context.Articles
+        //using var context = new DatabaseContext(_connectionString);
+        var query = _context.Articles
             .FirstOrDefault(d => d.Id.Equals(id));
         query ??= new ArticlesEntity();
         return query;
@@ -52,16 +57,16 @@ public class ArticlesTable : IArticlesRepository
 
     public ArticlesEntity GetByUrl(string url)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Articles.FirstOrDefault(d => d.Url!.Equals(url));
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Articles.FirstOrDefault(d => d.Url!.Equals(url));
         res ??= new ArticlesEntity();
         return res;
     }
 
     public List<ArticlesEntity> ListBySourceId(Guid id, int page, int count)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Articles
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Articles
             .Skip(page * count)
             .Where(d => d.SourceId.Equals(id));
         return res.ToList();
@@ -69,13 +74,14 @@ public class ArticlesTable : IArticlesRepository
 
     public ArticlesEntity New(ArticlesEntity model)
     {
-        using var context = new DatabaseContext(_connectionString);
+        //using var context = new DatabaseContext(_connectionString);
         model.Id = new Guid();
-        var query = context.Articles.Add(model);
-        context.SaveChanges();
+        var query = _context.Articles.Add(model);
+        _context.SaveChanges();
         return model;
     }
     
+    /*
     public ArticlesModel NewDapper(ArticlesModel model)
     {
         model.ID = Guid.NewGuid();
@@ -103,26 +109,27 @@ public class ArticlesTable : IArticlesRepository
         });
         return model;
     }
+    */
 
     public void DeleteAllBySourceId(Guid sourceId)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Articles
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Articles
             .Where(d => d.SourceId.Equals(sourceId))
             .ToList();
 
         foreach (var item in res)
         {
-            context.Articles.Remove(item);
+            _context.Articles.Remove(item);
         }
 
-        context.SaveChanges();
+        _context.SaveChanges();
     }
 
-    private IDbConnection OpenConnection(string connectionString)
-    {
-        var conn = new NpgsqlConnection(_connectionString);
-        conn.Open();
-        return conn;
-    }
+    //private IDbConnection OpenConnection(string connectionString)
+    //{
+    //    //var conn = new NpgsqlConnection(_connectionString);
+    //    //conn.Open();
+    //    //return conn;
+    //}
 }

Newsbot.Collector.Database/Repositories/DiscordQueue.cs

@@ -9,42 +9,49 @@ namespace Newsbot.Collector.Database.Repositories;
 
 public class DiscordQueueTable : IDiscordQueueRepository
 {
-    private string _connectionString;
+    //private string _connectionString;
+    private DatabaseContext _context;  
 
     public DiscordQueueTable(string connectionString)
     {
-        _connectionString = connectionString;
+        //_connectionString = connectionString;
+        _context = new DatabaseContext(connectionString);
     }
 
-    private IDbConnection OpenConnection(string connectionString)
+    public DiscordQueueTable(DatabaseContext context)
     {
-        var conn = new NpgsqlConnection(_connectionString);
-        conn.Open();
-        return conn;
+        _context = context;
     }
 
+    //private IDbConnection OpenConnection(string connectionString)
+    //{
+    //    var conn = new NpgsqlConnection(_connectionString);
+    //    conn.Open();
+    //    return conn;
+    //}
+
     public void New(DiscordQueueEntity model)
     {
         model.Id = new Guid();
         
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.DiscordQueue.Add(model);
-        context.SaveChanges();
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.DiscordQueue.Add(model);
+        _context.SaveChanges();
     }
 
     public void Delete(Guid id)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.DiscordQueue.FirstOrDefault(d => d.Id.Equals(id));
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.DiscordQueue.FirstOrDefault(d => d.Id.Equals(id));
         res ??= new DiscordQueueEntity();
-        context.DiscordQueue.Remove(res);
-        context.SaveChanges();
+        _context.DiscordQueue.Remove(res);
+        _context.SaveChanges();
     }
 
     public List<DiscordQueueEntity> List(int limit = 25)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.DiscordQueue.Take(limit).ToList();
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.DiscordQueue.Take(limit).ToList();
         return res;
     }
 }

Newsbot.Collector.Database/Repositories/DiscordWebhooksTable.cs

@@ -9,49 +9,50 @@ namespace Newsbot.Collector.Database.Repositories;
 
 public class DiscordWebhooksTable : IDiscordWebHooksRepository
 {
-    private readonly string _connectionString;
+    //private readonly string _connectionString;
+    private DatabaseContext _context;
 
     public DiscordWebhooksTable(string connectionString)
     {
-        _connectionString = connectionString;
+        //_connectionString = connectionString;
+        _context = new DatabaseContext(connectionString);
     }
 
-    public DiscordWebhooksTable(IConfiguration configuration)
+    public DiscordWebhooksTable(DatabaseContext context)
     {
-        var connstr = configuration.GetConnectionString("database") ?? "";
-        _connectionString = connstr;
+        _context = context;
     }
 
     public DiscordWebhookEntity New(DiscordWebhookEntity model)
     {
         model.Id = new Guid();
         
-        using var context = new DatabaseContext(_connectionString);
-        context.DiscordWebhooks.Add(model);
-        context.SaveChanges();
+        //using var context = new DatabaseContext(_connectionString);
+        _context.DiscordWebhooks.Add(model);
+        _context.SaveChanges();
         return model;
     }
 
     public DiscordWebhookEntity GetById(Guid id)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.DiscordWebhooks.FirstOrDefault(d => d.Id.Equals(id));
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.DiscordWebhooks.FirstOrDefault(d => d.Id.Equals(id));
         res ??= new DiscordWebhookEntity();
         return res;
     }
 
     public DiscordWebhookEntity GetByUrl(string url)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.DiscordWebhooks.FirstOrDefault(d => d.Url.Equals(url));
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.DiscordWebhooks.FirstOrDefault(d => d.Url.Equals(url));
         res ??= new DiscordWebhookEntity();
         return res;
     }
 
     public List<DiscordWebhookEntity> List(int page, int count = 25)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.DiscordWebhooks
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.DiscordWebhooks
             .Skip(page * count)
             .Take(count)
             .ToList();
@@ -61,8 +62,8 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
 
     public List<DiscordWebhookEntity> ListByServer(string server, int limit = 25)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.DiscordWebhooks
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.DiscordWebhooks
             .Where(d => d.Server.Equals(server))
             .Take(limit)
             .ToList();
@@ -72,8 +73,8 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
 
     public List<DiscordWebhookEntity> ListByServerAndChannel(string server, string channel, int limit = 25)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.DiscordWebhooks
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.DiscordWebhooks
             .Where(s => s.Server.Equals(server))
             .Where(c => c.Channel.Equals(channel))
             .Take(limit)
@@ -85,14 +86,14 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
     public int Disable(Guid id)
     {
         var res = GetById(id);
-        using var context = new DatabaseContext(_connectionString);
+        //using var context = new DatabaseContext(_connectionString);
 
         res.Enabled = true;
         
-        context.DiscordWebhooks.Update(res);
+        _context.DiscordWebhooks.Update(res);
         try
         {
-            context.SaveChanges();
+            _context.SaveChanges();
             return 1;
         }
         catch(Exception ex)
@@ -105,14 +106,14 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
     public int Enable(Guid id)
     {
         var res = GetById(id);
-        using var context = new DatabaseContext(_connectionString);
+        //using var context = new DatabaseContext(_connectionString);
 
         res.Enabled = false;
         
-        context.DiscordWebhooks.Update(res);
+        _context.DiscordWebhooks.Update(res);
         try
         {
-            context.SaveChanges();
+            _context.SaveChanges();
             return 1;
         }
         catch(Exception ex)
@@ -122,10 +123,10 @@ public class DiscordWebhooksTable : IDiscordWebHooksRepository
         }
     }
 
-    private IDbConnection OpenConnection(string connectionString)
-    {
-        var conn = new NpgsqlConnection(_connectionString);
-        conn.Open();
-        return conn;
-    }
+    //private IDbConnection OpenConnection(string connectionString)
+    //{
+    //    var conn = new NpgsqlConnection(_connectionString);
+    //    conn.Open();
+    //    return conn;
+    //}
 }

Newsbot.Collector.Database/Repositories/IconsTable.cs

@@ -10,49 +10,49 @@ namespace Newsbot.Collector.Database.Repositories;
 
 public class IconsTable : IIconsRepository
 {
-    private readonly string _connectionString;
+    //private readonly string _connectionString;
+    private DatabaseContext _context;
 
     public IconsTable(string connectionString)
     {
-        _connectionString = connectionString;
+        //_connectionString = connectionString;
+        _context = new DatabaseContext(connectionString);
     }
 
-    public IconsTable(IConfiguration configuration)
+    public IconsTable(DatabaseContext context)
     {
-        var connstr = configuration.GetConnectionString("database");
-        if (connstr is null) connstr = "";
-        _connectionString = connstr;
+        _context = context;
     }
 
     public void New(IconEntity model)
     {
-        using var context = new DatabaseContext(_connectionString);
+        //using var context = new DatabaseContext(_connectionString);
         model.Id = Guid.NewGuid();
 
-        context.Icons.Add(model);
-        context.SaveChanges();
+        _context.Icons.Add(model);
+        _context.SaveChanges();
     }
 
     public IconEntity GetById(Guid id)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Icons.FirstOrDefault(f => f.Id.Equals(id));
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Icons.FirstOrDefault(f => f.Id.Equals(id));
         res ??= new IconEntity();
         return res;
     }
 
     public IconEntity GetBySourceId(Guid id)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Icons.FirstOrDefault(f => f.SourceId.Equals(id));
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Icons.FirstOrDefault(f => f.SourceId.Equals(id));
         res ??= new IconEntity();
         return res;
     }
 
-    private IDbConnection OpenConnection(string connectionString)
-    {
-        var conn = new NpgsqlConnection(_connectionString);
-        conn.Open();
-        return conn;
-    }
+    //private IDbConnection OpenConnection(string connectionString)
+    //{
+    //    var conn = new NpgsqlConnection(_connectionString);
+    //    conn.Open();
+    //    return conn;
+    //}
 }

Newsbot.Collector.Database/Repositories/SourcesTable.cs

@@ -10,28 +10,28 @@ namespace Newsbot.Collector.Database.Repositories;
 
 public class SourcesTable : ISourcesRepository
 {
-    private readonly string _connectionString;
+    //private readonly string _connectionString;
+    private DatabaseContext _context;
 
     public SourcesTable(string connectionString)
     {
-        _connectionString = connectionString;
+        //_connectionString = connectionString;
+        _context = new DatabaseContext(connectionString);
     }
 
-    public SourcesTable(IConfiguration configuration)
+    public SourcesTable(DatabaseContext context)
     {
-        var connstr = configuration.GetConnectionString("database");
-        if (connstr is null) connstr = "";
-        _connectionString = connstr;
+        _context = context;
     }
 
     public SourceEntity New(SourceEntity model)
     {
         model.Id = Guid.NewGuid();
-        using var context = new DatabaseContext(_connectionString);
-        context.Sources.Add(model);
+        //using var context = new DatabaseContext(_connectionString);
+        _context.Sources.Add(model);
         try
         {
-            context.SaveChanges();
+            _context.SaveChanges();
         }
         catch (Exception ex)
         {
@@ -43,8 +43,8 @@ public class SourcesTable : ISourcesRepository
 
     public SourceEntity GetById(Guid id)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Sources.FirstOrDefault(f => f.Id.Equals(id));
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Sources.FirstOrDefault(f => f.Id.Equals(id));
         res ??= new SourceEntity();
         return res;
     }
@@ -57,16 +57,16 @@ public class SourcesTable : ISourcesRepository
 
     public SourceEntity GetByName(string name)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Sources.FirstOrDefault(f => f.Name.Equals(name));
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Sources.FirstOrDefault(f => f.Name.Equals(name));
         res ??= new SourceEntity();
         return res;
     }
 
     public SourceEntity GetByNameAndType(string name, string type)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Sources
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Sources
             .Where(f => f.Name.Equals(name))
             .FirstOrDefault(f => f.Type.Equals(type));
         res ??= new SourceEntity();
@@ -75,8 +75,8 @@ public class SourcesTable : ISourcesRepository
 
     public SourceEntity GetByUrl(string url)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Sources
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Sources
             .FirstOrDefault(f => f.Url.Equals(url));
         res ??= new SourceEntity();
         return res;
@@ -84,8 +84,8 @@ public class SourcesTable : ISourcesRepository
 
     public List<SourceEntity> List(int page = 0, int count = 100)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Sources
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Sources
             .Skip(page * count)
             .Take(count)
             .ToList();
@@ -94,8 +94,8 @@ public class SourcesTable : ISourcesRepository
 
     public List<SourceEntity> ListBySource(string source, int page = 0, int limit = 25)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Sources
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Sources
             .Where(f => f.Source.Equals(source))
             .Skip(page * limit)
             .Take(limit)
@@ -105,8 +105,8 @@ public class SourcesTable : ISourcesRepository
 
     public List<SourceEntity> ListByType(string type,int page = 0, int limit = 25)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Sources
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Sources
             .Where(f => f.Type.Equals(type))
             .Skip(page * limit)
             .Take(limit)
@@ -116,13 +116,13 @@ public class SourcesTable : ISourcesRepository
 
     public int Disable(Guid id)
     {
-        using var context = new DatabaseContext(_connectionString);
+        //using var context = new DatabaseContext(_connectionString);
         var res = GetById(id);
         res.Enabled = false;
-        context.Sources.Update(res);
+        _context.Sources.Update(res);
         try
         {
-            context.SaveChanges();
+            _context.SaveChanges();
             return 1;
         }
         catch
@@ -133,13 +133,13 @@ public class SourcesTable : ISourcesRepository
 
     public int Enable(Guid id)
     {
-        using var context = new DatabaseContext(_connectionString);
+        //using var context = new DatabaseContext(_connectionString);
         var res = GetById(id);
         res.Enabled = true;
-        context.Sources.Update(res);
+        _context.Sources.Update(res);
         try
         {
-            context.SaveChanges();
+            _context.SaveChanges();
             return 1;
         }
         catch
@@ -150,21 +150,21 @@ public class SourcesTable : ISourcesRepository
 
     public void Delete(Guid id)
     {
-        using var context = new DatabaseContext(_connectionString);
+        //using var context = new DatabaseContext(_connectionString);
         var res = GetById(id);
-        context.Sources.Remove(res);
-        context.SaveChanges();
+        _context.Sources.Remove(res);
+        _context.SaveChanges();
     }
 
     public int UpdateYoutubeId(Guid id, string youtubeId)
     {
-        using var context = new DatabaseContext(_connectionString);
+        //using var context = new DatabaseContext(_connectionString);
         var res = GetById(id);
         res.YoutubeId = youtubeId;
-        context.Sources.Update(res);
+        _context.Sources.Update(res);
         try
         {
-            context.SaveChanges();
+            _context.SaveChanges();
             return 1;
         }
         catch
@@ -173,10 +173,10 @@ public class SourcesTable : ISourcesRepository
         }
     }
 
-    private IDbConnection OpenConnection(string connectionString)
-    {
-        var conn = new NpgsqlConnection(_connectionString);
-        conn.Open();
-        return conn;
-    }
+    //private IDbConnection OpenConnection(string connectionString)
+    //{
+    //    var conn = new NpgsqlConnection(_connectionString);
+    //    conn.Open();
+    //    return conn;
+    //}
 }

Newsbot.Collector.Database/Repositories/SubscriptionsTable.cs

@@ -10,61 +10,61 @@ namespace Newsbot.Collector.Database.Repositories;
 
 public class SubscriptionsTable : ISubscriptionRepository
 {
-    private readonly string _connectionString;
+    //private readonly string _connectionString;
+    private DatabaseContext _context;
 
     public SubscriptionsTable(string connectionString)
     {
-        _connectionString = connectionString;
+        //_connectionString = connectionString;
+        _context = new DatabaseContext(connectionString);
     }
 
-    public SubscriptionsTable(IConfiguration configuration)
+    public SubscriptionsTable(DatabaseContext context)
     {
-        var connstr = configuration.GetConnectionString("database");
-        if (connstr is null) connstr = "";
-        _connectionString = connstr;
+        _context = context;
     }
 
     public SubscriptionEntity New(SubscriptionEntity model)
     {
         model.Id = new Guid();
-        using var context = new DatabaseContext(_connectionString);
-        context.Subscriptions.Add(model);
-        context.SaveChanges();
+        //using var context = new DatabaseContext(_connectionString);
+        _context.Subscriptions.Add(model);
+        _context.SaveChanges();
         return model;
     }
 
     public List<SubscriptionEntity> List(int page = 0, int count = 25)
     {
-        using var context = new DatabaseContext(_connectionString);
-        return context.Subscriptions.Skip(page * count).Take(count).ToList();
+        //using var context = new DatabaseContext(_connectionString);
+        return _context.Subscriptions.Skip(page * count).Take(count).ToList();
     }
 
     public List<SubscriptionEntity> ListBySourceId(Guid id, int page = 0, int count = 25)
     {
-        using var context = new DatabaseContext(_connectionString);
-        return context.Subscriptions.Where(f => f.SourceId.Equals(id))
+        //using var context = new DatabaseContext(_connectionString);
+        return _context.Subscriptions.Where(f => f.SourceId.Equals(id))
             .Skip(page * count)
             .ToList();
     }
 
     public List<SubscriptionEntity> ListByWebhook(Guid id, int page = 0, int count = 25)
     {
-        using var context = new DatabaseContext(_connectionString);
-        return context.Subscriptions.Where(f => f.DiscordWebHookId.Equals(id)).Skip(page * count).ToList();
+        //using var context = new DatabaseContext(_connectionString);
+        return _context.Subscriptions.Where(f => f.DiscordWebHookId.Equals(id)).Skip(page * count).ToList();
     }
 
     public SubscriptionEntity GetById(Guid id)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Subscriptions
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Subscriptions
             .FirstOrDefault(f => f.Id.Equals(id));
         return res ??= new SubscriptionEntity();
     }
 
     public SubscriptionEntity GetByWebhookAndSource(Guid webhookId, Guid sourceId)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Subscriptions
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Subscriptions
             .Where(f => f.DiscordWebHookId.Equals(webhookId))
             .FirstOrDefault(f => f.SourceId.Equals(sourceId));
         return res ??= new SubscriptionEntity();
@@ -72,22 +72,21 @@ public class SubscriptionsTable : ISubscriptionRepository
 
     public void Delete(Guid id)
     {
-        using var context = new DatabaseContext(_connectionString);
-        var res = context.Subscriptions.FirstOrDefault(f => f.Id.Equals(id));
+        //using var context = new DatabaseContext(_connectionString);
+        var res = _context.Subscriptions.FirstOrDefault(f => f.Id.Equals(id));
         if (res is null)
         {
             return;
         }
 
-        context.Subscriptions.Remove(res);
-        context.SaveChanges();
-
+        _context.Subscriptions.Remove(res);
+        _context.SaveChanges();
     }
 
-    private IDbConnection OpenConnection(string connectionString)
-    {
-        var conn = new NpgsqlConnection(_connectionString);
-        conn.Open();
-        return conn;
-    }
+    //private IDbConnection OpenConnection(string connectionString)
+    //{
+    //    var conn = new NpgsqlConnection(_connectionString);
+    //    conn.Open();
+    //    return conn;
+    //}
 }

Newsbot.Collector.Domain/Models/Config/JwtSettings.cs

@@ -0,0 +1,6 @@
+namespace Newsbot.Collector.Domain.Models.Config;
+
+public class JwtSettings
+{
+    public string? Secret { get; set; }
+}

Newsbot.Collector.Domain/Models/Config/Sources/ConfigSectionRedditModel.cs

@@ -1,4 +1,4 @@
-namespace Newsbot.Collector.Domain.Models.Config;
+namespace Newsbot.Collector.Domain.Models.Config.Sources;
 
 public class ConfigSectionRedditModel
 {

Newsbot.Collector.Domain/Models/Config/Sources/ConfigSectionRssModel.cs

@@ -1,4 +1,4 @@
-namespace Newsbot.Collector.Domain.Models.Config;
+namespace Newsbot.Collector.Domain.Models.Config.Sources;
 
 public class ConfigSectionRssModel
 {

Newsbot.Collector.Domain/Models/Config/Sources/ConfigSectionYoutubeModel.cs

@@ -1,4 +1,4 @@
-namespace Newsbot.Collector.Domain.Models.Config;
+namespace Newsbot.Collector.Domain.Models.Config.Sources;
 
 public class ConfigSectionYoutubeModel
 {