Merge remote-tracking branch 'origin/develop' into peggy/3414

bcgov · Dec 5, 2024 · de3575d · de3575d
2 parents 417fbeb + 64bc06a
commit de3575d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/src/Spd.Presentation.Licensing/Program.cs b/src/Spd.Presentation.Licensing/Program.cs
@@ -75,15 +75,18 @@
     app.UseResponseCaching();
     app.UseRequestDecompression();
     app.UseResponseCompression();
-    app.UseStaticFiles();
-    if (app.Configuration.GetValue("MaintenanceMode", false))
-    {
-        app.MapFallbackToFile("maintenance/offline.html");
-    }
-    else
+    app.Use(async (context, next) =>
     {
-        app.MapFallbackToFile("index.html");
-    }
+        var isMaintenance = builder.Configuration.GetValue<bool>("MaintenanceMode"); // Get the value from appsettings.json
+        if (isMaintenance && !context.Request.Path.Value.Contains("maintenance"))
+        {
+            context.Response.Redirect("/licensing/maintenance/offline.html");
+            return;
+        }
+        await next();
+    });
+    app.UseStaticFiles();
+    app.MapFallbackToFile("index.html");
     app.UseRouting();
     app.UseObservabilityMiddleware();
     app.UseHealthChecks();

diff --git a/src/Spd.Presentation.Screening/ClientApp/angular.json b/src/Spd.Presentation.Screening/ClientApp/angular.json
@@ -33,7 +33,8 @@
             "inlineStyleLanguage": "scss",
             "assets": [
               "src/favicon.ico",
-              "src/assets"
+              "src/assets",
+              "src/maintenance"
             ],
             "styles": [
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
@@ -105,7 +106,8 @@
             "inlineStyleLanguage": "scss",
             "assets": [
               "src/favicon.ico",
-              "src/assets"
+              "src/assets",
+              "src/maintenance"
             ],
             "styles": [
               "node_modules/bootstrap/dist/css/bootstrap.min.css",

diff --git a/src/Spd.Presentation.Screening/Program.cs b/src/Spd.Presentation.Screening/Program.cs
@@ -77,6 +77,16 @@
     app.UseResponseCaching();
     app.UseRequestDecompression();
     app.UseResponseCompression();
+    app.Use(async (context, next) =>
+    {
+        var isMaintenance = builder.Configuration.GetValue<bool>("MaintenanceMode"); // Get the value from appsettings.json
+        if (isMaintenance && !context.Request.Path.Value.Contains("maintenance"))
+        {
+            context.Response.Redirect("/screening/maintenance/offline.html");
+            return;
+        }
+        await next();
+    });
     app.UseStaticFiles();
     app.MapFallbackToFile("index.html");
     app.UseRouting();