mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-01 04:34:49 -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
104 lines
2.9 KiB
C#
104 lines
2.9 KiB
C#
using System;
|
|
using System.Net.Http;
|
|
using System.Threading.Tasks;
|
|
using API.DTOs.Email;
|
|
using API.Services.Tasks;
|
|
using Flurl.Http;
|
|
using Kavita.Common.EnvironmentInfo;
|
|
using Microsoft.AspNetCore.Http;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace API.Services;
|
|
|
|
public interface IEmailService
|
|
{
|
|
Task SendConfirmationEmail(ConfirmationEmailDto data);
|
|
Task<bool> CheckIfAccessible(string host);
|
|
Task SendMigrationEmail(EmailMigrationDto data);
|
|
}
|
|
|
|
public class EmailService : IEmailService
|
|
{
|
|
private readonly ILogger<EmailService> _logger;
|
|
private const string ApiUrl = "https://email.kavitareader.com";
|
|
|
|
public EmailService(ILogger<EmailService> logger)
|
|
{
|
|
_logger = logger;
|
|
|
|
FlurlHttp.ConfigureClient(ApiUrl, cli =>
|
|
cli.Settings.HttpClientFactory = new UntrustedCertClientFactory());
|
|
}
|
|
|
|
public async Task SendConfirmationEmail(ConfirmationEmailDto data)
|
|
{
|
|
|
|
var success = await SendEmailWithPost(ApiUrl + "/api/email/confirm", data);
|
|
if (!success)
|
|
{
|
|
_logger.LogError("There was a critical error sending Confirmation email");
|
|
}
|
|
}
|
|
|
|
public async Task<bool> CheckIfAccessible(string host)
|
|
{
|
|
return await SendEmailWithGet(ApiUrl + "/api/email/reachable?host=" + host);
|
|
}
|
|
|
|
public async Task SendMigrationEmail(EmailMigrationDto data)
|
|
{
|
|
await SendEmailWithPost(ApiUrl + "/api/email/email-migration", data);
|
|
}
|
|
|
|
private static async Task<bool> SendEmailWithGet(string url)
|
|
{
|
|
try
|
|
{
|
|
var response = await (url)
|
|
.WithHeader("Accept", "application/json")
|
|
.WithHeader("User-Agent", "Kavita")
|
|
.WithHeader("x-api-key", "MsnvA2DfQqxSK5jh")
|
|
.WithHeader("x-kavita-version", BuildInfo.Version)
|
|
.WithHeader("Content-Type", "application/json")
|
|
.WithTimeout(TimeSpan.FromSeconds(30))
|
|
.GetStringAsync();
|
|
|
|
if (!string.IsNullOrEmpty(response) && bool.Parse(response))
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
catch (Exception)
|
|
{
|
|
return false;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
|
|
private static async Task<bool> SendEmailWithPost(string url, object data)
|
|
{
|
|
try
|
|
{
|
|
var response = await (url)
|
|
.WithHeader("Accept", "application/json")
|
|
.WithHeader("User-Agent", "Kavita")
|
|
.WithHeader("x-api-key", "MsnvA2DfQqxSK5jh")
|
|
.WithHeader("x-kavita-version", BuildInfo.Version)
|
|
.WithHeader("Content-Type", "application/json")
|
|
.WithTimeout(TimeSpan.FromSeconds(30))
|
|
.PostJsonAsync(data);
|
|
|
|
if (response.StatusCode != StatusCodes.Status200OK)
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
catch (Exception)
|
|
{
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
}
|