github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-10 23:42:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed an issue where there were some JS errors on the landing page settings and stopped us being redirected to the login sometimes as an admin

Browse source
This commit is contained in:
tidusjar 2016-08-25 21:43:49 +01:00
parent c235018e98
commit 2aebbe0259
3 changed files with 159 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PlexRequests.UI/Helpers/BaseUrlHelper.cs
View file

@ -118,9 +118,10 @@ namespace PlexRequests.UI.Helpers
public static IHtmlString LoadDateTimePickerAsset(this HtmlHelpers helper) public static IHtmlString LoadDateTimePickerAsset(this HtmlHelpers helper)
{ {
var startUrl = GetBaseUrl(); var content = GetBaseUrl();
var sb = new StringBuilder(); var sb = new StringBuilder();
var startUrl = $"{content}/Content";
sb.AppendLine($"<link rel=\"stylesheet\" href=\"{startUrl}/datepicker.min.css\" type=\"text/css\"/>"); sb.AppendLine($"<link rel=\"stylesheet\" href=\"{startUrl}/datepicker.min.css\" type=\"text/css\"/>");
sb.AppendLine($"<script src=\"{startUrl}/bootstrap-datetimepicker.min.js\"></script>"); sb.AppendLine($"<script src=\"{startUrl}/bootstrap-datetimepicker.min.js\"></script>");

5
PlexRequests.UI/Modules/BaseModule.cs
View file

@ -122,7 +122,7 @@ namespace PlexRequests.UI.Modules
{ {
get get
{ {
if (Context?.CurrentUser == null) if (!LoggedIn)
{ {
return false; return false;
} }
@ -130,6 +130,9 @@ namespace PlexRequests.UI.Modules
return claims.Contains(UserClaims.Admin) || claims.Contains(UserClaims.PowerUser); return claims.Contains(UserClaims.Admin) || claims.Contains(UserClaims.PowerUser);
} }
} }
protected bool LoggedIn => Context?.CurrentUser != null;
protected string Culture { get; set; } protected string Culture { get; set; }
protected const string CultureCookieName = "_culture"; protected const string CultureCookieName = "_culture";
protected Response SetCookie() protected Response SetCookie()

30
PlexRequests.UI/Modules/LoginModule.cs
View file

@ -30,6 +30,7 @@ using System.Dynamic;
using Nancy; using Nancy;
using Nancy.Authentication.Forms; using Nancy.Authentication.Forms;
using Nancy.Extensions; using Nancy.Extensions;
using Nancy.Linker;
using Nancy.Responses.Negotiation; using Nancy.Responses.Negotiation;
using Nancy.Security; using Nancy.Security;
@ -42,20 +43,22 @@ namespace PlexRequests.UI.Modules
{ {
public class LoginModule : BaseModule public class LoginModule : BaseModule
{ {
public LoginModule(ISettingsService<PlexRequestSettings> pr, ICustomUserMapper m) : base(pr) public LoginModule(ISettingsService<PlexRequestSettings> pr, ICustomUserMapper m, IResourceLinker linker) : base(pr)
{ {
UserMapper = m; UserMapper = m;
Get["/login"] = _ => Get["/login"] = _ =>
{ {
if (LoggedIn)
{ {
dynamic model = new ExpandoObject(); var url = linker.BuildRelativeUri(Context, "SearchIndex");
model.Redirect = Request.Query.redirect.Value ?? string.Empty; return Response.AsRedirect(url.ToString());
model.Errored = Request.Query.error.HasValue;
var adminCreated = UserMapper.DoUsersExist();
model.AdminExists = adminCreated;
return View["Index", model];
} }
dynamic model = new ExpandoObject();
model.Redirect = Request.Query.redirect.Value ?? string.Empty;
model.Errored = Request.Query.error.HasValue;
var adminCreated = UserMapper.DoUsersExist();
model.AdminExists = adminCreated;
return View["Index", model];
}; };
Get["/logout"] = x => this.LogoutAndRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/" : "~/"); Get["/logout"] = x => this.LogoutAndRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/" : "~/");
@ -65,7 +68,7 @@ namespace PlexRequests.UI.Modules
var username = (string)Request.Form.Username; var username = (string)Request.Form.Username;
var password = (string)Request.Form.Password; var password = (string)Request.Form.Password;
var dtOffset = (int)Request.Form.DateTimeOffset; var dtOffset = (int)Request.Form.DateTimeOffset;
var redirect = (string)Request.Form.Redirect; var redirect = (string)Request.Form.Redirect;
var userId = UserMapper.ValidateUser(username, password); var userId = UserMapper.ValidateUser(username, password);
@ -80,10 +83,11 @@ namespace PlexRequests.UI.Modules
} }
Session[SessionKeys.UsernameKey] = username; Session[SessionKeys.UsernameKey] = username;
Session[SessionKeys.ClientDateTimeOffsetKey] = dtOffset; Session[SessionKeys.ClientDateTimeOffsetKey] = dtOffset;
if(redirect.Contains("userlogin")){ if (redirect.Contains("userlogin"))
redirect = !string.IsNullOrEmpty(BaseUrl) ? $"/{BaseUrl}/search" : "/search"; {
} redirect = !string.IsNullOrEmpty(BaseUrl) ? $"/{BaseUrl}/search" : "/search";
return this.LoginAndRedirect(userId.Value, expiry, redirect); }
return this.LoginAndRedirect(userId.Value, expiry, redirect);
}; };
Get["/register"] = x => Get["/register"] = x =>