github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-11 15:56:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change the redirection to use a relative uri redirect #473

Browse source
This commit is contained in:
tidusjar 2016-08-21 19:33:19 +01:00
parent 0fe7bba9ac
commit 4b5079598d
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
PlexRequests.UI.Tests/UserLoginModuleTests.cs
View file

@ -72,9 +72,9 @@ namespace PlexRequests.UI.Tests
LandingPageMock.Setup(x => x.GetSettingsAsync()).ReturnsAsync(new LandingPageSettings()); LandingPageMock.Setup(x => x.GetSettingsAsync()).ReturnsAsync(new LandingPageSettings());
IAnalytics = new Mock<IAnalytics>(); IAnalytics = new Mock<IAnalytics>();
Linker = new Mock<IResourceLinker>(); Linker = new Mock<IResourceLinker>();
Linker.Setup(x => x.BuildAbsoluteUri(It.IsAny<NancyContext>(), "SearchIndex", null)).Returns(new Uri("http://www.searchindex.com")); Linker.Setup(x => x.BuildRelativeUri(It.IsAny<NancyContext>(), "SearchIndex", null)).Returns(new Uri("http://www.searchindex.com"));
Linker.Setup(x => x.BuildAbsoluteUri(It.IsAny<NancyContext>(), "LandingPageIndex", null)).Returns(new Uri("http://www.landingpage.com")); Linker.Setup(x => x.BuildRelativeUri(It.IsAny<NancyContext>(), "LandingPageIndex", null)).Returns(new Uri("http://www.landingpage.com"));
Linker.Setup(x => x.BuildAbsoluteUri(It.IsAny<NancyContext>(), "UserLoginIndex", null)).Returns(new Uri("http://www.userloginindex.com")); Linker.Setup(x => x.BuildRelativeUri(It.IsAny<NancyContext>(), "UserLoginIndex", null)).Returns(new Uri("http://www.userloginindex.com"));
PlexSettingsMock = new Mock<ISettingsService<PlexSettings>>(); PlexSettingsMock = new Mock<ISettingsService<PlexSettings>>();
PlexSettingsMock.Setup(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings() {PlexAuthToken = "abc"}); PlexSettingsMock.Setup(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings() {PlexAuthToken = "abc"});
Bootstrapper = new ConfigurableBootstrapper(with => Bootstrapper = new ConfigurableBootstrapper(with =>

10
PlexRequests.UI/Modules/IndexModule.cs
View file

@ -59,23 +59,23 @@ namespace PlexRequests.UI.Modules
if (!string.IsNullOrEmpty(Username)) if (!string.IsNullOrEmpty(Username))
{ {
// They are not logged in // They are not logged in
return Context.GetRedirect(Linker.BuildAbsoluteUri(Context, "LandingPageIndex").ToString()); return Context.GetRedirect(Linker.BuildRelativeUri(Context, "LandingPageIndex").ToString());
} }
return Context.GetRedirect(Linker.BuildAbsoluteUri(Context, "SearchIndex").ToString()); return Context.GetRedirect(Linker.BuildRelativeUri(Context, "SearchIndex").ToString());
} }
// After login // After login
if (string.IsNullOrEmpty(Username)) if (string.IsNullOrEmpty(Username))
{ {
// Not logged in yet // Not logged in yet
return Context.GetRedirect(Linker.BuildAbsoluteUri(Context, "UserLoginIndex").ToString()); return Context.GetRedirect(Linker.BuildRelativeUri(Context, "UserLoginIndex").ToString());
} }
// Send them to landing // Send them to landing
var landingUrl = Linker.BuildAbsoluteUri(Context, "LandingPageIndex").ToString(); var landingUrl = Linker.BuildRelativeUri(Context, "LandingPageIndex").ToString();
return Context.GetRedirect(landingUrl); return Context.GetRedirect(landingUrl);
} }
return Context.GetRedirect(Linker.BuildAbsoluteUri(Context, "UserLoginIndex").ToString()); return Context.GetRedirect(Linker.BuildRelativeUri(Context, "UserLoginIndex").ToString());
} }
} }
} }

2
PlexRequests.UI/Modules/LandingPageModule.cs
View file

@ -52,7 +52,7 @@ namespace PlexRequests.UI.Modules
var s = await LandingSettings.GetSettingsAsync(); var s = await LandingSettings.GetSettingsAsync();
if (!s.BeforeLogin && string.IsNullOrEmpty(Username)) //We are signed in if (!s.BeforeLogin && string.IsNullOrEmpty(Username)) //We are signed in
{ {
var url = Linker.BuildAbsoluteUri(Context, "SearchIndex").ToString(); var url = Linker.BuildRelativeUri(Context, "SearchIndex").ToString();
return Response.AsRedirect(url); return Response.AsRedirect(url);
} }

12
PlexRequests.UI/Modules/UserLoginModule.cs
View file

@ -65,7 +65,7 @@ namespace PlexRequests.UI.Modules
{ {
if (!string.IsNullOrEmpty(Username) || IsAdmin) if (!string.IsNullOrEmpty(Username) || IsAdmin)
{ {
var uri = Linker.BuildAbsoluteUri(Context, "SearchIndex"); var uri = Linker.BuildRelativeUri(Context, "SearchIndex");
return Response.AsRedirect(uri.ToString()); return Response.AsRedirect(uri.ToString());
} }
var settings = await AuthService.GetSettingsAsync(); var settings = await AuthService.GetSettingsAsync();
@ -93,7 +93,7 @@ namespace PlexRequests.UI.Modules
if (string.IsNullOrWhiteSpace(username)) if (string.IsNullOrWhiteSpace(username))
{ {
Session["TempMessage"] = Resources.UI.UserLogin_IncorrectUserPass; Session["TempMessage"] = Resources.UI.UserLogin_IncorrectUserPass;
var uri = Linker.BuildAbsoluteUri(Context, "UserLoginIndex"); var uri = Linker.BuildRelativeUri(Context, "UserLoginIndex");
return Response.AsRedirect(uri.ToString()); // TODO Check this return Response.AsRedirect(uri.ToString()); // TODO Check this
} }
@ -106,7 +106,7 @@ namespace PlexRequests.UI.Modules
{ {
Log.Debug("User is in denied list, not allowing them to authenticate"); Log.Debug("User is in denied list, not allowing them to authenticate");
Session["TempMessage"] = Resources.UI.UserLogin_IncorrectUserPass; Session["TempMessage"] = Resources.UI.UserLogin_IncorrectUserPass;
var uri = Linker.BuildAbsoluteUri(Context, "UserLoginIndex"); var uri = Linker.BuildRelativeUri(Context, "UserLoginIndex");
return Response.AsRedirect(uri.ToString()); // TODO Check this return Response.AsRedirect(uri.ToString()); // TODO Check this
} }
@ -165,7 +165,7 @@ namespace PlexRequests.UI.Modules
if (!authenticated) if (!authenticated)
{ {
var uri = Linker.BuildAbsoluteUri(Context, "UserLoginIndex"); var uri = Linker.BuildRelativeUri(Context, "UserLoginIndex");
Session["TempMessage"] = Resources.UI.UserLogin_IncorrectUserPass; Session["TempMessage"] = Resources.UI.UserLogin_IncorrectUserPass;
return Response.AsRedirect(uri.ToString()); // TODO Check this return Response.AsRedirect(uri.ToString()); // TODO Check this
} }
@ -176,11 +176,11 @@ namespace PlexRequests.UI.Modules
{ {
if (!landingSettings.BeforeLogin) if (!landingSettings.BeforeLogin)
{ {
var uri = Linker.BuildAbsoluteUri(Context, "LandingPageIndex"); var uri = Linker.BuildRelativeUri(Context, "LandingPageIndex");
return Response.AsRedirect(uri.ToString()); return Response.AsRedirect(uri.ToString());
} }
} }
var retVal = Linker.BuildAbsoluteUri(Context, "SearchIndex"); var retVal = Linker.BuildRelativeUri(Context, "SearchIndex");
return Response.AsRedirect(retVal.ToString()); // TODO Check this return Response.AsRedirect(retVal.ToString()); // TODO Check this
} }