Fixed exception and all areas will now use the base url #72

This commit is contained in:
tidusjar 2016-04-14 17:19:55 +01:00
commit 6dea8b7440
7 changed files with 32 additions and 16 deletions

View file

@ -38,7 +38,7 @@ using PlexRequests.UI.Models;
namespace PlexRequests.UI.Modules
{
public class LoginModule : NancyModule
public class LoginModule : BaseModule
{
public LoginModule()
{
@ -54,7 +54,7 @@ namespace PlexRequests.UI.Modules
};
Get["/logout"] = x => this.LogoutAndRedirect("~/");
Get["/logout"] = x => this.LogoutAndRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/" : "~/");
Post["/login"] = x =>
{
@ -66,7 +66,7 @@ namespace PlexRequests.UI.Modules
if (userId == null)
{
return Context.GetRedirect("~/login?error=true&username=" + username);
return Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/login?error=true&username=" + username : "~/login?error=true&username=" + username);
}
DateTime? expiry = null;
if (Request.Form.RememberMe.HasValue)
@ -94,7 +94,7 @@ namespace PlexRequests.UI.Modules
var exists = UserMapper.DoUsersExist();
if (exists)
{
return Context.GetRedirect("~/register?error=true");
return Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/register?error=true" : "~/register?error=true");
}
var userId = UserMapper.CreateUser(username, Request.Form.Password, new[] { "Admin" });
Session[SessionKeys.UsernameKey] = username;