|
|
|
@ -135,7 +135,7 @@ namespace Ombi.Controllers.V1
|
|
|
|
public async Task<SaveWizardResult> CreateWizardUser([FromBody] CreateUserWizardModel user)
|
|
|
|
public async Task<SaveWizardResult> CreateWizardUser([FromBody] CreateUserWizardModel user)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var users = UserManager.Users;
|
|
|
|
var users = UserManager.Users;
|
|
|
|
if (users.Any(x => !x.UserName.Equals("api", StringComparison.InvariantCultureIgnoreCase)))
|
|
|
|
if (users.Any(x => x.NormalizedUserName != "API"))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// No one should be calling this. Only the wizard
|
|
|
|
// No one should be calling this. Only the wizard
|
|
|
|
return new SaveWizardResult { Result = false, Errors = new List<string> { "Looks like there is an existing user!" } };
|
|
|
|
return new SaveWizardResult { Result = false, Errors = new List<string> { "Looks like there is an existing user!" } };
|
|
|
|
@ -280,7 +280,8 @@ namespace Ombi.Controllers.V1
|
|
|
|
[Authorize]
|
|
|
|
[Authorize]
|
|
|
|
public async Task<UserViewModel> GetCurrentUser()
|
|
|
|
public async Task<UserViewModel> GetCurrentUser()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var user = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName.Equals(User.Identity.Name, StringComparison.InvariantCultureIgnoreCase));
|
|
|
|
var username = User.Identity.Name.ToUpper();
|
|
|
|
|
|
|
|
var user = await UserManager.Users.FirstOrDefaultAsync(x => x.NormalizedUserName == username);
|
|
|
|
|
|
|
|
|
|
|
|
return await GetUserWithRoles(user);
|
|
|
|
return await GetUserWithRoles(user);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -875,7 +876,9 @@ namespace Ombi.Controllers.V1
|
|
|
|
[ApiExplorerSettings(IgnoreApi = true)]
|
|
|
|
[ApiExplorerSettings(IgnoreApi = true)]
|
|
|
|
public async Task<string> GetUserAccessToken()
|
|
|
|
public async Task<string> GetUserAccessToken()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var user = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName.Equals(User.Identity.Name, StringComparison.InvariantCultureIgnoreCase));
|
|
|
|
|
|
|
|
|
|
|
|
var username = User.Identity.Name.ToUpper();
|
|
|
|
|
|
|
|
var user = await UserManager.Users.FirstOrDefaultAsync(x => x.NormalizedUserName == username);
|
|
|
|
if (user == null)
|
|
|
|
if (user == null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return Guid.Empty.ToString("N");
|
|
|
|
return Guid.Empty.ToString("N");
|
|
|
|
@ -897,7 +900,8 @@ namespace Ombi.Controllers.V1
|
|
|
|
[HttpGet("notificationpreferences")]
|
|
|
|
[HttpGet("notificationpreferences")]
|
|
|
|
public async Task<List<UserNotificationPreferences>> GetUserPreferences()
|
|
|
|
public async Task<List<UserNotificationPreferences>> GetUserPreferences()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var user = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName.Equals(User.Identity.Name, StringComparison.InvariantCultureIgnoreCase));
|
|
|
|
var username = User.Identity.Name.ToUpper();
|
|
|
|
|
|
|
|
var user = await UserManager.Users.FirstOrDefaultAsync(x => x.NormalizedUserName == username);
|
|
|
|
return await GetPreferences(user);
|
|
|
|
return await GetPreferences(user);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -950,7 +954,9 @@ namespace Ombi.Controllers.V1
|
|
|
|
return NotFound();
|
|
|
|
return NotFound();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Check if we are editing a different user than ourself, if we are then we need to power user role
|
|
|
|
// Check if we are editing a different user than ourself, if we are then we need to power user role
|
|
|
|
var me = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName.Equals(User.Identity.Name, StringComparison.InvariantCultureIgnoreCase));
|
|
|
|
|
|
|
|
|
|
|
|
var username = User.Identity.Name.ToUpper();
|
|
|
|
|
|
|
|
var me = await UserManager.Users.FirstOrDefaultAsync(x => x.NormalizedUserName == username);
|
|
|
|
if (!me.Id.Equals(user.Id, StringComparison.InvariantCultureIgnoreCase))
|
|
|
|
if (!me.Id.Equals(user.Id, StringComparison.InvariantCultureIgnoreCase))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var isPowerUser = await UserManager.IsInRoleAsync(me, OmbiRoles.PowerUser);
|
|
|
|
var isPowerUser = await UserManager.IsInRoleAsync(me, OmbiRoles.PowerUser);
|
|
|
|
|
Jamie Rees
5 years ago