move shared content to shared project

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

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;

MareSynchronosServer/MareSynchronosServer/Data/MareDbContext.cs

@@ -1,39 +0,0 @@
-using MareSynchronosServer.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace MareSynchronosServer.Data
-{
-    public class MareDbContext : DbContext
-    {
-        public MareDbContext(DbContextOptions<MareDbContext> options) : base(options)
-        {
-        }
-
-        public DbSet<User> Users { get; set; }
-        public DbSet<FileCache> Files { get; set; }
-        public DbSet<ClientPair> ClientPairs { get; set; }
-        public DbSet<ForbiddenUploadEntry> ForbiddenUploadEntries { get; set; }
-        public DbSet<Banned> BannedUsers { get; set; }
-        public DbSet<Auth> Auth { get; set; }
-        public DbSet<LodeStoneAuth> LodeStoneAuth { get; set; }
-        public DbSet<BannedRegistrations> BannedRegistrations { get; set; }
-
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            modelBuilder.Entity<Auth>().ToTable("auth");
-            modelBuilder.Entity<User>().ToTable("users");
-            modelBuilder.Entity<User>().HasIndex(c => c.CharacterIdentification);
-            modelBuilder.Entity<FileCache>().ToTable("file_caches");
-            modelBuilder.Entity<FileCache>().HasIndex(c => c.UploaderUID);
-            modelBuilder.Entity<ClientPair>().ToTable("client_pairs");
-            modelBuilder.Entity<ClientPair>().HasKey(u => new { u.UserUID, u.OtherUserUID });
-            modelBuilder.Entity<ClientPair>().HasIndex(c => c.UserUID);
-            modelBuilder.Entity<ClientPair>().HasIndex(c => c.OtherUserUID);
-            modelBuilder.Entity<ForbiddenUploadEntry>().ToTable("forbidden_upload_entries");
-            modelBuilder.Entity<Banned>().ToTable("banned_users");
-            modelBuilder.Entity<LodeStoneAuth>().ToTable("lodestone_auth");
-            modelBuilder.Entity<BannedRegistrations>().ToTable("banned_registrations");
-        }
-    }
-}

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
 {

MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Admin.cs

@@ -2,8 +2,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using MareSynchronos.API;
-using MareSynchronosServer.Authentication;
+using MareSynchronosShared.Authentication;
-using MareSynchronosServer.Models;
+using MareSynchronosShared.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;

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;

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;

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<Models.User> GetAuthenticatedUserUntrackedAsync()
+        protected async Task<User> GetAuthenticatedUserUntrackedAsync()
         {
             return await _dbContext.Users.AsNoTrackingWithIdentityResolution().SingleAsync(u => u.UID == AuthenticatedUserId).ConfigureAwait(false);
         }

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
     {

MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj

@@ -26,18 +26,13 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.6" />
-    <PackageReference Include="prometheus-net" Version="6.0.0" />
     <PackageReference Include="prometheus-net.AspNetCore" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\MareAPI\MareSynchronosAPI\MareSynchronos.API.csproj" />
-  </ItemGroup>
+    <ProjectReference Include="..\MareSynchronosShared\MareSynchronosShared.csproj" />
-
-  <ItemGroup>
-    <Folder Include="Migrations\" />
   </ItemGroup>
 
 </Project>

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
 {

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
 {

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;

MareSynchronosServer/MareSynchronosServerTest/Hubs/MareHubTest.cs

@@ -1,6 +1,4 @@
-using MareSynchronosServer.Data;
+using MareSynchronosServer.Hubs;
-using MareSynchronosServer.Hubs;
-using MareSynchronosServer.Models;
 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 {

MareSynchronosServer/MareSynchronosShared/Authentication/SecretKeyAuthenticationHandler.cs

@@ -1,22 +1,19 @@
-using System;
+using System.Security.Claims;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Encodings.Web;
-using System.Threading;
+using MareSynchronosServer;
-using System.Threading.Tasks;
-using MareSynchronosServer.Data;
 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
     {

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<MareDbContext> options) : base(options)
+    {
+    }
+
+    public DbSet<User> Users { get; set; }
+    public DbSet<FileCache> Files { get; set; }
+    public DbSet<ClientPair> ClientPairs { get; set; }
+    public DbSet<ForbiddenUploadEntry> ForbiddenUploadEntries { get; set; }
+    public DbSet<Banned> BannedUsers { get; set; }
+    public DbSet<Auth> Auth { get; set; }
+    public DbSet<LodeStoneAuth> LodeStoneAuth { get; set; }
+    public DbSet<BannedRegistrations> BannedRegistrations { get; set; }
+
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<Auth>().ToTable("auth");
+        modelBuilder.Entity<User>().ToTable("users");
+        modelBuilder.Entity<User>().HasIndex(c => c.CharacterIdentification);
+        modelBuilder.Entity<FileCache>().ToTable("file_caches");
+        modelBuilder.Entity<FileCache>().HasIndex(c => c.UploaderUID);
+        modelBuilder.Entity<ClientPair>().ToTable("client_pairs");
+        modelBuilder.Entity<ClientPair>().HasKey(u => new { u.UserUID, u.OtherUserUID });
+        modelBuilder.Entity<ClientPair>().HasIndex(c => c.UserUID);
+        modelBuilder.Entity<ClientPair>().HasIndex(c => c.OtherUserUID);
+        modelBuilder.Entity<ForbiddenUploadEntry>().ToTable("forbidden_upload_entries");
+        modelBuilder.Entity<Banned>().ToTable("banned_users");
+        modelBuilder.Entity<LodeStoneAuth>().ToTable("lodestone_auth");
+        modelBuilder.Entity<BannedRegistrations>().ToTable("banned_registrations");
+    }
+}

MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.8" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.8">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.6" />
+		<PackageReference Include="prometheus-net" Version="6.0.0" />
+	</ItemGroup>
+
+</Project>

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;
 

MareSynchronosServer/MareSynchronosShared/Migrations/20220731210149_InitialCreate.Designer.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using MareSynchronosServer.Data;
+using MareSynchronosShared.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

MareSynchronosServer/MareSynchronosShared/Migrations/20220731211419_RenameLowerSnakeCase.Designer.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using MareSynchronosServer.Data;
+using MareSynchronosShared.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

MareSynchronosServer/MareSynchronosShared/Migrations/20220801121419_AddLodestoneAuth.Designer.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using MareSynchronosServer.Data;
+using MareSynchronosShared.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

MareSynchronosServer/MareSynchronosShared/Migrations/20220801122103_AddNullableLodestoneAuthProperties.Designer.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using MareSynchronosServer.Data;
+using MareSynchronosShared.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

MareSynchronosServer/MareSynchronosShared/Migrations/20220806103053_AddBannedRegistrations.Designer.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using MareSynchronosServer.Data;
+using MareSynchronosShared.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

MareSynchronosServer/MareSynchronosShared/Migrations/20220816170426_SetMaxLimitForStrings.Designer.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using MareSynchronosServer.Data;
+using MareSynchronosShared.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

MareSynchronosServer/MareSynchronosShared/Migrations/MareDbContextModelSnapshot.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using MareSynchronosServer.Data;
+using MareSynchronosShared.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

MareSynchronosServer/MareSynchronosShared/Models/Auth.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace MareSynchronosServer.Models
+namespace MareSynchronosShared.Models
 {
     public class Auth
     {

MareSynchronosServer/MareSynchronosShared/Models/Banned.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace MareSynchronosServer.Models
+namespace MareSynchronosShared.Models
 {
     public class Banned
     {

MareSynchronosServer/MareSynchronosShared/Models/BannedRegistrations.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace MareSynchronosServer.Models
+namespace MareSynchronosShared.Models
 {
     public class BannedRegistrations
     {

MareSynchronosServer/MareSynchronosShared/Models/ClientPair.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace MareSynchronosServer.Models
+namespace MareSynchronosShared.Models
 {
     public class ClientPair
     {

MareSynchronosServer/MareSynchronosShared/Models/FileCache.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace MareSynchronosServer.Models
+namespace MareSynchronosShared.Models
 {
     public class FileCache
     {

MareSynchronosServer/MareSynchronosShared/Models/ForbiddenUploadEntry.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace MareSynchronosServer.Models
+namespace MareSynchronosShared.Models
 {
     public class ForbiddenUploadEntry
     {

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
     {

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
     {