Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-06-23 15:30:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added in InstallId so that Kavita owned Email service can validate if requests are valid or not. (#1036)

Browse Source
This commit is contained in:
Joseph Milazzo 2022-02-05 16:17:51 -08:00 committed by GitHub
parent 5c7cfb8177
commit 98bb6f0b0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
API/Controllers/AccountController.cs
View File

@ -11,6 +11,7 @@ using API.DTOs;
using API.DTOs.Account; using API.DTOs.Account;
using API.DTOs.Email; using API.DTOs.Email;
using API.Entities; using API.Entities;
using API.Entities.Enums;
using API.Errors; using API.Errors;
using API.Extensions; using API.Extensions;
using API.Services; using API.Services;
@ -509,7 +510,8 @@ namespace API.Controllers
await _emailService.SendPasswordResetEmail(new PasswordResetEmailDto() await _emailService.SendPasswordResetEmail(new PasswordResetEmailDto()
{ {
EmailAddress = user.Email, EmailAddress = user.Email,
ServerConfirmationLink = emailLink ServerConfirmationLink = emailLink,
InstallId = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallId)).Value
}); });
return Ok("Email sent"); return Ok("Email sent");
} }
@ -560,7 +562,8 @@ namespace API.Controllers
{ {
EmailAddress = user.Email, EmailAddress = user.Email,
Username = user.UserName, Username = user.UserName,
ServerConfirmationLink = emailLink ServerConfirmationLink = emailLink,
InstallId = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallId)).Value
}); });

4
API/DTOs/Email/ConfirmationEmailDto.cs
View File

@ -5,4 +5,8 @@ public class ConfirmationEmailDto
public string InvitingUser { get; init; } public string InvitingUser { get; init; }
public string EmailAddress { get; init; } public string EmailAddress { get; init; }
public string ServerConfirmationLink { get; init; } public string ServerConfirmationLink { get; init; }
/// <summary>
/// InstallId of this Kavita Instance
/// </summary>
public string InstallId { get; init; }
} }

4
API/DTOs/Email/EmailMigrationDto.cs
View File

@ -5,4 +5,8 @@ public class EmailMigrationDto
public string EmailAddress { get; init; } public string EmailAddress { get; init; }
public string Username { get; init; } public string Username { get; init; }
public string ServerConfirmationLink { get; init; } public string ServerConfirmationLink { get; init; }
/// <summary>
/// InstallId of this Kavita Instance
/// </summary>
public string InstallId { get; init; }
} }

4
API/DTOs/Email/PasswordResetEmailDto.cs
View File

@ -4,4 +4,8 @@ public class PasswordResetEmailDto
{ {
public string EmailAddress { get; init; } public string EmailAddress { get; init; }
public string ServerConfirmationLink { get; init; } public string ServerConfirmationLink { get; init; }
/// <summary>
/// InstallId of this Kavita Instance
/// </summary>
public string InstallId { get; init; }
} }

1
API/Services/EmailService.cs
View File

@ -3,6 +3,7 @@ using System.Threading.Tasks;
using API.Data; using API.Data;
using API.DTOs.Email; using API.DTOs.Email;
using API.Entities.Enums; using API.Entities.Enums;
using API.Services.Tasks;
using Flurl.Http; using Flurl.Http;
using Kavita.Common.EnvironmentInfo; using Kavita.Common.EnvironmentInfo;
using Kavita.Common.Helpers; using Kavita.Common.Helpers;