Add ActivationResult model

infoshareacademy · Jun 14, 2024 · 026eb47 · 026eb47
1 parent b708ad6
commit 026eb47
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/TutorLizard.Web/Controllers/AccountController.cs b/TutorLizard.Web/Controllers/AccountController.cs
@@ -131,9 +131,9 @@ private string GenerateActivationCode()
     [HttpGet]
     public async Task<IActionResult> ActivateAccount(string activationCode)
     {
-        bool isActivated = await _userAuthenticationService.ActivateUserAsync(activationCode);
+        var result = await _userAuthenticationService.ActivateUserAsync(activationCode);
 
-        if (isActivated)
+        if (result.IsActivated)
         {
             _uiMessagesService.ShowSuccessMessage("Atywacja udana.");
             return View("ActivateAccount");

diff --git a/TutorLizard.Web/Interfaces/Services/IUserAuthenticationService.cs b/TutorLizard.Web/Interfaces/Services/IUserAuthenticationService.cs
@@ -1,4 +1,5 @@
 using TutorLizard.BusinessLogic.Enums;
+using TutorLizard.Web.Models;
 
 namespace TutorLizard.BusinessLogic.Interfaces.Services;
 
@@ -9,7 +10,7 @@ public interface IUserAuthenticationService
     public Task<bool> LogInAsync(string username, string password);
     public Task LogOutAsync();
     public Task<bool> RegisterUser(string username, UserType type, string email, string password, string activationCode);
-    Task<bool> ActivateUserAsync(string activationCode);
+    Task<ActivationResult> ActivateUserAsync(string activationCode);
     Task<bool> IsUserActive(string userName);
     void SendActivationEmail(string email, string activationCode);
 }
diff --git a/TutorLizard.Web/Models/ActivationResult.cs b/TutorLizard.Web/Models/ActivationResult.cs
@@ -0,0 +1,8 @@
+namespace TutorLizard.Web.Models
+{
+    public class ActivationResult
+    {
+        public bool IsActivated { get; set; }
+        public string ActivationCode { get; set; }
+    }
+}
diff --git a/TutorLizard.Web/Services/UserAuthenticationService.cs b/TutorLizard.Web/Services/UserAuthenticationService.cs
@@ -126,7 +126,7 @@ public void SendActivationEmail(string userEmail, string activationCode)
         }
     }
 
-    public async Task<bool> ActivateUserAsync(string activationCode)
+    public async Task<ActivationResult> ActivateUserAsync(string activationCode)
     {
         var user = await _dbContext.Users
             .FirstOrDefaultAsync(u => u.ActivationCode == activationCode && u.IsActive == false);
@@ -136,9 +136,17 @@ public async Task<bool> ActivateUserAsync(string activationCode)
             user.IsActive = true;
             user.ActivationCode = "DEACTIVATED";
             await _dbContext.SaveChangesAsync();
-            return true;
+            return new ActivationResult
+            {
+                IsActivated = true,
+                ActivationCode = activationCode
+            };
         }
-        return false;
+        return new ActivationResult
+        {
+            IsActivated = false,
+            ActivationCode = activationCode
+        };
     }