add dont create OTP when email is already confirmed

emrecoskun705 · Sep 16, 2023 · 3b4de0e · 3b4de0e
1 parent b8361f8
commit 3b4de0e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/Unitagram.Application/Exceptions/EmailAlreadyConfirmedException.cs b/Unitagram.Application/Exceptions/EmailAlreadyConfirmedException.cs
@@ -0,0 +1,9 @@
+namespace Unitagram.Application.Exceptions;
+
+public class EmailAlreadyConfirmedException : Exception
+{
+    public EmailAlreadyConfirmedException() : base("Email is already confirmed.")
+    {
+
+    }
+}
diff --git a/Unitagram.Identity/Services/AuthService.cs b/Unitagram.Identity/Services/AuthService.cs
@@ -228,6 +228,12 @@ public async Task<Result<GenerateOtpResponse>> GenerateOtpEmail(GenerateOtpReque
             return new Result<GenerateOtpResponse>(exception);
         }
 
+        if (user.EmailConfirmed)
+        {
+            var exception = new EmailAlreadyConfirmedException();
+            return new Result<GenerateOtpResponse>(exception);
+        }
+
         var generateOtpResult = await _verificationService.GenerateAsync(user.Id);
 
         var result = generateOtpResult.Match<Result<GenerateOtpResponse>>(

diff --git a/Unitagram.WebAPI/Controllers/ControllerExtensions.cs b/Unitagram.WebAPI/Controllers/ControllerExtensions.cs
@@ -37,7 +37,8 @@ private static ActionResult<TResult> HandleException<TResult>(Exception exceptio
             { typeof(InvalidAccountCredentialsException), StatusCodes.Status400BadRequest },
             { typeof(AccountLockoutException), StatusCodes.Status403Forbidden }, 
             { typeof(NotFoundException), StatusCodes.Status404NotFound },
-            { typeof(UserNotFoundException), StatusCodes.Status404NotFound }
+            { typeof(UserNotFoundException), StatusCodes.Status404NotFound },
+            { typeof(EmailAlreadyConfirmedException), StatusCodes.Status400BadRequest },
         };
 
         // Get the status code from the dictionary, defaulting to 500 if not found