New prime list (SerbiaStrong-220#900)

* new prime list

* remove old prime list

* remove prime pgk

Content.Packaging/ServerPackaging.cs

@@ -48,7 +48,6 @@ public static class ServerPackaging
         // SS220 extra assemblies begin
         "FFMpegCore",
         "MySqlConnector",
-        "Pomelo.EntityFrameworkCore.MySql",
         "Instances"
         // SS220 extra assemblies end
     };

Content.Server/Connection/ConnectionManager.cs

@@ -1,11 +1,10 @@
 using System.Collections.Immutable;
-using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using Content.Server.Corvax.Sponsors;
 using Content.Server.Database;
 using Content.Server.GameTicking;
 using Content.Server.Preferences.Managers;
-using Content.Server.SS220.PrimeWhitelist;
+using Content.Server.SS220.Discord;
 using Content.Shared.CCVar;
 using Content.Shared.Corvax.CCCVars;
 using Content.Shared.GameTicking;
@@ -35,8 +34,8 @@ public sealed class ConnectionManager : IConnectionManager
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly SponsorsManager _sponsorsManager = default!; // Corvax-Sponsors
         [Dependency] private readonly ILocalizationManager _loc = default!;
-        [Dependency] private readonly Primelist _primelist = default!;
         [Dependency] private readonly ServerDbEntryManager _serverDbEntry = default!;
+        [Dependency] private readonly DiscordPlayerManager _discordPlayerManager = default!;
 
         public void Initialize()
         {
@@ -186,14 +185,22 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 return (ConnectionDenyReason.Ban, message, bans);
             }
 
+            // SS220 prime list restriction start
             if (_cfg.GetCVar(CCVars.PrimelistEnabled))
             {
-                if (!await _primelist.IsPrimelisted(e.UserName.ToLower()))
+                var primeAccessStatus = await _discordPlayerManager.GetUserPrimeListStatus(userId);
+
+                if (primeAccessStatus is null)
                 {
-                    var msg = Loc.GetString(_cfg.GetCVar(CCVars.WhitelistReason));
-                    return (ConnectionDenyReason.Whitelist, msg, null);
+                    return (ConnectionDenyReason.Whitelist, "Статус доступа на prime не был получен. Попробуйте переподключиться к серверу.", null);
+                }
+
+                if (!string.IsNullOrWhiteSpace(primeAccessStatus.PrimeAccessNotAvailableReason))
+                {
+                    return (ConnectionDenyReason.Whitelist, primeAccessStatus.PrimeAccessNotAvailableReason, null);
                 }
             }
+            // SS220 prime list restriction end
             if (_cfg.GetCVar(CCVars.WhitelistEnabled))
             {
                 var min = _cfg.GetCVar(CCVars.WhitelistMinPlayers);

Content.Server/Content.Server.csproj

@@ -14,10 +14,9 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="FFMpegCore"/>
+    <PackageReference Include="FFMpegCore" />
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore"/>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Content.Packaging\Content.Packaging.csproj" />

Content.Server/Entry/EntryPoint.cs

@@ -23,7 +23,6 @@
 using Content.Server.ServerInfo;
 using Content.Server.ServerUpdates;
 using Content.Server.SS220.Discord;
-using Content.Server.SS220.PrimeWhitelist;
 using Content.Server.Voting.Managers;
 using Content.Shared.CCVar;
 using Content.Shared.Kitchen;
@@ -113,7 +112,6 @@ public override void Init()
                 IoCManager.Resolve<JoinQueueManager>().Initialize(); // Corvax-Queue
                 IoCManager.Resolve<TTSManager>().Initialize(); // Corvax-TTS
                 IoCManager.Resolve<ServerInfoManager>().Initialize();
-                IoCManager.Resolve<Primelist>().Initialize();
                 IoCManager.Resolve<DiscordPlayerManager>().Initialize(); // SS220 discord player manager
                 IoCManager.Resolve<DiscordBanPostManager>().Initialize(); // SS220 discord ban post manager
                 IoCManager.Resolve<ServerControlController>().Initialize();

Content.Server/IoC/ServerContentIoC.cs

@@ -23,7 +23,6 @@
 using Content.Server.ServerUpdates;
 using Content.Server.SS220.BackEndApi;
 using Content.Server.SS220.Discord;
-using Content.Server.SS220.PrimeWhitelist;
 using Content.Server.Voting.Managers;
 using Content.Server.Worldgen.Tools;
 using Content.Shared.Administration.Logs;
@@ -67,7 +66,6 @@ public static void Register()
             IoCManager.Register<DiscordAuthManager>(); // Corvax-DiscordAuth
             IoCManager.Register<ServerInfoManager>();
             IoCManager.Register<PoissonDiskSampler>();
-            IoCManager.Register<Primelist>();
             IoCManager.Register<DiscordPlayerManager>(); // SS220 discord player manager
             IoCManager.Register<DiscordBanPostManager>();  // SS220 discord ban post manager
             IoCManager.Register<ServerControlController>();

Content.Server/SS220/Discord/DiscordPlayerManager.cs

@@ -179,5 +179,40 @@ private static string CreateSecureRandomString(int count = 32)
     {
         return Convert.ToBase64String(RandomNumberGenerator.GetBytes(count));
     }
+
+    public async Task<PrimeListUserStatus?> GetUserPrimeListStatus(Guid userId)
+    {
+        if (string.IsNullOrEmpty(_apiUrl))
+        {
+            return null;
+        }
+
+        try
+        {
+            var url = $"{_apiUrl}/checkPrimeAccess/{userId}";
+
+            var response = await _httpClient.GetAsync(url);
+
+            if (response.StatusCode != HttpStatusCode.OK)
+            {
+                var errorText = await response.Content.ReadAsStringAsync();
+
+                _sawmill.Error(
+                    "Failed to get user prime list status: [{StatusCode}] {Response}",
+                    response.StatusCode,
+                    errorText);
+
+                return null;
+            }
+
+            return await response.Content.ReadFromJsonAsync<PrimeListUserStatus>(GetJsonSerializerOptions());
+        }
+        catch (Exception exc)
+        {
+            _sawmill.Error(exc.Message);
+        }
+
+        return null;
+    }
 }
 

Content.Server/SS220/Discord/PrimeListUserStatus.cs

@@ -0,0 +1,6 @@
+namespace Content.Server.SS220.Discord;
+
+public sealed class PrimeListUserStatus
+{
+    public string? PrimeAccessNotAvailableReason { get; set; }
+}

Content.Shared/CCVar/CCVars.cs

@@ -1091,9 +1091,9 @@ public static readonly CVarDef<bool>
         /// <summary>
         ///     Whether monstermos explosive depressurization will rip tiles..
         ///     Needs <see cref="MonstermosEqualization"/> and <see cref="MonstermosDepressurization"/> to be enabled to work.
-		///     WARNING: This cvar causes MAJOR contrast issues, and usually tends to make any spaced scene look very cluttered.
-		///     This not only usually looks strange, but can also reduce playability for people with impaired vision. Please think twice before enabling this on your server.
-		///     Also looks weird on slow spacing for unrelated reasons. If you do want to enable this, you should probably turn on instaspacing.
+        ///     WARNING: This cvar causes MAJOR contrast issues, and usually tends to make any spaced scene look very cluttered.
+        ///     This not only usually looks strange, but can also reduce playability for people with impaired vision. Please think twice before enabling this on your server.
+        ///     Also looks weird on slow spacing for unrelated reasons. If you do want to enable this, you should probably turn on instaspacing.
         /// </summary>
         public static readonly CVarDef<bool> MonstermosRipTiles =
             CVarDef.Create("atmos.monstermos_rip_tiles", false, CVar.SERVERONLY);
@@ -1296,36 +1296,6 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> PrimelistEnabled =
             CVarDef.Create("primelist.enabled", false, CVar.SERVERONLY);
 
-        /// <summary>
-        ///     IP address of the Prime database server
-        /// </summary>
-        public static readonly CVarDef<string> PrimelistDatabaseIp =
-            CVarDef.Create("primelist.ip", string.Empty, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Port of the Prime database server
-        /// </summary>
-        public static readonly CVarDef<int> PrimelistDatabasePort =
-            CVarDef.Create("primelist.port", 3306, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Name of the Prime database server
-        /// </summary>
-        public static readonly CVarDef<string> PrimelistDatabaseName =
-            CVarDef.Create("primelist.database", string.Empty, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Username for the Prime database server
-        /// </summary>
-        public static readonly CVarDef<string> PrimelistDatabaseUsername =
-            CVarDef.Create("primelist.username", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
-
-        /// <summary>
-        ///     Password for the Prime database server
-        /// </summary>
-        public static readonly CVarDef<string> PrimelistDatabasePassword =
-            CVarDef.Create("primelist.password", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
-
         /*
          * VOTE
          */