Merge pull request #22096 from abpframework/auto-merge/rel-9-0/3460

Merge branch rel-9.1 with rel-9.0

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs

@@ -128,21 +128,29 @@ public class AbpResourceOwnerPasswordValidator : IResourceOwnerPasswordValidator
                 }
                 else if (result.IsNotAllowed)
                 {
-                    Logger.LogInformation("Authentication failed for username: {username}, reason: not allowed", context.UserName);
-
-                    if (user.ShouldChangePasswordOnNextLogin)
+                    if (!await UserManager.CheckPasswordAsync(user, context.Password))
                     {
-                        await HandleShouldChangePasswordOnNextLoginAsync(context, user, context.Password);
-                        return;
+                        Logger.LogInformation("Authentication failed for username: {username}, reason: invalid credentials", context.UserName);
+                        errorDescription = Localizer["InvalidUserNameOrPassword"];
                     }
-
-                    if (await UserManager.ShouldPeriodicallyChangePasswordAsync(user))
+                    else
                     {
-                        await HandlePeriodicallyChangePasswordAsync(context, user, context.Password);
-                        return;
-                    }
+                        Logger.LogInformation("Authentication failed for username: {username}, reason: not allowed", context.UserName);
 
-                    errorDescription = Localizer["LoginIsNotAllowed"];
+                        if (user.ShouldChangePasswordOnNextLogin)
+                        {
+                            await HandleShouldChangePasswordOnNextLoginAsync(context, user, context.Password);
+                            return;
+                        }
+
+                        if (await UserManager.ShouldPeriodicallyChangePasswordAsync(user))
+                        {
+                            await HandlePeriodicallyChangePasswordAsync(context, user, context.Password);
+                            return;
+                        }
+
+                        errorDescription = Localizer["LoginIsNotAllowed"];
+                    }
                 }
                 else
                 {

modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs

@@ -115,24 +115,32 @@ public partial class TokenController
                     }
                     else if (result.IsNotAllowed)
                     {
-                        Logger.LogInformation("Authentication failed for username: {username}, reason: not allowed", request.Username);
-
-                        if (user.ShouldChangePasswordOnNextLogin)
+                        if (!await UserManager.CheckPasswordAsync(user, request.Password))
                         {
-                            return await HandleShouldChangePasswordOnNextLoginAsync(request, user, request.Password);
+                            Logger.LogInformation("Authentication failed for username: {username}, reason: invalid credentials", request.Username);
+                            errorDescription = "Invalid username or password!";
                         }
-
-                        if (await UserManager.ShouldPeriodicallyChangePasswordAsync(user))
+                        else
                         {
-                            return await HandlePeriodicallyChangePasswordAsync(request, user, request.Password);
-                        }
+                            Logger.LogInformation("Authentication failed for username: {username}, reason: not allowed", request.Username);
 
-                        if (user.IsActive)
-                        {
-                            return await HandleConfirmUserAsync(request, user);
-                        }
+                            if (user.ShouldChangePasswordOnNextLogin)
+                            {
+                                return await HandleShouldChangePasswordOnNextLoginAsync(request, user, request.Password);
+                            }
 
-                        errorDescription = "You are not allowed to login! Your account is inactive.";
+                            if (await UserManager.ShouldPeriodicallyChangePasswordAsync(user))
+                            {
+                                return await HandlePeriodicallyChangePasswordAsync(request, user, request.Password);
+                            }
+
+                            if (user.IsActive)
+                            {
+                                return await HandleConfirmUserAsync(request, user);
+                            }
+
+                            errorDescription = "You are not allowed to login! Your account is inactive.";
+                        }
                     }
                     else
                     {