Merge pull request #869 from wklken/fix_login_fail_message

Fix login fail message
TencentBlueKing · Apr 13, 2022 · 15d0f54 · 15d0f54
2 parents 64f4e84 + ac581e8
commit 15d0f54
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/paas2/VERSION b/paas2/VERSION
@@ -1 +1 @@
-2.14.5
+2.14.6
diff --git a/paas2/login/backends/bk.py b/paas2/login/backends/bk.py
@@ -70,7 +70,7 @@ def authenticate(self, username=None, password=None, language="", **kwargs):
             # PASSWORD_EXPIRED = 3210018
             if code in [3210021, 3210018]:
                 raise PasswordNeedReset(message=message, reset_password_url=userinfo.get("reset_password_url"))
-            message = _("调用用户管理接口失败，请联系管理员, 查看登录日志获取错误详情")
+            # message = _("调用用户管理接口失败，请联系管理员, 查看登录日志获取错误详情")
             raise AuthenticationError(message=message, redirect_to=userinfo.get("redirect_to"))
 
         # here we got the userinfo, but the language is not update yet(async in signal)

diff --git a/paas2/release.md b/paas2/release.md
@@ -1,5 +1,8 @@
 Release Log
 ===============================
+# 2.14.6
+    - bugfix: login show error message from bk-user
+
 # 2.14.5
     - bugfix: login password wrong 500
     - update: login reset password if it's an initial password or password expired