Merge pull request #158 from SkillsFundingAgency/CON-2886-service-una…

…vailable CON-2886
SkillsFundingAgency · Jan 5, 2021 · 21753ea · 21753ea
2 parents e7212de + d208708
commit 21753ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Startup/AspNetStartup.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web/Startup/AspNetStartup.cs
@@ -42,7 +42,7 @@ public void ConfigureContainer(Registry registry)
 
         public void Configure(IApplicationBuilder app)
         {
-            app.UseDasErrorPages()
+            app.UseDasErrorPages(Environment)
                 .UseUnauthorizedAccessExceptionHandler()
                 .UseHttpsRedirection()
                 .UseDasHsts()

diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Startup/ErrorPagesStartup.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web/Startup/ErrorPagesStartup.cs
@@ -1,23 +1,21 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace SFA.DAS.EmployerCommitmentsV2.Web.Startup
 {
     public static class ErrorPagesStartup
     {
-        public static IApplicationBuilder UseDasErrorPages(this IApplicationBuilder app)
+        public static IApplicationBuilder UseDasErrorPages(this IApplicationBuilder app, IHostingEnvironment environment)
         {
-            var hostingEnvironment = app.ApplicationServices.GetService<IHostingEnvironment>();
 
-            if (hostingEnvironment.IsDevelopment())
+            if (environment.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
             }
             else
             {
-                app.UseExceptionHandler("/error")
-                    .UseStatusCodePagesWithReExecute("/error", "?statuscode={0}");
+                app.UseExceptionHandler("/error");
+                app.UseStatusCodePagesWithRedirects("~/error/?statuscode={0}");
             }
 
             return app;