Fixed - Org App Session expiry redirect to home page stopped working (#…

…689)
cabinetoffice · Oct 2, 2024 · c12e7bb · c12e7bb
1 parent a5f7c33
commit c12e7bb
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 53 deletions.
diff --git a/Frontend/CO.CDP.OrganisationApp/AuthenticatedSessionAwareMiddleware.cs b/Frontend/CO.CDP.OrganisationApp/AuthenticatedSessionAwareMiddleware.cs
@@ -0,0 +1,34 @@
+using CO.CDP.OrganisationApp.Models;
+using CO.CDP.OrganisationApp.Pages;
+
+namespace CO.CDP.OrganisationApp;
+
+public class AuthenticatedSessionAwareMiddleware(RequestDelegate next, ISession session)
+{
+    public async Task Invoke(HttpContext context)
+    {
+        var endpoint = context.GetEndpoint();
+
+        if (endpoint != null)
+        {
+            if (endpoint.Metadata.GetMetadata<AuthenticatedSessionNotRequiredAttribute>() is null)
+            {
+                if (context.User.Identity?.IsAuthenticated == false)
+                {
+                    context.Response.Redirect("/");
+                    return;
+                }
+
+                var details = session.Get<UserDetails>(Session.UserDetailsKey);
+
+                if (details == null)
+                {
+                    context.Response.Redirect("/");
+                    return;
+                }
+            }
+        }
+
+        await next.Invoke(context);
+    }
+}
diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/AuthenticatedSessionNotRequiredAttribute.cs b/Frontend/CO.CDP.OrganisationApp/Pages/AuthenticatedSessionNotRequiredAttribute.cs
@@ -0,0 +1,6 @@
+namespace CO.CDP.OrganisationApp.Pages;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class AuthenticatedSessionNotRequiredAttribute : Attribute
+{
+}
diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/AuthorisedSessionFilter.cs b/Frontend/CO.CDP.OrganisationApp/Pages/AuthorisedSessionFilter.cs
diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/Error.cshtml.cs b/Frontend/CO.CDP.OrganisationApp/Pages/Error.cshtml.cs
@@ -3,7 +3,7 @@
 
 namespace CO.CDP.OrganisationApp.Pages;
 
-[AuthorisedSessionNotRequired]
+[AuthenticatedSessionNotRequired]
 public class ErrorModel : PageModel
 {
     public IActionResult OnGet()

diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/Index.cshtml.cs b/Frontend/CO.CDP.OrganisationApp/Pages/Index.cshtml.cs
@@ -2,7 +2,7 @@
 
 namespace CO.CDP.OrganisationApp.Pages;
 
-[AuthorisedSessionNotRequired]
+[AuthenticatedSessionNotRequired]
 public class IndexModel : PageModel
 {
 }
diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/OneLogin.cshtml.cs b/Frontend/CO.CDP.OrganisationApp/Pages/OneLogin.cshtml.cs
@@ -10,7 +10,7 @@
 
 namespace CO.CDP.OrganisationApp.Pages.Registration;
 
-[AuthorisedSessionNotRequired]
+[AuthenticatedSessionNotRequired]
 public class OneLogin(
     IHttpContextAccessor httpContextAccessor,
     IPersonClient personClient,

diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/PageNotFound.cshtml.cs b/Frontend/CO.CDP.OrganisationApp/Pages/PageNotFound.cshtml.cs
@@ -3,7 +3,7 @@
 
 namespace CO.CDP.OrganisationApp.Pages;
 
-[AuthorisedSessionNotRequired]
+[AuthenticatedSessionNotRequired]
 public class PageNotFoundModel : PageModel
 {
     public IActionResult OnGet()

diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/PrivacyNotice.cshtml.cs b/Frontend/CO.CDP.OrganisationApp/Pages/PrivacyNotice.cshtml.cs
@@ -2,7 +2,7 @@
 
 namespace CO.CDP.OrganisationApp.Pages;
 
-[AuthorisedSessionNotRequired]
+[AuthenticatedSessionNotRequired]
 public class PrivacyNoticeModel : PageModel
 {
 

diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/Users/OrganisationInvite.cshtml.cs b/Frontend/CO.CDP.OrganisationApp/Pages/Users/OrganisationInvite.cshtml.cs
@@ -4,7 +4,7 @@
 
 namespace CO.CDP.OrganisationApp.Pages.Users;
 
-[AuthorisedSessionNotRequired]
+[AuthenticatedSessionNotRequired]
 public class OrganisationInviteModel : PageModel
 {
     public IActionResult OnGet(Guid personInviteId)

diff --git a/Frontend/CO.CDP.OrganisationApp/Program.cs b/Frontend/CO.CDP.OrganisationApp/Program.cs
@@ -32,11 +32,7 @@
 var builder = WebApplication.CreateBuilder(args);
 
 var mvcBuilder = builder.Services.AddRazorPages()
-    .AddSessionStateTempDataProvider()
-    .AddMvcOptions(options =>
-    {
-        options.Filters.Add<AuthorisedSessionFilter>();
-    });
+    .AddSessionStateTempDataProvider();
 
 if (builder.Environment.IsDevelopment())
 {
@@ -189,6 +185,7 @@
 app.UseRouting();
 app.UseAuthentication();
 app.UseSession();
+app.UseMiddleware<AuthenticatedSessionAwareMiddleware>();
 app.UseAuthorization();
 app.MapRazorPages();