mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Moved the Server Settings out into a button on nav header * Refactored Mange Users page to the new design (skeleton). Implemented skeleton code for Invite User. * Hashed out more of the code, but need to move all the email code to a Kavita controlled API server due to password credentials. * Cleaned up some warnings * When no user exists for an api key in Plugin controller, throw 401. * Hooked in the ability to check if the Kavita instance can be accessed externally so we can determine if the user can invite or not. * Hooked up some logic if the user's server isn't accessible, then default to old flow * Basic flow is working for confirm email. Needs validation, error handling, etc. * Refactored Password validation to account service * Cleaned up the code in confirm-email to work much better. * Refactored the login page to have a container functionality, so we can reuse the styles on multiple pages (registration pages). Hooked up the code for confirm email. * Messy code, but making progress. Refactored Register to be used only for first time user registration. Added a new register component to handle first time flow only. * Invite works much better, still needs a bit of work for non-accessible server setup. Started work on underlying manage users page to meet new design. * Changed (you) to a star to indicate who you're logged in as. * Inviting a user is now working and tested fully. * Removed the register member component as we now have invite and confirm components. * Editing a user is now working. Username change and Role/Library access from within one screen. Email changing is on hold. * Cleaned up code for edit user and disabled email field for now. * Cleaned up the code to indicate changing a user's email is not possible. * Implemented a migration for existing accounts so they can validate their emails and still login. * Change url for email server * Implemented the ability to resend an email confirmation code (or regenerate for non accessible servers). Fixed an overflow on the confirm dialog. * Took care of some code cleanup * Removed 3 db calls from cover refresh and some misc cleanup * Fixed a broken test
97 lines
3.5 KiB
C#
97 lines
3.5 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Data;
|
|
using API.Entities;
|
|
using API.Errors;
|
|
using Microsoft.AspNetCore.Identity;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace API.Services
|
|
{
|
|
public interface IAccountService
|
|
{
|
|
Task<IEnumerable<ApiException>> ChangeUserPassword(AppUser user, string newPassword);
|
|
Task<IEnumerable<ApiException>> ValidatePassword(AppUser user, string password);
|
|
Task<IEnumerable<ApiException>> ValidateUsername(string username);
|
|
Task<IEnumerable<ApiException>> ValidateEmail(string email);
|
|
}
|
|
|
|
public class AccountService : IAccountService
|
|
{
|
|
private readonly UserManager<AppUser> _userManager;
|
|
private readonly ILogger<AccountService> _logger;
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
public const string DefaultPassword = "[k.2@RZ!mxCQkJzE";
|
|
|
|
public AccountService(UserManager<AppUser> userManager, ILogger<AccountService> logger, IUnitOfWork unitOfWork)
|
|
{
|
|
_userManager = userManager;
|
|
_logger = logger;
|
|
_unitOfWork = unitOfWork;
|
|
}
|
|
|
|
public async Task<IEnumerable<ApiException>> ChangeUserPassword(AppUser user, string newPassword)
|
|
{
|
|
var passwordValidationIssues = (await ValidatePassword(user, newPassword)).ToList();
|
|
if (passwordValidationIssues.Any()) return passwordValidationIssues;
|
|
|
|
var result = await _userManager.RemovePasswordAsync(user);
|
|
if (!result.Succeeded)
|
|
{
|
|
_logger.LogError("Could not update password");
|
|
return result.Errors.Select(e => new ApiException(400, e.Code, e.Description));
|
|
}
|
|
|
|
|
|
result = await _userManager.AddPasswordAsync(user, newPassword);
|
|
if (!result.Succeeded)
|
|
{
|
|
_logger.LogError("Could not update password");
|
|
return result.Errors.Select(e => new ApiException(400, e.Code, e.Description));
|
|
}
|
|
|
|
return new List<ApiException>();
|
|
}
|
|
|
|
public async Task<IEnumerable<ApiException>> ValidatePassword(AppUser user, string password)
|
|
{
|
|
foreach (var validator in _userManager.PasswordValidators)
|
|
{
|
|
var validationResult = await validator.ValidateAsync(_userManager, user, password);
|
|
if (!validationResult.Succeeded)
|
|
{
|
|
return validationResult.Errors.Select(e => new ApiException(400, e.Code, e.Description));
|
|
}
|
|
}
|
|
|
|
return Array.Empty<ApiException>();
|
|
}
|
|
public async Task<IEnumerable<ApiException>> ValidateUsername(string username)
|
|
{
|
|
if (await _userManager.Users.AnyAsync(x => x.NormalizedUserName == username.ToUpper()))
|
|
{
|
|
return new List<ApiException>()
|
|
{
|
|
new ApiException(400, "Username is already taken")
|
|
};
|
|
}
|
|
|
|
return Array.Empty<ApiException>();
|
|
}
|
|
|
|
public async Task<IEnumerable<ApiException>> ValidateEmail(string email)
|
|
{
|
|
var user = await _unitOfWork.UserRepository.GetUserByEmailAsync(email);
|
|
if (user == null) return Array.Empty<ApiException>();
|
|
|
|
return new List<ApiException>()
|
|
{
|
|
new ApiException(400, "Email is already registered")
|
|
};
|
|
}
|
|
}
|
|
}
|