Configure PUBLIC_URL only in the gateway.

Allows changing it in a single place to serve the web server from other addresses, such as local network IPs or public addresses via reverse proxies. Note: To serve via local network IPs, applicationUrl in launchSettings.json for the gateway needs to be changed from localhost to e.g., 0.0.0.0.
platformplatform · Jan 4, 2025 · 2b35157 · 2b35157
1 parent 9df2486
commit 2b35157
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/application/AppHost/ConfigurationExtensions.cs b/application/AppHost/ConfigurationExtensions.cs
@@ -0,0 +1,16 @@
+namespace AppHost;
+
+public static class ConfigurationExtensions
+{
+    public static IResourceBuilder<TDestination> WithUrlConfiguration<TDestination>(
+        this IResourceBuilder<TDestination> builder,
+        string applicationBasePath) where TDestination : IResourceWithEnvironment
+    {
+        var baseUrl = Environment.GetEnvironmentVariable("PUBLIC_URL") ?? "https://localhost:9000";
+        applicationBasePath = applicationBasePath.TrimEnd('/');
+
+        return builder
+            .WithEnvironment("PUBLIC_URL", baseUrl)
+            .WithEnvironment("CDN_URL", baseUrl + applicationBasePath);
+    }
+}
diff --git a/application/AppHost/Program.cs b/application/AppHost/Program.cs
@@ -59,6 +59,7 @@
 
 var accountManagementApi = builder
     .AddProject<AccountManagement_Api>("account-management-api")
+    .WithUrlConfiguration("/account-management")
     .WithReference(accountManagementDatabase)
     .WithReference(azureStorage)
     .WaitFor(accountManagementWorkers);
@@ -74,6 +75,7 @@
 
 var backOfficeApi = builder
     .AddProject<BackOffice_Api>("back-office-api")
+    .WithUrlConfiguration("/back-office")
     .WithReference(backOfficeDatabase)
     .WithReference(azureStorage)
     .WaitFor(backOfficeWorkers);

diff --git a/application/account-management/Api/Properties/launchSettings.json b/application/account-management/Api/Properties/launchSettings.json
@@ -4,9 +4,7 @@
     "Api": {
       "commandName": "Project",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "development",
-        "PUBLIC_URL": "https://localhost:9000",
-        "CDN_URL": "https://localhost:9000/account-management"
+        "ASPNETCORE_ENVIRONMENT": "development"
       }
     }
   }

diff --git a/application/back-office/Api/Properties/launchSettings.json b/application/back-office/Api/Properties/launchSettings.json
@@ -4,9 +4,7 @@
     "Api": {
       "commandName": "Project",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "development",
-        "PUBLIC_URL": "https://localhost:9000",
-        "CDN_URL": "https://localhost:9000/back-office"
+        "ASPNETCORE_ENVIRONMENT": "development"
       }
     }
   }

diff --git a/application/shared-kernel/SharedKernel/SinglePageApp/SinglePageAppConfiguration.cs b/application/shared-kernel/SharedKernel/SinglePageApp/SinglePageAppConfiguration.cs
@@ -146,7 +146,8 @@ private string GetContentSecurityPolicies()
 
         if (_isDevelopment)
         {
-            trustedHosts += " wss://localhost:* https://localhost:*";
+            var hostname = new Uri(PublicUrl).Host;
+            trustedHosts += $" wss://{hostname}:* https://{hostname}:*";
         }
 
         var contentSecurityPolicies = new[]