api_token adaptation

JerryImMouse · Aug 13, 2024 · 8bcff95 · 8bcff95
1 parent f31203d
commit 8bcff95
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Content.Server/_Jerry/CCCVars/CCCVars.cs b/Content.Server/_Jerry/CCCVars/CCCVars.cs
@@ -11,6 +11,9 @@ public static class CCCVars
     public static readonly CVarDef<string> DiscordApiUrl =
         CVarDef.Create("jerry.discord_api_url", "http://127.0.0.1:2424/api", CVar.CONFIDENTIAL | CVar.SERVERONLY);
 
+    public static readonly CVarDef<string> DiscordApiKey =
+        CVarDef.Create("jerry.discord_api_key", "key", CVar.CONFIDENTIAL | CVar.SERVERONLY);
+
     /*
      * Sponsors
      */

diff --git a/Content.Server/_Jerry/Discord/DiscordAuthManager.cs b/Content.Server/_Jerry/Discord/DiscordAuthManager.cs
@@ -38,6 +38,7 @@ public void PostInject()
     public void Initialize()
     {
         _configuration.OnValueChanged(CCCVars.CCCVars.DiscordApiUrl, (value) => _apiUrl = value, true);
+        _configuration.OnValueChanged(CCCVars.CCCVars.DiscordApiKey, (value) => _apiKey = value, true);
 
         _sawmill = Logger.GetSawmill("discord_auth");
         _net.RegisterNetMessage<MsgDiscordAuthRequired>();
@@ -91,7 +92,7 @@ private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs
     {
         _sawmill.Debug($"Player {userId} check Discord verification");
 
-        var requestUrl = $"{_apiUrl}/check?userid={userId}";
+        var requestUrl = $"{_apiUrl}/check?userid={userId}&api_token={_apiKey}";
         var response = await _httpClient.GetAsync(requestUrl, cancel);
         if (!response.IsSuccessStatusCode)
             return null;
@@ -102,7 +103,7 @@ private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs
     public async Task<string> GenerateLink(NetUserId userId, CancellationToken cancel = default)
     {
         _sawmill.Debug($"Generating link for {userId}");
-        var requestUrl = $"{_apiUrl}/link?userid={userId}";
+        var requestUrl = $"{_apiUrl}/link?userid={userId}&api_token={_apiKey}";
         var response = await _httpClient.GetAsync(requestUrl, cancel);
         var link = await response.Content.ReadFromJsonAsync<DiscordLinkResponse>(cancel);
         return link!.Link;

diff --git a/Content.Server/_Jerry/Sponsors/SponsorsManager.cs b/Content.Server/_Jerry/Sponsors/SponsorsManager.cs
@@ -19,13 +19,15 @@ public sealed class SponsorsManager
     private readonly HttpClient _httpClient = new();
     private string _guildId = default!;
     private string _apiUrl = default!;
+    private string _apiKey = default!;
 
     private Dictionary<NetUserId, SponsorData> _cachedSponsors = new();
 
     public void Initialize()
     {
         _configuration.OnValueChanged(CCCVars.CCCVars.DiscordGuildID, s => _guildId = s, true);
         _configuration.OnValueChanged(CCCVars.CCCVars.DiscordApiUrl, s => _apiUrl = s, true);
+        _configuration.OnValueChanged(CCCVars.CCCVars.DiscordApiKey, (value) => _apiKey = value, true);
 
         _discordAuthManager.PlayerVerified += OnPlayerVerified;
         _netManager.Disconnect += OnDisconnect;
@@ -56,7 +58,7 @@ private async void OnPlayerVerified(object? sender, ICommonSession e)
 
     private async Task<List<string>?> GetRoles(NetUserId userId)
     {
-        var requestUrl = $"{_apiUrl}/roles?userid={userId}&guildid={_guildId}";
+        var requestUrl = $"{_apiUrl}/roles?userid={userId}&guildid={_guildId}&api_token={_apiKey}";
         var response = await _httpClient.GetAsync(requestUrl);
 
         if (!response.IsSuccessStatusCode)