fix: environment specific settings separated as mvp- and non-mvps

Author: lsipii

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Helpers/Extensions/EnvironmentExtensions.cs

@@ -6,6 +6,7 @@ public static class Environments
     public static readonly string Development = "dev";
     public static readonly string Staging = "staging";
     public static readonly string Production = "production";
+    public static readonly string MvpDevelopment = "mvp-dev"; // Not in use but should be
     public static readonly string MvpStaging = "mvp-staging";
     public static readonly string MvpProduction = "mvp-production";
 }
@@ -14,41 +15,73 @@ public static class EnvironmentExtensions
 {
     public static bool IsLocal(this IHostEnvironment hostEnvironment)
     {
-        if (hostEnvironment == null)
-        {
-            throw new ArgumentNullException(nameof(hostEnvironment));
-        }
-
-        return hostEnvironment.IsEnvironment(Environments.Local);
+        return IsEnvironment(hostEnvironment, Environments.Local);
     }
 
+    //
+    // Non-MVP app environments
+    //
     public static bool IsDevelopment(this IHostEnvironment hostEnvironment)
     {
-        if (hostEnvironment == null)
-        {
-            throw new ArgumentNullException(nameof(hostEnvironment));
-        }
-
-        return hostEnvironment.IsEnvironment(Environments.Development);
+        return IsEnvironment(hostEnvironment, Environments.Development);
     }
 
     public static bool IsStaging(this IHostEnvironment hostEnvironment)
     {
-        if (hostEnvironment == null)
-        {
-            throw new ArgumentException(null, nameof(hostEnvironment));
-        }
-
-        return hostEnvironment.IsEnvironment(Environments.MvpStaging) || hostEnvironment.IsEnvironment(Environments.Staging);
+        return IsEnvironment(hostEnvironment, Environments.Staging);
     }
 
     public static bool IsProduction(this IHostEnvironment hostEnvironment)
+    {
+        return IsEnvironment(hostEnvironment, Environments.Production);
+    }
+
+    // Production-like environments are staging and production
+    public static bool IsProductionlike(this IHostEnvironment hostEnvironment)
+    {
+        return IsProduction(hostEnvironment) || IsStaging(hostEnvironment);
+    }
+
+    //
+    // MVP app environments
+    //
+    public static bool IsMvpDevelopment(this IHostEnvironment hostEnvironment)
+    {
+        return IsEnvironment(hostEnvironment, Environments.MvpDevelopment);
+    }
+
+    public static bool IsMvpStaging(this IHostEnvironment hostEnvironment)
+    {
+        return IsEnvironment(hostEnvironment, Environments.MvpStaging);
+    }
+
+    public static bool IsMvpProduction(this IHostEnvironment hostEnvironment)
+    {
+        return IsEnvironment(hostEnvironment, Environments.MvpProduction);
+    }
+
+    // MVP production-like environments are MVP staging and MVP production
+
+    public static bool IsMvpProductionlike(this IHostEnvironment hostEnvironment)
+    {
+        return IsMvpProduction(hostEnvironment) || IsMvpStaging(hostEnvironment);
+    }
+
+    // 
+    // Helper methods
+    //
+    public static bool IsMvpEnvironment(this IHostEnvironment hostEnvironment)
+    {
+        return IsMvpProduction(hostEnvironment) || IsMvpStaging(hostEnvironment) || IsMvpDevelopment(hostEnvironment);
+    }
+
+    public static bool IsEnvironment(IHostEnvironment hostEnvironment, string environmentName)
     {
         if (hostEnvironment == null)
         {
-            throw new ArgumentException(null, nameof(hostEnvironment));
+            throw new ArgumentNullException(nameof(hostEnvironment));
         }
 
-        return hostEnvironment.IsEnvironment(Environments.MvpProduction) || hostEnvironment.IsEnvironment(Environments.Production);
+        return hostEnvironment.IsEnvironment(environmentName);
     }
 }

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Program.cs

@@ -167,19 +167,23 @@
 //
 var app = builder.Build();
 
-// Use swagger only in development
-if (EnvironmentExtensions.IsLocal(app.Environment) || EnvironmentExtensions.IsDevelopment(app.Environment))
+// Use swagger only in non-productionlike environments: (staging, production)-like
+if (!app.Environment.IsMvpProductionlike() && !app.Environment.IsProductionlike())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
+}
 
-    // Direct cors requests used in dev-stages
+// Allow CORS only in non-mvp environments
+if (!app.Environment.IsMvpEnvironment())
+{
     app.UseCors(builder => builder
         .AllowAnyOrigin()
         .AllowAnyMethod()
         .AllowAnyHeader());
 }
 
+
 app.UseSerilogRequestLogging(options =>
 {
     options.EnrichDiagnosticContext = (diagnosticContext, httpContext) =>