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

merge

Browse source
This commit is contained in:
tidusjar 2016-08-22 13:11:43 +01:00
commit 8969ebd299
5 changed files with 39 additions and 33 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);
} }

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

@ -61,7 +61,17 @@ namespace PlexRequests.UI.Modules
PlexSettings = plexSettings; PlexSettings = plexSettings;
Linker = linker; Linker = linker;
Get["UserLoginIndex", "/", true] = async (x, ct) => await Index(); Get["UserLoginIndex", "/", true] = async (x, ct) =>
{
if (!string.IsNullOrEmpty(Username) || IsAdmin)
{
var uri = Linker.BuildRelativeUri(Context, "SearchIndex");
return Response.AsRedirect(uri.ToString());
}
var settings = await AuthService.GetSettingsAsync();
return View["Index", settings];
};
Post["/", true] = async (x, ct) => await LoginUser(); Post["/", true] = async (x, ct) => await LoginUser();
Get["/logout"] = x => Logout(); Get["/logout"] = x => Logout();
} }
@ -75,12 +85,6 @@ namespace PlexRequests.UI.Modules
private static Logger Log = LogManager.GetCurrentClassLogger(); private static Logger Log = LogManager.GetCurrentClassLogger();
public async Task<Negotiator> Index()
{
var settings = await AuthService.GetSettingsAsync();
return View["Index", settings];
}
private async Task<Response> LoginUser() private async Task<Response> LoginUser()
{ {
var dateTimeOffset = Request.Form.DateTimeOffset; var dateTimeOffset = Request.Form.DateTimeOffset;
@ -89,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
} }
@ -102,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
} }
@ -161,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
} }
@ -172,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
} }

26
PlexRequests.UI/Validators/PlexRequestsValidator.cs
View file

@ -24,6 +24,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ************************************************************************/ // ************************************************************************/
#endregion #endregion
using System;
using FluentValidation; using FluentValidation;
using PlexRequests.Core.SettingModels; using PlexRequests.Core.SettingModels;
@ -34,18 +36,18 @@ namespace PlexRequests.UI.Validators
{ {
public PlexRequestsValidator() public PlexRequestsValidator()
{ {
RuleFor(x => x.BaseUrl).NotEqual("requests").WithMessage("You cannot use 'requests' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("requests",StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'requests' as this is reserved by the application.");
RuleFor(x => x.BaseUrl).NotEqual("admin").WithMessage("You cannot use 'admin' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("admin", StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'admin' as this is reserved by the application.");
RuleFor(x => x.BaseUrl).NotEqual("search").WithMessage("You cannot use 'search' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("search", StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'search' as this is reserved by the application.");
RuleFor(x => x.BaseUrl).NotEqual("issues").WithMessage("You cannot use 'issues' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("issues", StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'issues' as this is reserved by the application.");
RuleFor(x => x.BaseUrl).NotEqual("userlogin").WithMessage("You cannot use 'userlogin' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("userlogin", StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'userlogin' as this is reserved by the application.");
RuleFor(x => x.BaseUrl).NotEqual("login").WithMessage("You cannot use 'login' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("login", StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'login' as this is reserved by the application.");
RuleFor(x => x.BaseUrl).NotEqual("test").WithMessage("You cannot use 'test' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("test", StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'test' as this is reserved by the application.");
RuleFor(x => x.BaseUrl).NotEqual("approval").WithMessage("You cannot use 'approval' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("approval", StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'approval' as this is reserved by the application.");
RuleFor(x => x.BaseUrl).NotEqual("updatechecker").WithMessage("You cannot use 'updatechecker' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("updatechecker", StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'updatechecker' as this is reserved by the application.");
RuleFor(x => x.BaseUrl).NotEqual("usermanagement").WithMessage("You cannot use 'usermanagement' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("usermanagement", StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'usermanagement' as this is reserved by the application.");
RuleFor(x => x.BaseUrl).NotEqual("api").WithMessage("You cannot use 'api' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("api", StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'api' as this is reserved by the application.");
RuleFor(x => x.BaseUrl).NotEqual("landing").WithMessage("You cannot use 'landing' as this is reserved by the application."); RuleFor(x => x.BaseUrl).NotEqual("landing", StringComparer.CurrentCultureIgnoreCase).WithMessage("You cannot use 'landing' as this is reserved by the application.");
} }
} }
} }