From 5b30a1d50fa8ac3faff5a8896e170917b8a33248 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Thu, 8 Sep 2016 15:12:22 -0400 Subject: [PATCH 1/2] Fix for reverse proxy when using the wizard --- PlexRequests.UI/Modules/BaseAuthModule.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/PlexRequests.UI/Modules/BaseAuthModule.cs b/PlexRequests.UI/Modules/BaseAuthModule.cs index d5dde01c9..d3d3de5d9 100644 --- a/PlexRequests.UI/Modules/BaseAuthModule.cs +++ b/PlexRequests.UI/Modules/BaseAuthModule.cs @@ -53,14 +53,15 @@ namespace PlexRequests.UI.Modules private Response CheckAuth() { var settings = PlexRequestSettings.GetSettings(); + + var baseUrl = settings.BaseUrl; + // Have we been through the wizard? if (!settings.Wizard) { - return Context.GetRedirect("~/wizard"); + return Context.GetRedirect(string.IsNullOrEmpty(baseUrl) ? "~/wizard" : $"~/{baseUrl}/wizard"); } - var baseUrl = settings.BaseUrl; - var redirectPath = string.IsNullOrEmpty(baseUrl) ? "~/userlogin" : $"~/{baseUrl}/userlogin"; return Session[SessionKeys.UsernameKey] == null @@ -68,4 +69,4 @@ namespace PlexRequests.UI.Modules : null; } } -} \ No newline at end of file +} From 15a85fae9ab55d659cf76d0fbf32c94f87ef1cc3 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Mon, 12 Sep 2016 14:14:59 +0100 Subject: [PATCH 2/2] Fixed #532 --- PlexRequests.UI/Modules/UserLoginModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs index e30f4adc2..713f43987 100644 --- a/PlexRequests.UI/Modules/UserLoginModule.cs +++ b/PlexRequests.UI/Modules/UserLoginModule.cs @@ -216,7 +216,7 @@ namespace PlexRequests.UI.Modules private bool IsUserInDeniedList(string username, AuthenticationSettings settings) { - return settings.DeniedUserList.Any(x => x.Equals(username)); + return settings.DeniedUserList.Any(x => x.Equals(username, StringComparison.CurrentCultureIgnoreCase)); } } } \ No newline at end of file