Discovery fixes, nix updates

2 files changed, 21 insertions, 6 deletions

diff --git a/extra/admin-api/Spacebar.UApi/Program.cs b/extra/admin-api/Spacebar.UApi/Program.cs

index 0a2a1b32..326d0a9c 100644
--- a/extra/admin-api/Spacebar.UApi/Program.cs
+++ b/extra/admin-api/Spacebar.UApi/Program.cs
@@ -11,8 +11,10 @@ using Spacebar.Models.Db.Contexts;
 using Spacebar.UApi.Services;
 
 var builder = WebApplication.CreateBuilder(args);
-if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("APPSETTINGS_PATH")))
+if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("APPSETTINGS_PATH"))) {
+    Console.WriteLine("Loading appsettings from path: " + Environment.GetEnvironmentVariable("APPSETTINGS_PATH"));
     builder.Configuration.AddJsonFile(Environment.GetEnvironmentVariable("APPSETTINGS_PATH")!);
+}
 
 // Add services to the container.
 
@@ -70,9 +72,23 @@ app.UseAuthorization();
 app.MapControllers();
 StreamingHttpClient.LogRequests = false;
 app.Use((context, next) => {
-    context.Response.Headers["Access-Control-Allow-Origin"] = "*";
-    context.Response.Headers["Access-Control-Allow-Methods"] = "GET, POST, PUT, DELETE, OPTIONS";
-    context.Response.Headers["Access-Control-Allow-Headers"] = "*, Authorization";
+    context.Response.Headers["Access-Control-Allow-Origin"] =
+        string.IsNullOrWhiteSpace(context.Request.Headers.Origin)
+            ? "*"
+            : context.Request.Headers.Origin;
+
+    context.Response.Headers["Access-Control-Allow-Methods"] =
+        string.IsNullOrWhiteSpace(context.Request.Headers.AccessControlRequestMethod)
+            ? "GET, POST, PUT, DELETE, OPTIONS"
+            : context.Request.Headers.AccessControlRequestMethod.ToString();
+
+    context.Response.Headers["Access-Control-Allow-Headers"] =
+        string.IsNullOrWhiteSpace(context.Request.Headers.AccessControlRequestHeaders)
+            ? "*, Authorization"
+            : context.Request.Headers.AccessControlRequestHeaders.ToString();
+
+    context.Response.Headers.AccessControlAllowCredentials = "true";
+    
     if (context.Request.Method == "OPTIONS") {
         context.Response.StatusCode = 200;
         return Task.CompletedTask;
diff --git a/extra/admin-api/Utilities/Spacebar.AdminApi.TestClient/Pages/GuildDiscovery.razor b/extra/admin-api/Utilities/Spacebar.AdminApi.TestClient/Pages/GuildDiscovery.razor

index 7e388fbc..ff233731 100644
--- a/extra/admin-api/Utilities/Spacebar.AdminApi.TestClient/Pages/GuildDiscovery.razor
+++ b/extra/admin-api/Utilities/Spacebar.AdminApi.TestClient/Pages/GuildDiscovery.razor
@@ -16,8 +16,7 @@
         <div class="@("guild-card " + (guild.DiscoveryExcluded ? "excluded" : ""))">
             <img class="guild-icon" src="@(guild.Icon is null ? $"{Config.CdnUrl}/embed/avatars/0.png" : $"{Config.CdnUrl}/icons/{guild.Id}/{guild.Icon}")" alt="@guild.Name"/>
             @if (guild.Banner is not null) {
-                <img class="guild-banner" src="@($"{Config.CdnUrl}/banners/{guild.Id}/{guild.Banner}")"
-                     alt="@guild.Name"/>
+                <img class="guild-banner" src="@($"{Config.CdnUrl}/banners/{guild.Id}/{guild.Banner}")" alt="@guild.Name"/>
             }
             <h4>@guild.Name</h4>
             <p>@guild.Description</p>