diff --git a/backend/application/api_functions.py b/backend/application/api_functions.py index 7d673ce..742b5b6 100644 --- a/backend/application/api_functions.py +++ b/backend/application/api_functions.py @@ -35,8 +35,7 @@ def db_login(ip, email, password): hash_pass = hash_password(salt, password) user = Users.query\ - .filter(Users.email == email)\ - .filter(Users.hash_pass == hash_pass)\ + .filter(Users.email == email, Users.hash_pass == hash_pass)\ .first() if not user: @@ -73,7 +72,7 @@ def db_login(ip, email, password): def db_register(ip, email, login, password, is_admin): user = Users.query.filter( - Users.email == email or Users.login == login + Users.email == email ).first() if user: message = f'{email} ({login}) already exist.' diff --git a/backend/application/users_model.py b/backend/application/users_model.py index e90e778..15bac2a 100644 --- a/backend/application/users_model.py +++ b/backend/application/users_model.py @@ -4,16 +4,14 @@ from . import db class Users(db.Model): __bind_key__ = 'flaskaled-srv1' - id = db.Column(db.Integer, primary_key=True) - email = db.Column(db.String(), nullable=False) - login = db.Column(db.String(), nullable=False) + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + email = db.Column(db.String(), nullable=False, unique=True) hash_pass = db.Column(db.LargeBinary(), nullable=False) salt = db.Column(db.LargeBinary(), nullable=False) is_admin = db.Column(db.Boolean, default=False, nullable=False) - def __init__(self, email, login, hash_pass, salt, is_admin): + def __init__(self, email, hash_pass, salt, is_admin): self.email = email - self.login = login self.hash_pass = hash_pass self.salt = salt self.is_admin = is_admin @@ -22,7 +20,6 @@ class Users(db.Model): return { 'id': self.id, 'email': self.email, - 'login': self.login, 'hash_pass': self.hash_pass, 'salt': self.salt, 'is_admin': self.is_admin @@ -32,7 +29,6 @@ class Users(db.Model): return { 'id': self.id, 'email': self.email, - 'login': self.login, 'is_admin': self.is_admin } diff --git a/backend/init-db1.sql b/backend/init-db1.sql index 06f6d2e..d3b2426 100644 --- a/backend/init-db1.sql +++ b/backend/init-db1.sql @@ -4,7 +4,6 @@ CREATE TABLE IF NOT EXISTS users ( id serial PRIMARY KEY, email character varying(320) NOT NULL, - login character varying(32) NOT NULL, hash_pass bytea NOT NULL, salt bytea NOT NULL, is_admin boolean NOT NULL DEFAULT FALSE