Add TenantId to ResetPasswordDto

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/ResetPasswordDto.cs

@@ -8,6 +8,8 @@ namespace Volo.Abp.Account
     {
         public Guid UserId { get; set; }
 
+        public Guid? TenantId { get; set; }
+
         [Required]
         public string ResetToken { get; set; }
 

modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs

@@ -62,16 +62,19 @@ namespace Volo.Abp.Account
 
         public virtual async Task ResetPasswordAsync(ResetPasswordDto input)
         {
-            await IdentityOptions.SetAsync();
+            using (CurrentTenant.Change(input.TenantId))
+            {
+                await IdentityOptions.SetAsync();
 
-            var user = await UserManager.GetByIdAsync(input.UserId);
+                var user = await UserManager.GetByIdAsync(input.UserId);
-            (await UserManager.ResetPasswordAsync(user, input.ResetToken, input.Password)).CheckErrors();
+                (await UserManager.ResetPasswordAsync(user, input.ResetToken, input.Password)).CheckErrors();
 
-            await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext
+                await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext
-            {
+                {
-                Identity = IdentitySecurityLogIdentityConsts.Identity,
+                    Identity = IdentitySecurityLogIdentityConsts.Identity,
-                Action = IdentitySecurityLogActionConsts.ChangePassword
+                    Action = IdentitySecurityLogActionConsts.ChangePassword
-            });
+                });
+            }
         }
 
         protected virtual async Task<IdentityUser> GetUserByEmail(string email)

modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml.cs

@@ -67,17 +67,15 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             try
             {
-                using (CurrentTenant.Change(TenantId))
+                await AccountAppService.ResetPasswordAsync(
-                {
+                    new ResetPasswordDto
-                    await AccountAppService.ResetPasswordAsync(
+                    {
-                        new ResetPasswordDto
+                        UserId = UserId,
-                        {
+                        ResetToken = ResetToken,
-                            UserId = UserId,
+                        Password = Password,
-                            ResetToken = ResetToken,
+                        TenantId = TenantId
-                            Password = Password
+                    }
-                        }
+                );
-                    );
-                }
             }
             catch (AbpIdentityResultException e)
             {