AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A lot of Misc Fixes (#2656)

Browse source
This commit is contained in:
Joe Milazzo 2024-01-27 12:53:58 -06:00 • committed by GitHub
parent 088af37960
commit b1e9d8cbba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 116 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

42
API/Services/AccountService.cs
View file

@ -27,9 +27,6 @@ public interface IAccountService
Task<bool> HasBookmarkPermission(AppUser? user);
Task<bool> HasDownloadPermission(AppUser? user);
Task<bool> HasChangeRestrictionRole(AppUser? user);
Task<bool> CheckIfAccessible(HttpRequest request);
Task<string> GenerateEmailLink(HttpRequest request, string token, string routePart, string email, bool withHost = true);
}
public class AccountService : IAccountService
@ -37,50 +34,13 @@ public class AccountService : IAccountService
private readonly UserManager<AppUser> _userManager;
private readonly ILogger<AccountService> _logger;
private readonly IUnitOfWork _unitOfWork;
private readonly IHostEnvironment _environment;
private readonly IEmailService _emailService;
public const string DefaultPassword = "[k.2@RZ!mxCQkJzE";
private const string LocalHost = "localhost:4200";
public AccountService(UserManager<AppUser> userManager, ILogger<AccountService> logger, IUnitOfWork unitOfWork,
IHostEnvironment environment, IEmailService emailService)
public AccountService(UserManager<AppUser> userManager, ILogger<AccountService> logger, IUnitOfWork unitOfWork)
{
_userManager = userManager;
_logger = logger;
_unitOfWork = unitOfWork;
_environment = environment;
_emailService = emailService;
}
/// <summary>
/// Checks if the instance is accessible. If the host name is filled out, then it will assume it is accessible as email generation will use host name.
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<bool> CheckIfAccessible(HttpRequest request)
{
var host = _environment.IsDevelopment() ? LocalHost : request.Host.ToString();
return !string.IsNullOrEmpty((await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).HostName) || await _emailService.CheckIfAccessible(host);
}
public async Task<string> GenerateEmailLink(HttpRequest request, string token, string routePart, string email, bool withHost = true)
{
var serverSettings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync();
var host = _environment.IsDevelopment() ? LocalHost : request.Host.ToString();
var basePart = $"{request.Scheme}://{host}{request.PathBase}/";
if (!string.IsNullOrEmpty(serverSettings.HostName))
{
basePart = serverSettings.HostName;
if (!serverSettings.BaseUrl.Equals(Configuration.DefaultBaseUrl))
{
var removeCount = serverSettings.BaseUrl.EndsWith('/') ? 1 : 0;
basePart += serverSettings.BaseUrl.Substring(0, serverSettings.BaseUrl.Length - removeCount);
}
}
if (withHost) return $"{basePart}/registration/{routePart}?token={HttpUtility.UrlEncode(token)}&email={HttpUtility.UrlEncode(email)}";
return $"registration/{routePart}?token={HttpUtility.UrlEncode(token)}&email={HttpUtility.UrlEncode(email)}"
.Replace("//", "/");
}
public async Task<IEnumerable<ApiException>> ChangeUserPassword(AppUser user, string newPassword)