Merge pull request #378 from anoadragon453/anoa/confusing_2fa

Make 2FA error message clearer
2019-11-08 15:18:09 +02:00
parent 0e56ab131e b854119445
commit 87d9477bc7
1 changed files with 6 additions and 2 deletions
@@ -167,9 +167,13 @@ class AuthAPI(abc.ABC):
                        "next": enter_password,
                        "action": "Login (password entry)",
                    }
+                message = (
+                    "Code accepted, but you have 2-factor "
+                    "authentication enabled. Please enter your password."
+                )
                return self.get_login_response(
-                    mxid=user.mxid, state="password", status=202,
-                    message="Code accepted, but you have 2-factor authentication is enabled.")
+                    mxid=user.mxid, state="password", status=202, message=message
+                )
            return None
        except Exception:
            self.log.exception("Error sending phone code")