mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-01 04:34:49 -04:00
* Started designing the backend localization service * Worked in Transloco for initial PoC * Worked in Transloco for initial PoC * Translated the login screen * translated dashboard screen * Started work on the backend * Fixed a logic bug * translated edit-user screen * Hooked up the backend for having a locale property. * Hooked up the ability to view the available locales and switch to them. * Made the localization service languages be derived from what's in langs/ directory. * Fixed up localization switching * Switched when we check for a license on UI bootstrap * Tweaked some code * Fixed the bug where dashboard wasn't loading and made it so language switching is working. * Fixed a bug on dashboard with languagePath * Converted user-scrobble-history.component.html * Converted spoiler.component.html * Converted review-series-modal.component.html * Converted review-card-modal.component.html * Updated the readme * Translated using Weblate (English) Currently translated at 100.0% (54 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/en/ * Converted review-card.component.html * Deleted dead component * Converted want-to-read.component.html * Added translation using Weblate (Korean) * Translated using Weblate (Spanish) Currently translated at 40.7% (22 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/es/ * Translated using Weblate (Korean) Currently translated at 62.9% (34 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/ko/ * Converted user-preferences.component.html * Translated using Weblate (Korean) Currently translated at 92.5% (50 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/ko/ * Converted user-holds.component.html * Converted theme-manager.component.html * Converted restriction-selector.component.html * Converted manage-devices.component.html * Converted edit-device.component.html * Converted change-password.component.html * Converted change-email.component.html * Converted change-age-restriction.component.html * Converted api-key.component.html * Converted anilist-key.component.html * Converted typeahead.component.html * Converted user-stats-info-cards.component.html * Converted user-stats.component.html * Converted top-readers.component.html * Converted some pipes and ensure translation is loaded before the app. * Finished all but one pipe for localization * Converted directory-picker.component.html * Converted library-access-modal.component.html * Converted a few components * Converted a few components * Converted a few components * Converted a few components * Converted a few components * Merged weblate in * ... -> … update * Updated the readme * Updateded all fonts to be woff2 * Cleaned up some strings to increase re-use * Removed an old flow (that doesn't exist in backend any longer) from when we introduced emails on Kavita. * Converted Series detail * Lots more converted * Lots more converted & hooked up the ability to flatten during prod build the language files. * Lots more converted * Lots more converted & fixed a bunch of broken pipes due to inject() * Lots more converted * Lots more converted * Lots more converted & fixed some bad keys * Lots more converted * Fixed some bugs with admin dasbhoard nested tabs not rendering on first load due to not using onpush change detection * Fixed up some localization errors and fixed forgot password error when the user doesn't have change password permission * Fixed a stupid build issue again * Started adding errors for interceptor and backend. * Finished off manga-reader * More translations * Few fixes * Fixed a bug where character tag badges weren't showing the name on chapter info * All components are translated * All toasts are translated * All confirm/alerts are translated * Trying something new for the backend * Migrated the localization strings for the backend into a new file. * Updated the localization service to be able to do backend localization with fallback to english. * Cleaned up some external reviews code to reduce looping * Localized AccountController.cs * 60% done with controllers * All controllers are done * All KavitaExceptions are covered * Some shakeout fixes * Prep for initial merge * Everything is done except options and basic shakeout proves response times are good. Unit tests are broken. * Fixed up the unit tests * All unit tests are now working * Removed some quantifier * I'm not sure I can support localization for some Volume/Chapter/Book strings within the codebase. --------- Co-authored-by: Robbie Davis <robbie@therobbiedavis.com> Co-authored-by: majora2007 <kavitareader@gmail.com> Co-authored-by: expertjun <jtrobin@naver.com> Co-authored-by: ThePromidius <thepromidiusyt@gmail.com>
198 lines
7.1 KiB
C#
198 lines
7.1 KiB
C#
using System;
|
|
using System.Threading.Tasks;
|
|
using API.Constants;
|
|
using API.Data;
|
|
using API.DTOs.Account;
|
|
using API.DTOs.License;
|
|
using API.Entities.Enums;
|
|
using EasyCaching.Core;
|
|
using Flurl.Http;
|
|
using Hangfire;
|
|
using Kavita.Common;
|
|
using Kavita.Common.EnvironmentInfo;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace API.Services.Plus;
|
|
|
|
internal class RegisterLicenseResponseDto
|
|
{
|
|
public string EncryptedLicense { get; set; }
|
|
public bool Successful { get; set; }
|
|
public string ErrorMessage { get; set; }
|
|
}
|
|
|
|
public interface ILicenseService
|
|
{
|
|
Task ValidateLicenseStatus();
|
|
Task RemoveLicense();
|
|
Task AddLicense(string license, string email);
|
|
Task<bool> HasActiveLicense(bool forceCheck = false);
|
|
}
|
|
|
|
public class LicenseService : ILicenseService
|
|
{
|
|
private readonly IEasyCachingProviderFactory _cachingProviderFactory;
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private readonly ILogger<LicenseService> _logger;
|
|
private readonly TimeSpan _licenseCacheTimeout = TimeSpan.FromHours(8);
|
|
public const string Cron = "0 */4 * * *";
|
|
private const string CacheKey = "license";
|
|
|
|
|
|
public LicenseService(IEasyCachingProviderFactory cachingProviderFactory, IUnitOfWork unitOfWork, ILogger<LicenseService> logger)
|
|
{
|
|
_cachingProviderFactory = cachingProviderFactory;
|
|
_unitOfWork = unitOfWork;
|
|
_logger = logger;
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// Performs license lookup to API layer
|
|
/// </summary>
|
|
/// <param name="license"></param>
|
|
/// <returns></returns>
|
|
private async Task<bool> IsLicenseValid(string license)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(license)) return false;
|
|
try
|
|
{
|
|
var response = await (Configuration.KavitaPlusApiUrl + "/api/license/check")
|
|
.WithHeader("Accept", "application/json")
|
|
.WithHeader("User-Agent", "Kavita")
|
|
.WithHeader("x-license-key", license)
|
|
.WithHeader("x-installId", HashUtil.ServerToken())
|
|
.WithHeader("x-kavita-version", BuildInfo.Version)
|
|
.WithHeader("Content-Type", "application/json")
|
|
.WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs))
|
|
.PostJsonAsync(new LicenseValidDto()
|
|
{
|
|
License = license,
|
|
InstallId = HashUtil.ServerToken()
|
|
})
|
|
.ReceiveString();
|
|
return bool.Parse(response);
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
_logger.LogError(e, "An error happened during the request to Kavita+ API");
|
|
throw;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Register the license with KavitaPlus
|
|
/// </summary>
|
|
/// <param name="license"></param>
|
|
/// <param name="email"></param>
|
|
/// <returns></returns>
|
|
private async Task<string> RegisterLicense(string license, string email)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(license) || string.IsNullOrWhiteSpace(email)) return string.Empty;
|
|
try
|
|
{
|
|
var response = await (Configuration.KavitaPlusApiUrl + "/api/license/register")
|
|
.WithHeader("Accept", "application/json")
|
|
.WithHeader("User-Agent", "Kavita")
|
|
.WithHeader("x-license-key", license)
|
|
.WithHeader("x-installId", HashUtil.ServerToken())
|
|
.WithHeader("x-kavita-version", BuildInfo.Version)
|
|
.WithHeader("Content-Type", "application/json")
|
|
.WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs))
|
|
.PostJsonAsync(new EncryptLicenseDto()
|
|
{
|
|
License = license.Trim(),
|
|
InstallId = HashUtil.ServerToken(),
|
|
EmailId = email.Trim()
|
|
})
|
|
.ReceiveJson<RegisterLicenseResponseDto>();
|
|
|
|
if (response.Successful)
|
|
{
|
|
return response.EncryptedLicense;
|
|
}
|
|
|
|
_logger.LogError("An error happened during the request to Kavita+ API: {ErrorMessage}", response.ErrorMessage);
|
|
throw new KavitaException(response.ErrorMessage);
|
|
}
|
|
catch (FlurlHttpException e)
|
|
{
|
|
_logger.LogError(e, "An error happened during the request to Kavita+ API");
|
|
return string.Empty;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Checks licenses and updates cache
|
|
/// </summary>
|
|
/// <remarks>Expected to be called at startup and on reoccurring basis</remarks>
|
|
public async Task ValidateLicenseStatus()
|
|
{
|
|
try
|
|
{
|
|
var license = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey);
|
|
if (string.IsNullOrEmpty(license.Value)) return;
|
|
|
|
_logger.LogInformation("Validating Kavita+ License");
|
|
var provider = _cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.License);
|
|
await provider.FlushAsync();
|
|
|
|
var isValid = await IsLicenseValid(license.Value);
|
|
await provider.SetAsync(CacheKey, isValid, _licenseCacheTimeout);
|
|
|
|
_logger.LogInformation("Validating Kavita+ License - Complete");
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
_logger.LogError(ex, "There was an error talking with Kavita+ API for license validation. Rescheduling check in 30 mins");
|
|
BackgroundJob.Schedule(() => ValidateLicenseStatus(), TimeSpan.FromMinutes(30));
|
|
}
|
|
}
|
|
|
|
public async Task RemoveLicense()
|
|
{
|
|
var serverSetting = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey);
|
|
serverSetting.Value = string.Empty;
|
|
_unitOfWork.SettingsRepository.Update(serverSetting);
|
|
await _unitOfWork.CommitAsync();
|
|
var provider = _cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.License);
|
|
await provider.RemoveAsync(CacheKey);
|
|
}
|
|
|
|
public async Task AddLicense(string license, string email)
|
|
{
|
|
var serverSetting = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey);
|
|
var lic = await RegisterLicense(license, email);
|
|
if (string.IsNullOrWhiteSpace(lic))
|
|
throw new KavitaException("unable-to-register-k+");
|
|
serverSetting.Value = lic;
|
|
_unitOfWork.SettingsRepository.Update(serverSetting);
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
public async Task<bool> HasActiveLicense(bool forceCheck = false)
|
|
{
|
|
var provider = _cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.License);
|
|
if (!forceCheck)
|
|
{
|
|
var cacheValue = await provider.GetAsync<bool>(CacheKey);
|
|
if (cacheValue.HasValue) return cacheValue.Value;
|
|
}
|
|
|
|
try
|
|
{
|
|
var serverSetting = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey);
|
|
var result = await IsLicenseValid(serverSetting.Value);
|
|
await provider.FlushAsync();
|
|
await provider.SetAsync(CacheKey, result, _licenseCacheTimeout);
|
|
return result;
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
_logger.LogError(ex, "There was an issue connecting to Kavita+");
|
|
}
|
|
|
|
return false;
|
|
}
|
|
}
|