Move some stuff around

Author: hhvrc

API/Options/OAuth/DiscordOAuthOptions.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Options;
-
-namespace OpenShock.API.Options;
+namespace OpenShock.API.Options.OAuth;
 
 public sealed class DiscordOAuthOptions
 {
@@ -10,9 +8,4 @@ public sealed class DiscordOAuthOptions
     public required string ClientSecret { get; init; }
     public required PathString CallbackPath { get; init; }
     public required PathString AccessDeniedPath { get; init; }
-}
-
-[OptionsValidator]
-public partial class DiscordOAuthOptionsValidator : IValidateOptions<DiscordOAuthOptions>
-{
-}
+}

API/Program.cs

@@ -24,6 +24,8 @@
 using OpenShock.Common.Swagger;
 using Serilog;
 using System.Configuration;
+using OpenShock.API.Options.OAuth;
+using DiscordOAuthOptionsValidator = OpenShock.API.Options.OAuth.DiscordOAuthOptionsValidator;
 
 var builder = OpenShockApplication.CreateDefaultBuilder<Program>(args);
 

Common/Authentication/OpenShockAuthSchemas.cs

@@ -7,4 +7,7 @@ public static class OpenShockAuthSchemas
     public const string HubToken = "HubToken";
 
     public const string UserSessionApiTokenCombo = $"{UserSessionCookie},{ApiToken}";
+
+    public const string DiscordScheme = "discord";
+    public static readonly string[] OAuth2Schemes = [DiscordScheme];
 }

Common/Constants/AuthConstants.cs

@@ -7,9 +7,6 @@ public static class AuthConstants
     public const string ApiTokenHeaderName = "OpenShockToken";
     public const string HubTokenHeaderName = "DeviceToken";
 
-    public const string DiscordScheme = "discord";
-    public static readonly string[] OAuth2Schemes = [DiscordScheme];
-
     public const int GeneratedTokenLength = 32;
     public const int ApiTokenLength = 64;
 }