diff --git a/API/Controllers/AccountController.cs b/API/Controllers/AccountController.cs
index c96bffb5f..6df430e3f 100644
--- a/API/Controllers/AccountController.cs
+++ b/API/Controllers/AccountController.cs
@@ -11,6 +11,7 @@ using API.DTOs;
using API.DTOs.Account;
using API.DTOs.Email;
using API.Entities;
+using API.Entities.Enums;
using API.Errors;
using API.Extensions;
using API.Services;
@@ -509,7 +510,8 @@ namespace API.Controllers
await _emailService.SendPasswordResetEmail(new PasswordResetEmailDto()
{
EmailAddress = user.Email,
- ServerConfirmationLink = emailLink
+ ServerConfirmationLink = emailLink,
+ InstallId = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallId)).Value
});
return Ok("Email sent");
}
@@ -560,7 +562,8 @@ namespace API.Controllers
{
EmailAddress = user.Email,
Username = user.UserName,
- ServerConfirmationLink = emailLink
+ ServerConfirmationLink = emailLink,
+ InstallId = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallId)).Value
});
diff --git a/API/DTOs/Email/ConfirmationEmailDto.cs b/API/DTOs/Email/ConfirmationEmailDto.cs
index 1754ece22..a64d92f91 100644
--- a/API/DTOs/Email/ConfirmationEmailDto.cs
+++ b/API/DTOs/Email/ConfirmationEmailDto.cs
@@ -5,4 +5,8 @@ public class ConfirmationEmailDto
public string InvitingUser { get; init; }
public string EmailAddress { get; init; }
public string ServerConfirmationLink { get; init; }
+ ///
+ /// InstallId of this Kavita Instance
+ ///
+ public string InstallId { get; init; }
}
diff --git a/API/DTOs/Email/EmailMigrationDto.cs b/API/DTOs/Email/EmailMigrationDto.cs
index 0da3bd5eb..e7a941405 100644
--- a/API/DTOs/Email/EmailMigrationDto.cs
+++ b/API/DTOs/Email/EmailMigrationDto.cs
@@ -5,4 +5,8 @@ public class EmailMigrationDto
public string EmailAddress { get; init; }
public string Username { get; init; }
public string ServerConfirmationLink { get; init; }
+ ///
+ /// InstallId of this Kavita Instance
+ ///
+ public string InstallId { get; init; }
}
diff --git a/API/DTOs/Email/PasswordResetEmailDto.cs b/API/DTOs/Email/PasswordResetEmailDto.cs
index c52060583..503a9c5e3 100644
--- a/API/DTOs/Email/PasswordResetEmailDto.cs
+++ b/API/DTOs/Email/PasswordResetEmailDto.cs
@@ -4,4 +4,8 @@ public class PasswordResetEmailDto
{
public string EmailAddress { get; init; }
public string ServerConfirmationLink { get; init; }
+ ///
+ /// InstallId of this Kavita Instance
+ ///
+ public string InstallId { get; init; }
}
diff --git a/API/Services/EmailService.cs b/API/Services/EmailService.cs
index fe2aa64a6..2aa19b34b 100644
--- a/API/Services/EmailService.cs
+++ b/API/Services/EmailService.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
using API.Data;
using API.DTOs.Email;
using API.Entities.Enums;
+using API.Services.Tasks;
using Flurl.Http;
using Kavita.Common.EnvironmentInfo;
using Kavita.Common.Helpers;