From 1bd8bb4bd617c8a693958652c9af327a98652da5 Mon Sep 17 00:00:00 2001
From: XShine555 <xshine555@gmail.com>
Date: Sat, 30 May 2026 03:44:32 +0200
Subject: [PATCH] Fixes on scalar

---
 WebApi/AppSettings.Development.json           |  1 +
 WebApi/AppSettings.json                       |  1 +
 .../AuthenticationConfiguration.cs            | 20 ++++++++++---------
 WebApi/Scalar/ScalarOptionsSetup.cs           |  3 ++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/WebApi/AppSettings.Development.json b/WebApi/AppSettings.Development.json
index e06a6a9..6929fd0 100644
--- a/WebApi/AppSettings.Development.json
+++ b/WebApi/AppSettings.Development.json
@@ -13,6 +13,7 @@
         "AuthorizationEndpoint": "http://localhost:8080/oauth/v2/authorize?prompt=login",
         "TokenEndpoint": "http://localhost:8080/oauth/v2/token",
         "Scopes": [ "openid", "profile", "email" ],
+        "ScalarRedirectUri": "http://localhost:5111/scalar/",
         "RequireHttpsMetadata": false
     },
     "Database": {
diff --git a/WebApi/AppSettings.json b/WebApi/AppSettings.json
index d46af70..9b9b209 100644
--- a/WebApi/AppSettings.json
+++ b/WebApi/AppSettings.json
@@ -14,6 +14,7 @@
         "AuthorizationEndpoint": "",
         "TokenEndpoint": "",
         "Scopes": [],
+        "ScalarRedirectUri": "",
         "RequireHttpsMetadata": true
     },
     "Database": {
diff --git a/WebApi/Authentication/AuthenticationConfiguration.cs b/WebApi/Authentication/AuthenticationConfiguration.cs
index 206a21f..49820ce 100644
--- a/WebApi/Authentication/AuthenticationConfiguration.cs
+++ b/WebApi/Authentication/AuthenticationConfiguration.cs
@@ -8,30 +8,32 @@ public sealed class AuthenticationConfiguration
 
     [Required]
     [Url]
-    public required string MetadataAddress { get; init; }
+    public required string MetadataAddress { get; set; }
 
     [Required]
-    public required string IssuerAddress { get; init; }
+    public required string IssuerAddress { get; set; }
 
     [Required]
-    public required string AudienceAddress { get; init; }
+    public required string AudienceAddress { get; set; }
 
     [Required]
-    public required string ClientId { get; init; }
+    public required string ClientId { get; set; }
 
-    public string? ClientSecret { get; init; }
+    public string? ClientSecret { get; set; }
 
     [Required]
     [Url]
-    public required string AuthorizationEndpoint { get; init; }
+    public required string AuthorizationEndpoint { get; set; }
 
     [Required]
     [Url]
-    public required string TokenEndpoint { get; init; }
+    public required string TokenEndpoint { get; set; }
 
     [Required]
     [MinLength(1)]
-    public required string[] Scopes { get; init; }
+    public required string[] Scopes { get; set; }
 
-    public bool RequireHttpsMetadata { get; init; } = true;
+    public string? ScalarRedirectUri { get; set; }
+
+    public bool RequireHttpsMetadata { get; set; } = true;
 }
diff --git a/WebApi/Scalar/ScalarOptionsSetup.cs b/WebApi/Scalar/ScalarOptionsSetup.cs
index ef18898..b78ca39 100644
--- a/WebApi/Scalar/ScalarOptionsSetup.cs
+++ b/WebApi/Scalar/ScalarOptionsSetup.cs
@@ -24,7 +24,8 @@ public sealed class ScalarOptionsSetup(IOptions<AuthenticationConfiguration> opt
                 flow.TokenUrl = _configuration.TokenEndpoint;
                 flow.Pkce = Pkce.Sha256;
                 flow.SelectedScopes = _configuration.Scopes;
-            })
+                flow.RedirectUri = _configuration.ScalarRedirectUri;
+            } )
             .HideModels();
     }
 }