From 6174fa616b31df0f9d0fdd569619a24f28d97c69 Mon Sep 17 00:00:00 2001
From: Adiv <asifadiv@gmail.com>
Date: Mon, 8 May 2023 05:46:21 +0100
Subject: [PATCH] one more fixup
---
Controllers/AuthenticationController.cs | 4 ++--
Services/AuthService.cs | 4 ++--
Services/EmailService.cs | 2 +-
appsettings.json | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Controllers/AuthenticationController.cs b/Controllers/AuthenticationController.cs
index b0e8d57..7986363 100644
--- a/Controllers/AuthenticationController.cs
+++ b/Controllers/AuthenticationController.cs
@@ -232,11 +232,11 @@ public class AuthController : BaseAuthController
[HttpPost("ResendConfirmEmail")]
[SwaggerResponse(204)]
[SwaggerResponse(400, Type = typeof(ResponseEnvelope<BadRequestObjectResult>))]
- public async Task<ActionResult> ResendConfirmEmail(string callbackUrl)
+ public async Task<ActionResult> ResendConfirmEmail()
{
try
{
- await _authService.ResendConfirmEmail(UserId, callbackUrl);
+ await _authService.ResendConfirmEmail(UserId);
}
catch (Exception ex)
{
diff --git a/Services/AuthService.cs b/Services/AuthService.cs
index a0ee019..f766974 100644
--- a/Services/AuthService.cs
+++ b/Services/AuthService.cs
@@ -22,7 +22,7 @@ public interface IAuthService
Task SetPassword(SetPasswordRequestDTO request);
Task ChangePassword(int userId, ChangePasswordRequestDTO request);
Task ChangeEmail(int userId, ChangeEmailRequestDTO request);
- Task ResendConfirmEmail(int userId, string callbackUrl);
+ Task ResendConfirmEmail(int userId);
Task ConfirmEmailAddress(int userId, string token);
Task Logout(int userId);
}
@@ -140,7 +140,7 @@ public class AuthService : IAuthService
await _context.SaveChangesAsync();
}
- public async Task ResendConfirmEmail(int userId, string callbackUrl)
+ public async Task ResendConfirmEmail(int userId)
{
var user = await _context.User.FirstOrDefaultAsync(u => u.Id == userId);
if (user?.EmailConfirmationToken == null)
diff --git a/Services/EmailService.cs b/Services/EmailService.cs
index 48e0904..218ccdb 100644
--- a/Services/EmailService.cs
+++ b/Services/EmailService.cs
@@ -31,7 +31,7 @@ public class EmailService : IEmailService
email.From.Add(new MailboxAddress("aa03980", "smtp.gmail.com"));
email.To.Add(new MailboxAddress(emailDTO.Receiver, emailDTO.To));
email.Subject = emailDTO.Subject;
- email.Body = new TextPart(TextFormat.Text) {Text = emailDTO.Body};
+ email.Body = new TextPart(TextFormat.Html) {Text = emailDTO.Body};
using var smtp = new SmtpClient();
try
{
diff --git a/appsettings.json b/appsettings.json
index bc7d0aa..9937840 100644
--- a/appsettings.json
+++ b/appsettings.json
@@ -20,7 +20,7 @@
"Email": "",
"Password": ""
},
- "Group17Website": {
+ "FrontendStrings": {
"BaseUrl": ""
}
}
\ No newline at end of file
--
GitLab