diff --git a/ProjectLighthouse.Servers.Website/Middlewares/UserRequiredRedirectMiddleware.cs b/ProjectLighthouse.Servers.Website/Middlewares/UserRequiredRedirectMiddleware.cs index 7e6ba83a..c571d833 100644 --- a/ProjectLighthouse.Servers.Website/Middlewares/UserRequiredRedirectMiddleware.cs +++ b/ProjectLighthouse.Servers.Website/Middlewares/UserRequiredRedirectMiddleware.cs @@ -25,10 +25,16 @@ public class UserRequiredRedirectMiddleware : MiddlewareDBContext return; } - if (user.PasswordResetRequired && !ctx.Request.Path.StartsWithSegments("/passwordResetRequired") && - !ctx.Request.Path.StartsWithSegments("/passwordReset")) + if (user.PasswordResetRequired) { - ctx.Response.Redirect("/passwordResetRequired"); + if (!ctx.Request.Path.StartsWithSegments("/passwordResetRequired") && + !ctx.Request.Path.StartsWithSegments("/passwordReset")) + { + ctx.Response.Redirect("/passwordResetRequired"); + return; + } + + await this.next(ctx); return; }