From f034d9ca871cf01e3619d150f6be4f24738ada3f Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 2 Jan 2025 16:53:54 +0800
Subject: [PATCH] =?UTF-8?q?MFA=20=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Management/UserService.cs         | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 449829c04..6e09198a3 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -735,17 +735,17 @@ namespace IRaCIS.Core.Application.Service
         /// <summary>
         /// 发送MFA 验证邮件
         /// </summary>
-        /// <param name="userId"></param>
+        /// <param name="identityUserId"></param>
         /// <param name="mfaType"></param>
         /// <returns></returns>
         [AllowAnonymous]
-        public async Task<IResponseOutput> SendMFAEmail(Guid userId, UserMFAType mfaType)
+        public async Task<IResponseOutput> SendMFAEmail(Guid identityUserId, UserMFAType mfaType)
         {
-            var userInfo = await _identityUserRepository.Where(u => u.Id == userId).Select(t => new { t.FullName, t.EMail }).FirstOrDefaultAsync();
+            var userInfo = await _identityUserRepository.Where(u => u.Id == identityUserId).Select(t => new { t.FullName, t.EMail }).FirstOrDefaultAsync();
 
             int verificationCode = new Random().Next(100000, 1000000);
 
-            await _mailVerificationService.SenMFAVerifyEmail(userId, userInfo.FullName, userInfo.EMail, verificationCode, (UserMFAType)mfaType);
+            await _mailVerificationService.SenMFAVerifyEmail(identityUserId, userInfo.FullName, userInfo.EMail, verificationCode, (UserMFAType)mfaType);
 
             var hiddenEmail = IRCEmailPasswordHelper.MaskEmail(userInfo.EMail);
             return ResponseOutput.Ok(hiddenEmail);
@@ -754,20 +754,19 @@ namespace IRaCIS.Core.Application.Service
         /// <summary>
         /// 验证MFA 邮件
         /// </summary>
-        /// <param name="userId"></param>
+        /// <param name="identityUserId"></param>
         /// <param name="Code"></param>
         /// <returns></returns>
         /// <exception cref="BusinessValidationFailedException"></exception>
-        [AllowAnonymous]
-        public async Task<IResponseOutput> VerifyMFACodeAsync(Guid userId, string Code)
+        public async Task<IResponseOutput> VerifyMFACodeAsync(Guid identityUserId, string Code)
         {
-            var verificationRecord = await _verificationCodeRepository.Where(t => t.UserId == userId && t.Code == Code && t.CodeType == VerifyType.Email).OrderByDescending(x => x.ExpirationTime).FirstOrDefaultAsync();
+            var verificationRecord = await _verificationCodeRepository.Where(t => t.UserId == identityUserId && t.Code == Code && t.CodeType == VerifyType.Email).OrderByDescending(x => x.ExpirationTime).FirstOrDefaultAsync();
             VerifyEmialGetDoctorInfoOutDto result = new VerifyEmialGetDoctorInfoOutDto();
 
             //检查数据库是否存在该验证码
             if (verificationRecord == null)
             {
-                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = userId, OptUserId = userId, OptType = UserOptType.MFALoginFail }, true);
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.MFALoginFail }, true);
                 //---验证码错误。
                 throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_WrongVerificationCode"]);
             }
@@ -776,7 +775,7 @@ namespace IRaCIS.Core.Application.Service
                 //检查验证码是否失效
                 if (verificationRecord.ExpirationTime < DateTime.Now)
                 {
-                    await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = userId, OptUserId = userId, OptType = UserOptType.MFALoginFail }, true);
+                    await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.MFALoginFail }, true);
                     //---验证码已经过期。
                     throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_ExpiredVerificationCode"]);
 
@@ -788,7 +787,7 @@ namespace IRaCIS.Core.Application.Service
 
                     //删除验证码历史记录
                     await _verificationCodeRepository.BatchDeleteNoTrackingAsync(t => t.Id == verificationRecord.Id);
-                    await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = userId, OptUserId = userId, OptType = UserOptType.MFALogin }, true);
+                    await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.MFALogin }, true);
 
                 }
             }