From c2fcc6b9d3dc0fa0d255430fe9dd146710f37874 Mon Sep 17 00:00:00 2001 From: Andrei Date: Thu, 20 Oct 2022 10:28:10 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=20=D1=81=D1=80=D0=B0=D0=B2=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=BE=20=D1=85=D0=B5=D1=88=D1=83=20=D0=BF=D0=B0=D1=80?= =?UTF-8?q?=D0=BE=D0=BB=D1=8F=20=D0=B2=20=D1=84=D1=83=D0=BD=D0=BA=D1=86?= =?UTF-8?q?=D0=B8=D1=8E=20check=5Fauth?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/users.py | 4 ++-- main.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/data/users.py b/data/users.py index 9909c93..40c1380 100644 --- a/data/users.py +++ b/data/users.py @@ -29,8 +29,8 @@ class User(SqlAlchemyBase, UserMixin): def check_password(self, password): return check_password_hash(self.password, password) - def check_hash_password(self, hash_password): - return True if self.password == hash_password else False + def check_hash_password(self, password): + return True if password == self.password else False def set_password(self, password): self.password = generate_password_hash(password) diff --git a/main.py b/main.py index 59f21f5..9f013ac 100644 --- a/main.py +++ b/main.py @@ -742,12 +742,13 @@ def check_auth(): session = db_session.create_session() user = session.query(User).filter(User.email == email).first() if user: - if user.check_password(password) or user.check_hash_password(password): + if user.check_password(password) or user.check_hash_password(password): return make_response(jsonify({ - 'key': '', + 'key': open('key.txt', 'r', encoding='utf-8').read(), 'name': user.name, 'surname': user.surname, - 'login': user.login + 'login': user.login, + 'hash': user.password }), 200) else: return abort(403)