Unlock mail not sent 2022 1

backend/Origam.Security.Common/AccountMailSender.cs

@@ -141,7 +141,7 @@ public class AccountMailSender
         }
 
         public bool SendUserUnlockingNotification(string username, string email,
-            string languageId, string firstNameAndName, string userMail)
+            string languageId, string firstNameAndName)
         {
             string userLangIETF = ResolveIetfTagFromOrigamLanguageId(languageId);
             // build template replacements
@@ -152,20 +152,14 @@ public class AccountMailSender
                     new KeyValuePair<string, string>("<%FirstNameAndName%>",
                         firstNameAndName)
                 };
-            // resolve recipient email
-            string resultEmail = email;
-            if (resultEmail == null)
-            {
-                resultEmail = userMail;
-            }
 
             MailMessage userUnlockNotificationMail;
             using (LanguageSwitcher langSwitcher = new LanguageSwitcher(
                 userLangIETF))
             {
                 try
                 {
-                    userUnlockNotificationMail = GenerateMail(resultEmail,
+                    userUnlockNotificationMail = GenerateMail(email,
                         fromAddress, userUnlockNotificationBodyFilename,
                         Resources.UserUnlockNotificationTemplate,
                         userUnlockNotificationSubject, userLangIETF, replacements);
@@ -176,7 +170,7 @@ public class AccountMailSender
                     {
                         log.ErrorFormat("Unlocking user: Failed to generate a mail"
                                         + " for a user `{0}' to `{1}': {2}"
-                            , username, resultEmail, ex);
+                            , username, email, ex);
                     }
 
                     throw ex;
@@ -193,7 +187,7 @@ public class AccountMailSender
                 {
                     log.ErrorFormat("Unlocking user: Failed to send a mail"
                                     + " for a user `{0}' to `{1}': {2}"
-                        , username, resultEmail, ex);
+                        , username, email, ex);
                 }
 
                 throw new Exception(
@@ -208,7 +202,7 @@ public class AccountMailSender
             {
                 log.DebugFormat("User `{0}' has been unlocked and the"
                                 + " notification mail has been sent to `{1}'.",
-                    username, resultEmail);
+                    username, email);
             }
 
             return true;

backend/Origam.ServerCore/Authorization/CoreManagerAdapter.cs

@@ -100,8 +100,14 @@ public async Task<bool> UnlockUserAsync(string userName)
         {
             var user = await FindByNameAsync(userName);
             if (user == null) { return false; }
-            return (await coreUserManager.SetLockoutEndDateAsync( user, null))
-                .Succeeded;
+
+            Task<IdentityResult> unlockTask = coreUserManager.SetLockoutEndDateAsync( user, null);
+            bool success = (await unlockTask).Succeeded;
+            if (success)
+            {
+                mailService.SendUserUnlockedMessage(user);
+            }
+            return success;
         }
 
         public async Task<InternalIdentityResult> ConfirmEmailAsync(string userId)

backend/Origam.ServerCore/Authorization/IMailService.cs

@@ -30,5 +30,6 @@ public interface IMailService
         void SendPasswordResetToken(IOrigamUser user, string token, int tokenValidityHours);
         void SendNewUserToken(IOrigamUser user, string token);
         void SendMultiFactorAuthCode(IOrigamUser user, string token);
+        void SendUserUnlockedMessage(IOrigamUser user);
     }
 }

backend/Origam.ServerCore/Authorization/MailService.cs

@@ -110,5 +110,13 @@ public void SendMultiFactorAuthCode(IOrigamUser user, string token)
                 email: user.Email,
                 code: token);
         }
+        public void SendUserUnlockedMessage(IOrigamUser user)
+        {
+            mailSender.SendUserUnlockingNotification(
+                username: user.UserName,
+                email: user.Email,
+                firstNameAndName: user.FirstName + " " + user.Name,
+                languageId: user.LanguageId.ToString());
+        }
     }
 }