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

Use the user alias everywhere if it is set #218

Browse source
This commit is contained in:
tidusjar 2016-11-20 19:16:22 +00:00
parent 4629301264
commit eb120e6840
3 changed files with 50 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
PlexRequests.Core/ISecurityExtensions.cs
View file

@ -19,5 +19,12 @@ namespace PlexRequests.Core
bool IsNormalUser(NancyContext context);
bool IsPlexUser(NancyContext context);
bool HasPermissions(string userName, Permissions perm);
/// <summary>
/// Gets the username this could be the alias! We should always use this method when getting the username
/// </summary>
/// <param name="username">The username.</param>
/// <returns><c>null</c> if we cannot find a user</returns>
string GetUsername(string username);
}
}

37
PlexRequests.Core/SecurityExtensions.cs
View file

@ -30,6 +30,7 @@ using Nancy;
using Nancy.Linker;
using Nancy.Responses;
using Nancy.Security;
using PlexRequests.Core.Models;
using PlexRequests.Helpers;
using PlexRequests.Helpers.Permissions;
using PlexRequests.Store.Repository;
@ -77,6 +78,42 @@ namespace PlexRequests.Core
return dbUser != null;
}
/// <summary>
/// Gets the username this could be the alias! We should always use this method when getting the username
/// </summary>
/// <param name="username">The username.</param>
/// <returns><c>null</c> if we cannot find a user</returns>
public string GetUsername(string username)
{
var plexUser = PlexUsers.GetUserByUsername(username);
if (plexUser != null)
{
if (!string.IsNullOrEmpty(plexUser.UserAlias))
{
return plexUser.UserAlias;
}
else
{
return plexUser.Username;
}
}
var dbUser = UserRepository.GetUserByUsername(username);
if (dbUser != null)
{
var userProps = ByteConverterHelper.ReturnObject<UserProperties>(dbUser.UserProperties);
if (!string.IsNullOrEmpty(userProps.UserAlias))
{
return userProps.UserAlias;
}
else
{
return dbUser.UserName;
}
}
return null;
}
/// <summary>
/// Creates a hook to be used in a pipeline before a route handler to ensure

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

@ -109,7 +109,12 @@ namespace PlexRequests.UI.Modules
{
try
{
_username = User == null ? Session[SessionKeys.UsernameKey].ToString() : User.UserName;
var username = Security.GetUsername(User.UserName);
if (string.IsNullOrEmpty(username))
{
return Session[SessionKeys.UsernameKey].ToString();
}
_username = username;
}
catch (Exception)
{