From 6c243d0247dc427b55e7f94731390737c0c92512 Mon Sep 17 00:00:00 2001 From: rootdarkarchon Date: Mon, 22 Aug 2022 11:21:28 +0200 Subject: [PATCH] move shared content to shared project --- MareSynchronosServer/MareSynchronosServer.sln | 8 +++- .../MareSynchronosServer/CleanupService.cs | 6 +-- .../Data/MareDbContext.cs | 39 ------------------- .../Discord/DiscordBot.cs | 4 +- .../Hubs/MareHub.Admin.cs | 4 +- .../Hubs/MareHub.Files.cs | 4 +- .../MareSynchronosServer/Hubs/MareHub.User.cs | 4 +- .../MareSynchronosServer/Hubs/MareHub.cs | 7 ++-- .../IdBasedUserIdProvider.cs | 2 +- .../MareSynchronosServer.csproj | 7 +--- .../MareSynchronosServer/Program.cs | 3 +- .../MareSynchronosServer/Startup.cs | 4 +- .../MareSynchronosServer/SystemInfoService.cs | 2 +- .../Hubs/MareHubTest.cs | 6 +-- .../SecretKeyAuthenticationHandler.cs | 13 +++---- .../Data/MareDbContext.cs | 38 ++++++++++++++++++ .../Extensions.cs | 0 .../MareSynchronosShared.csproj | 25 ++++++++++++ .../Metrics/MareMetrics.cs | 2 +- .../20220731210149_InitialCreate.Designer.cs | 2 +- .../20220731210149_InitialCreate.cs | 0 ...731211419_RenameLowerSnakeCase.Designer.cs | 2 +- .../20220731211419_RenameLowerSnakeCase.cs | 0 ...0220801121419_AddLodestoneAuth.Designer.cs | 2 +- .../20220801121419_AddLodestoneAuth.cs | 0 ...ullableLodestoneAuthProperties.Designer.cs | 2 +- ...2103_AddNullableLodestoneAuthProperties.cs | 0 ...6103053_AddBannedRegistrations.Designer.cs | 2 +- .../20220806103053_AddBannedRegistrations.cs | 0 ...16170426_SetMaxLimitForStrings.Designer.cs | 2 +- .../20220816170426_SetMaxLimitForStrings.cs | 0 .../Migrations/MareDbContextModelSnapshot.cs | 2 +- .../Models/Auth.cs | 2 +- .../Models/Banned.cs | 2 +- .../Models/BannedRegistrations.cs | 2 +- .../Models/ClientPair.cs | 2 +- .../Models/FileCache.cs | 2 +- .../Models/ForbiddenUploadEntry.cs | 2 +- .../Models/LodeStoneAuth.cs | 5 +-- .../Models/User.cs | 5 +-- 40 files changed, 117 insertions(+), 97 deletions(-) delete mode 100644 MareSynchronosServer/MareSynchronosServer/Data/MareDbContext.cs rename MareSynchronosServer/MareSynchronosServer/{Authentication => }/IdBasedUserIdProvider.cs (88%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Authentication/SecretKeyAuthenticationHandler.cs (97%) create mode 100644 MareSynchronosServer/MareSynchronosShared/Data/MareDbContext.cs rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Extensions.cs (100%) create mode 100644 MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Metrics/MareMetrics.cs (99%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220731210149_InitialCreate.Designer.cs (99%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220731210149_InitialCreate.cs (100%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220731211419_RenameLowerSnakeCase.Designer.cs (99%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220731211419_RenameLowerSnakeCase.cs (100%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220801121419_AddLodestoneAuth.Designer.cs (99%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220801121419_AddLodestoneAuth.cs (100%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220801122103_AddNullableLodestoneAuthProperties.Designer.cs (99%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220801122103_AddNullableLodestoneAuthProperties.cs (100%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220806103053_AddBannedRegistrations.Designer.cs (99%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220806103053_AddBannedRegistrations.cs (100%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220816170426_SetMaxLimitForStrings.Designer.cs (99%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/20220816170426_SetMaxLimitForStrings.cs (100%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Migrations/MareDbContextModelSnapshot.cs (99%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Models/Auth.cs (87%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Models/Banned.cs (88%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Models/BannedRegistrations.cs (84%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Models/ClientPair.cs (92%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Models/FileCache.cs (91%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Models/ForbiddenUploadEntry.cs (89%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Models/LodeStoneAuth.cs (78%) rename MareSynchronosServer/{MareSynchronosServer => MareSynchronosShared}/Models/User.cs (81%) diff --git a/MareSynchronosServer/MareSynchronosServer.sln b/MareSynchronosServer/MareSynchronosServer.sln index 8f013f3..461354f 100644 --- a/MareSynchronosServer/MareSynchronosServer.sln +++ b/MareSynchronosServer/MareSynchronosServer.sln @@ -7,7 +7,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronosServer", "Mar EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos.API", "..\MareAPI\MareSynchronosAPI\MareSynchronos.API.csproj", "{326BFB1B-5571-47A6-8513-1FFDB32D53B0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MareSynchronosServerTest", "MareSynchronosServerTest\MareSynchronosServerTest.csproj", "{25A82A2A-35C2-4EE0-A0E8-DFDD77978DDA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronosServerTest", "MareSynchronosServerTest\MareSynchronosServerTest.csproj", "{25A82A2A-35C2-4EE0-A0E8-DFDD77978DDA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MareSynchronosShared", "MareSynchronosShared\MareSynchronosShared.csproj", "{67B1461D-E215-4BA8-A64D-E1836724D5E6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -27,6 +29,10 @@ Global {25A82A2A-35C2-4EE0-A0E8-DFDD77978DDA}.Debug|Any CPU.Build.0 = Debug|Any CPU {25A82A2A-35C2-4EE0-A0E8-DFDD77978DDA}.Release|Any CPU.ActiveCfg = Release|Any CPU {25A82A2A-35C2-4EE0-A0E8-DFDD77978DDA}.Release|Any CPU.Build.0 = Release|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MareSynchronosServer/MareSynchronosServer/CleanupService.cs b/MareSynchronosServer/MareSynchronosServer/CleanupService.cs index 401c496..5eff01d 100644 --- a/MareSynchronosServer/MareSynchronosServer/CleanupService.cs +++ b/MareSynchronosServer/MareSynchronosServer/CleanupService.cs @@ -4,10 +4,10 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; -using MareSynchronosServer.Authentication; -using MareSynchronosServer.Data; using MareSynchronosServer.Metrics; -using MareSynchronosServer.Models; +using MareSynchronosShared.Authentication; +using MareSynchronosShared.Data; +using MareSynchronosShared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; diff --git a/MareSynchronosServer/MareSynchronosServer/Data/MareDbContext.cs b/MareSynchronosServer/MareSynchronosServer/Data/MareDbContext.cs deleted file mode 100644 index 571436a..0000000 --- a/MareSynchronosServer/MareSynchronosServer/Data/MareDbContext.cs +++ /dev/null @@ -1,39 +0,0 @@ -using MareSynchronosServer.Models; -using Microsoft.EntityFrameworkCore; - -namespace MareSynchronosServer.Data -{ - public class MareDbContext : DbContext - { - public MareDbContext(DbContextOptions options) : base(options) - { - } - - public DbSet Users { get; set; } - public DbSet Files { get; set; } - public DbSet ClientPairs { get; set; } - public DbSet ForbiddenUploadEntries { get; set; } - public DbSet BannedUsers { get; set; } - public DbSet Auth { get; set; } - public DbSet LodeStoneAuth { get; set; } - public DbSet BannedRegistrations { get; set; } - - - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - modelBuilder.Entity().ToTable("auth"); - modelBuilder.Entity().ToTable("users"); - modelBuilder.Entity().HasIndex(c => c.CharacterIdentification); - modelBuilder.Entity().ToTable("file_caches"); - modelBuilder.Entity().HasIndex(c => c.UploaderUID); - modelBuilder.Entity().ToTable("client_pairs"); - modelBuilder.Entity().HasKey(u => new { u.UserUID, u.OtherUserUID }); - modelBuilder.Entity().HasIndex(c => c.UserUID); - modelBuilder.Entity().HasIndex(c => c.OtherUserUID); - modelBuilder.Entity().ToTable("forbidden_upload_entries"); - modelBuilder.Entity().ToTable("banned_users"); - modelBuilder.Entity().ToTable("lodestone_auth"); - modelBuilder.Entity().ToTable("banned_registrations"); - } - } -} diff --git a/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs b/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs index de4df59..46b5887 100644 --- a/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs +++ b/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs @@ -1,9 +1,7 @@ using Discord; using Discord.WebSocket; -using MareSynchronosServer.Data; using MareSynchronosServer.Hubs; using MareSynchronosServer.Metrics; -using MareSynchronosServer.Models; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -18,6 +16,8 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; +using MareSynchronosShared.Data; +using MareSynchronosShared.Models; namespace MareSynchronosServer.Discord { diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Admin.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Admin.cs index 548204a..23f5271 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Admin.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Admin.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Threading.Tasks; using MareSynchronos.API; -using MareSynchronosServer.Authentication; -using MareSynchronosServer.Models; +using MareSynchronosShared.Authentication; +using MareSynchronosShared.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.EntityFrameworkCore; diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs index ecbfc69..2f31a0c 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Files.cs @@ -7,9 +7,9 @@ using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; using MareSynchronos.API; -using MareSynchronosServer.Authentication; using MareSynchronosServer.Metrics; -using MareSynchronosServer.Models; +using MareSynchronosShared.Authentication; +using MareSynchronosShared.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.EntityFrameworkCore; diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs index a3ec2f0..961756c 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs @@ -2,9 +2,9 @@ using System.Linq; using System.Threading.Tasks; using MareSynchronos.API; -using MareSynchronosServer.Authentication; using MareSynchronosServer.Metrics; -using MareSynchronosServer.Models; +using MareSynchronosShared.Authentication; +using MareSynchronosShared.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.EntityFrameworkCore; diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs index 79d4911..e98aa6a 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs @@ -4,9 +4,10 @@ using System.Security.Claims; using System.Security.Cryptography; using System.Threading.Tasks; using MareSynchronos.API; -using MareSynchronosServer.Authentication; -using MareSynchronosServer.Data; using MareSynchronosServer.Metrics; +using MareSynchronosShared.Authentication; +using MareSynchronosShared.Data; +using MareSynchronosShared.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.SignalR; @@ -147,7 +148,7 @@ namespace MareSynchronosServer.Hubs protected string AuthenticatedUserId => Context.User?.Claims?.SingleOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value ?? "Unknown"; - protected async Task GetAuthenticatedUserUntrackedAsync() + protected async Task GetAuthenticatedUserUntrackedAsync() { return await _dbContext.Users.AsNoTrackingWithIdentityResolution().SingleAsync(u => u.UID == AuthenticatedUserId).ConfigureAwait(false); } diff --git a/MareSynchronosServer/MareSynchronosServer/Authentication/IdBasedUserIdProvider.cs b/MareSynchronosServer/MareSynchronosServer/IdBasedUserIdProvider.cs similarity index 88% rename from MareSynchronosServer/MareSynchronosServer/Authentication/IdBasedUserIdProvider.cs rename to MareSynchronosServer/MareSynchronosServer/IdBasedUserIdProvider.cs index 05aef38..2da4d53 100644 --- a/MareSynchronosServer/MareSynchronosServer/Authentication/IdBasedUserIdProvider.cs +++ b/MareSynchronosServer/MareSynchronosServer/IdBasedUserIdProvider.cs @@ -2,7 +2,7 @@ using System.Security.Claims; using Microsoft.AspNetCore.SignalR; -namespace MareSynchronosServer.Authentication +namespace MareSynchronosServer { public class IdBasedUserIdProvider : IUserIdProvider { diff --git a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj index c787afe..55c42ec 100644 --- a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj +++ b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj @@ -26,18 +26,13 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + diff --git a/MareSynchronosServer/MareSynchronosServer/Program.cs b/MareSynchronosServer/MareSynchronosServer/Program.cs index 264d8e4..d3c1aed 100644 --- a/MareSynchronosServer/MareSynchronosServer/Program.cs +++ b/MareSynchronosServer/MareSynchronosServer/Program.cs @@ -2,14 +2,13 @@ using System; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using System.Linq; -using MareSynchronosServer.Data; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using MareSynchronosServer.Metrics; -using MareSynchronosServer.Models; using System.Collections.Generic; +using MareSynchronosShared.Data; namespace MareSynchronosServer { diff --git a/MareSynchronosServer/MareSynchronosServer/Startup.cs b/MareSynchronosServer/MareSynchronosServer/Startup.cs index 9b862d1..a6b8a1d 100644 --- a/MareSynchronosServer/MareSynchronosServer/Startup.cs +++ b/MareSynchronosServer/MareSynchronosServer/Startup.cs @@ -5,8 +5,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using MareSynchronosServer.Authentication; -using MareSynchronosServer.Data; using MareSynchronosServer.Hubs; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http.Connections; @@ -18,6 +16,8 @@ using MareSynchronosServer.Discord; using AspNetCoreRateLimit; using MareSynchronosServer.Throttling; using Ben.Diagnostics; +using MareSynchronosShared.Authentication; +using MareSynchronosShared.Data; namespace MareSynchronosServer { diff --git a/MareSynchronosServer/MareSynchronosServer/SystemInfoService.cs b/MareSynchronosServer/MareSynchronosServer/SystemInfoService.cs index 5562c37..9c9ad62 100644 --- a/MareSynchronosServer/MareSynchronosServer/SystemInfoService.cs +++ b/MareSynchronosServer/MareSynchronosServer/SystemInfoService.cs @@ -3,9 +3,9 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using MareSynchronos.API; -using MareSynchronosServer.Data; using MareSynchronosServer.Hubs; using MareSynchronosServer.Metrics; +using MareSynchronosShared.Data; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/MareSynchronosServer/MareSynchronosServerTest/Hubs/MareHubTest.cs b/MareSynchronosServer/MareSynchronosServerTest/Hubs/MareHubTest.cs index 73764ac..4f8394e 100644 --- a/MareSynchronosServer/MareSynchronosServerTest/Hubs/MareHubTest.cs +++ b/MareSynchronosServer/MareSynchronosServerTest/Hubs/MareHubTest.cs @@ -1,6 +1,4 @@ -using MareSynchronosServer.Data; -using MareSynchronosServer.Hubs; -using MareSynchronosServer.Models; +using MareSynchronosServer.Hubs; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.SignalR; using Microsoft.EntityFrameworkCore; @@ -13,6 +11,8 @@ using System.Linq; using System.Security.Claims; using System.Text; using System.Threading.Tasks; +using MareSynchronosShared.Data; +using MareSynchronosShared.Models; namespace MareSynchronosServerTest.Hubs { public class MareHubTest { diff --git a/MareSynchronosServer/MareSynchronosServer/Authentication/SecretKeyAuthenticationHandler.cs b/MareSynchronosServer/MareSynchronosShared/Authentication/SecretKeyAuthenticationHandler.cs similarity index 97% rename from MareSynchronosServer/MareSynchronosServer/Authentication/SecretKeyAuthenticationHandler.cs rename to MareSynchronosServer/MareSynchronosShared/Authentication/SecretKeyAuthenticationHandler.cs index 3f26b89..57ab121 100644 --- a/MareSynchronosServer/MareSynchronosServer/Authentication/SecretKeyAuthenticationHandler.cs +++ b/MareSynchronosServer/MareSynchronosShared/Authentication/SecretKeyAuthenticationHandler.cs @@ -1,22 +1,19 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Claims; +using System.Security.Claims; using System.Security.Cryptography; using System.Text; using System.Text.Encodings.Web; -using System.Threading; -using System.Threading.Tasks; -using MareSynchronosServer.Data; +using MareSynchronosServer; using MareSynchronosServer.Metrics; +using MareSynchronosShared.Data; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using ISystemClock = Microsoft.AspNetCore.Authentication.ISystemClock; -namespace MareSynchronosServer.Authentication +namespace MareSynchronosShared.Authentication { public class FailedAuthorization : IDisposable { diff --git a/MareSynchronosServer/MareSynchronosShared/Data/MareDbContext.cs b/MareSynchronosServer/MareSynchronosShared/Data/MareDbContext.cs new file mode 100644 index 0000000..b20ca3b --- /dev/null +++ b/MareSynchronosServer/MareSynchronosShared/Data/MareDbContext.cs @@ -0,0 +1,38 @@ +using MareSynchronosShared.Models; +using Microsoft.EntityFrameworkCore; + +namespace MareSynchronosShared.Data; + +public class MareDbContext : DbContext +{ + public MareDbContext(DbContextOptions options) : base(options) + { + } + + public DbSet Users { get; set; } + public DbSet Files { get; set; } + public DbSet ClientPairs { get; set; } + public DbSet ForbiddenUploadEntries { get; set; } + public DbSet BannedUsers { get; set; } + public DbSet Auth { get; set; } + public DbSet LodeStoneAuth { get; set; } + public DbSet BannedRegistrations { get; set; } + + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + modelBuilder.Entity().ToTable("auth"); + modelBuilder.Entity().ToTable("users"); + modelBuilder.Entity().HasIndex(c => c.CharacterIdentification); + modelBuilder.Entity().ToTable("file_caches"); + modelBuilder.Entity().HasIndex(c => c.UploaderUID); + modelBuilder.Entity().ToTable("client_pairs"); + modelBuilder.Entity().HasKey(u => new { u.UserUID, u.OtherUserUID }); + modelBuilder.Entity().HasIndex(c => c.UserUID); + modelBuilder.Entity().HasIndex(c => c.OtherUserUID); + modelBuilder.Entity().ToTable("forbidden_upload_entries"); + modelBuilder.Entity().ToTable("banned_users"); + modelBuilder.Entity().ToTable("lodestone_auth"); + modelBuilder.Entity().ToTable("banned_registrations"); + } +} \ No newline at end of file diff --git a/MareSynchronosServer/MareSynchronosServer/Extensions.cs b/MareSynchronosServer/MareSynchronosShared/Extensions.cs similarity index 100% rename from MareSynchronosServer/MareSynchronosServer/Extensions.cs rename to MareSynchronosServer/MareSynchronosShared/Extensions.cs diff --git a/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj new file mode 100644 index 0000000..f81b7f4 --- /dev/null +++ b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj @@ -0,0 +1,25 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + diff --git a/MareSynchronosServer/MareSynchronosServer/Metrics/MareMetrics.cs b/MareSynchronosServer/MareSynchronosShared/Metrics/MareMetrics.cs similarity index 99% rename from MareSynchronosServer/MareSynchronosServer/Metrics/MareMetrics.cs rename to MareSynchronosServer/MareSynchronosShared/Metrics/MareMetrics.cs index a78798d..7cd69d2 100644 --- a/MareSynchronosServer/MareSynchronosServer/Metrics/MareMetrics.cs +++ b/MareSynchronosServer/MareSynchronosShared/Metrics/MareMetrics.cs @@ -1,6 +1,6 @@ using System.IO; using System.Linq; -using MareSynchronosServer.Data; +using MareSynchronosShared.Data; using Microsoft.Extensions.Configuration; using Prometheus; diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220731210149_InitialCreate.Designer.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220731210149_InitialCreate.Designer.cs similarity index 99% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220731210149_InitialCreate.Designer.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220731210149_InitialCreate.Designer.cs index ddfded1..31ea23a 100644 --- a/MareSynchronosServer/MareSynchronosServer/Migrations/20220731210149_InitialCreate.Designer.cs +++ b/MareSynchronosServer/MareSynchronosShared/Migrations/20220731210149_InitialCreate.Designer.cs @@ -1,6 +1,6 @@ // using System; -using MareSynchronosServer.Data; +using MareSynchronosShared.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220731210149_InitialCreate.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220731210149_InitialCreate.cs similarity index 100% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220731210149_InitialCreate.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220731210149_InitialCreate.cs diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220731211419_RenameLowerSnakeCase.Designer.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220731211419_RenameLowerSnakeCase.Designer.cs similarity index 99% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220731211419_RenameLowerSnakeCase.Designer.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220731211419_RenameLowerSnakeCase.Designer.cs index 9c8495c..59c7501 100644 --- a/MareSynchronosServer/MareSynchronosServer/Migrations/20220731211419_RenameLowerSnakeCase.Designer.cs +++ b/MareSynchronosServer/MareSynchronosShared/Migrations/20220731211419_RenameLowerSnakeCase.Designer.cs @@ -1,6 +1,6 @@ // using System; -using MareSynchronosServer.Data; +using MareSynchronosShared.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220731211419_RenameLowerSnakeCase.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220731211419_RenameLowerSnakeCase.cs similarity index 100% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220731211419_RenameLowerSnakeCase.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220731211419_RenameLowerSnakeCase.cs diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220801121419_AddLodestoneAuth.Designer.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220801121419_AddLodestoneAuth.Designer.cs similarity index 99% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220801121419_AddLodestoneAuth.Designer.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220801121419_AddLodestoneAuth.Designer.cs index 0476cdc..5bab84a 100644 --- a/MareSynchronosServer/MareSynchronosServer/Migrations/20220801121419_AddLodestoneAuth.Designer.cs +++ b/MareSynchronosServer/MareSynchronosShared/Migrations/20220801121419_AddLodestoneAuth.Designer.cs @@ -1,6 +1,6 @@ // using System; -using MareSynchronosServer.Data; +using MareSynchronosShared.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220801121419_AddLodestoneAuth.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220801121419_AddLodestoneAuth.cs similarity index 100% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220801121419_AddLodestoneAuth.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220801121419_AddLodestoneAuth.cs diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220801122103_AddNullableLodestoneAuthProperties.Designer.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220801122103_AddNullableLodestoneAuthProperties.Designer.cs similarity index 99% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220801122103_AddNullableLodestoneAuthProperties.Designer.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220801122103_AddNullableLodestoneAuthProperties.Designer.cs index 54c6aa5..3b29f0d 100644 --- a/MareSynchronosServer/MareSynchronosServer/Migrations/20220801122103_AddNullableLodestoneAuthProperties.Designer.cs +++ b/MareSynchronosServer/MareSynchronosShared/Migrations/20220801122103_AddNullableLodestoneAuthProperties.Designer.cs @@ -1,6 +1,6 @@ // using System; -using MareSynchronosServer.Data; +using MareSynchronosShared.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220801122103_AddNullableLodestoneAuthProperties.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220801122103_AddNullableLodestoneAuthProperties.cs similarity index 100% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220801122103_AddNullableLodestoneAuthProperties.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220801122103_AddNullableLodestoneAuthProperties.cs diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220806103053_AddBannedRegistrations.Designer.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220806103053_AddBannedRegistrations.Designer.cs similarity index 99% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220806103053_AddBannedRegistrations.Designer.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220806103053_AddBannedRegistrations.Designer.cs index f7d9af7..82a1dcf 100644 --- a/MareSynchronosServer/MareSynchronosServer/Migrations/20220806103053_AddBannedRegistrations.Designer.cs +++ b/MareSynchronosServer/MareSynchronosShared/Migrations/20220806103053_AddBannedRegistrations.Designer.cs @@ -1,6 +1,6 @@ // using System; -using MareSynchronosServer.Data; +using MareSynchronosShared.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220806103053_AddBannedRegistrations.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220806103053_AddBannedRegistrations.cs similarity index 100% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220806103053_AddBannedRegistrations.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220806103053_AddBannedRegistrations.cs diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220816170426_SetMaxLimitForStrings.Designer.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220816170426_SetMaxLimitForStrings.Designer.cs similarity index 99% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220816170426_SetMaxLimitForStrings.Designer.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220816170426_SetMaxLimitForStrings.Designer.cs index 6852d4e..66a6821 100644 --- a/MareSynchronosServer/MareSynchronosServer/Migrations/20220816170426_SetMaxLimitForStrings.Designer.cs +++ b/MareSynchronosServer/MareSynchronosShared/Migrations/20220816170426_SetMaxLimitForStrings.Designer.cs @@ -1,6 +1,6 @@ // using System; -using MareSynchronosServer.Data; +using MareSynchronosShared.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/20220816170426_SetMaxLimitForStrings.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20220816170426_SetMaxLimitForStrings.cs similarity index 100% rename from MareSynchronosServer/MareSynchronosServer/Migrations/20220816170426_SetMaxLimitForStrings.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/20220816170426_SetMaxLimitForStrings.cs diff --git a/MareSynchronosServer/MareSynchronosServer/Migrations/MareDbContextModelSnapshot.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/MareDbContextModelSnapshot.cs similarity index 99% rename from MareSynchronosServer/MareSynchronosServer/Migrations/MareDbContextModelSnapshot.cs rename to MareSynchronosServer/MareSynchronosShared/Migrations/MareDbContextModelSnapshot.cs index 0e6cb67..b01ed50 100644 --- a/MareSynchronosServer/MareSynchronosServer/Migrations/MareDbContextModelSnapshot.cs +++ b/MareSynchronosServer/MareSynchronosShared/Migrations/MareDbContextModelSnapshot.cs @@ -1,6 +1,6 @@ // using System; -using MareSynchronosServer.Data; +using MareSynchronosShared.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; diff --git a/MareSynchronosServer/MareSynchronosServer/Models/Auth.cs b/MareSynchronosServer/MareSynchronosShared/Models/Auth.cs similarity index 87% rename from MareSynchronosServer/MareSynchronosServer/Models/Auth.cs rename to MareSynchronosServer/MareSynchronosShared/Models/Auth.cs index f154a73..1f8bf2c 100644 --- a/MareSynchronosServer/MareSynchronosServer/Models/Auth.cs +++ b/MareSynchronosServer/MareSynchronosShared/Models/Auth.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace MareSynchronosServer.Models +namespace MareSynchronosShared.Models { public class Auth { diff --git a/MareSynchronosServer/MareSynchronosServer/Models/Banned.cs b/MareSynchronosServer/MareSynchronosShared/Models/Banned.cs similarity index 88% rename from MareSynchronosServer/MareSynchronosServer/Models/Banned.cs rename to MareSynchronosServer/MareSynchronosShared/Models/Banned.cs index 63d3958..b56e02a 100644 --- a/MareSynchronosServer/MareSynchronosServer/Models/Banned.cs +++ b/MareSynchronosServer/MareSynchronosShared/Models/Banned.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace MareSynchronosServer.Models +namespace MareSynchronosShared.Models { public class Banned { diff --git a/MareSynchronosServer/MareSynchronosServer/Models/BannedRegistrations.cs b/MareSynchronosServer/MareSynchronosShared/Models/BannedRegistrations.cs similarity index 84% rename from MareSynchronosServer/MareSynchronosServer/Models/BannedRegistrations.cs rename to MareSynchronosServer/MareSynchronosShared/Models/BannedRegistrations.cs index f811399..b26283a 100644 --- a/MareSynchronosServer/MareSynchronosServer/Models/BannedRegistrations.cs +++ b/MareSynchronosServer/MareSynchronosShared/Models/BannedRegistrations.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace MareSynchronosServer.Models +namespace MareSynchronosShared.Models { public class BannedRegistrations { diff --git a/MareSynchronosServer/MareSynchronosServer/Models/ClientPair.cs b/MareSynchronosServer/MareSynchronosShared/Models/ClientPair.cs similarity index 92% rename from MareSynchronosServer/MareSynchronosServer/Models/ClientPair.cs rename to MareSynchronosServer/MareSynchronosShared/Models/ClientPair.cs index 0000630..8cabbb5 100644 --- a/MareSynchronosServer/MareSynchronosServer/Models/ClientPair.cs +++ b/MareSynchronosServer/MareSynchronosShared/Models/ClientPair.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace MareSynchronosServer.Models +namespace MareSynchronosShared.Models { public class ClientPair { diff --git a/MareSynchronosServer/MareSynchronosServer/Models/FileCache.cs b/MareSynchronosServer/MareSynchronosShared/Models/FileCache.cs similarity index 91% rename from MareSynchronosServer/MareSynchronosServer/Models/FileCache.cs rename to MareSynchronosServer/MareSynchronosShared/Models/FileCache.cs index d84f2a6..a239837 100644 --- a/MareSynchronosServer/MareSynchronosServer/Models/FileCache.cs +++ b/MareSynchronosServer/MareSynchronosShared/Models/FileCache.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace MareSynchronosServer.Models +namespace MareSynchronosShared.Models { public class FileCache { diff --git a/MareSynchronosServer/MareSynchronosServer/Models/ForbiddenUploadEntry.cs b/MareSynchronosServer/MareSynchronosShared/Models/ForbiddenUploadEntry.cs similarity index 89% rename from MareSynchronosServer/MareSynchronosServer/Models/ForbiddenUploadEntry.cs rename to MareSynchronosServer/MareSynchronosShared/Models/ForbiddenUploadEntry.cs index cf3e4ae..a558423 100644 --- a/MareSynchronosServer/MareSynchronosServer/Models/ForbiddenUploadEntry.cs +++ b/MareSynchronosServer/MareSynchronosShared/Models/ForbiddenUploadEntry.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace MareSynchronosServer.Models +namespace MareSynchronosShared.Models { public class ForbiddenUploadEntry { diff --git a/MareSynchronosServer/MareSynchronosServer/Models/LodeStoneAuth.cs b/MareSynchronosServer/MareSynchronosShared/Models/LodeStoneAuth.cs similarity index 78% rename from MareSynchronosServer/MareSynchronosServer/Models/LodeStoneAuth.cs rename to MareSynchronosServer/MareSynchronosShared/Models/LodeStoneAuth.cs index 976a52d..38448de 100644 --- a/MareSynchronosServer/MareSynchronosServer/Models/LodeStoneAuth.cs +++ b/MareSynchronosServer/MareSynchronosShared/Models/LodeStoneAuth.cs @@ -1,7 +1,6 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; -namespace MareSynchronosServer.Models +namespace MareSynchronosShared.Models { public class LodeStoneAuth { diff --git a/MareSynchronosServer/MareSynchronosServer/Models/User.cs b/MareSynchronosServer/MareSynchronosShared/Models/User.cs similarity index 81% rename from MareSynchronosServer/MareSynchronosServer/Models/User.cs rename to MareSynchronosServer/MareSynchronosShared/Models/User.cs index ff4fcd2..2e5a31f 100644 --- a/MareSynchronosServer/MareSynchronosServer/Models/User.cs +++ b/MareSynchronosServer/MareSynchronosShared/Models/User.cs @@ -1,7 +1,6 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; -namespace MareSynchronosServer.Models +namespace MareSynchronosShared.Models { public class User {