yvachot/FlaskALED
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update: Remove login field

Browse source
This commit is contained in:
Yûki VACHOT 2022-01-05 08:28:40 +01:00
parent af41c64517
commit 0191b6abd1
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend/application/api_functions.py
View file

@ -35,8 +35,7 @@ def db_login(ip, email, password):
hash_pass = hash_password(salt, password) hash_pass = hash_password(salt, password)
user = Users.query\ user = Users.query\
.filter(Users.email == email)\ .filter(Users.email == email, Users.hash_pass == hash_pass)\
.filter(Users.hash_pass == hash_pass)\
.first() .first()
if not user: if not user:
@ -73,7 +72,7 @@ def db_login(ip, email, password):
def db_register(ip, email, login, password, is_admin): def db_register(ip, email, login, password, is_admin):
user = Users.query.filter( user = Users.query.filter(
Users.email == email or Users.login == login Users.email == email
).first() ).first()
if user: if user:
message = f'{email} ({login}) already exist.' message = f'{email} ({login}) already exist.'

10
backend/application/users_model.py
View file

@ -4,16 +4,14 @@ from . import db
class Users(db.Model): class Users(db.Model):
__bind_key__ = 'flaskaled-srv1' __bind_key__ = 'flaskaled-srv1'
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True, autoincrement=True)
email = db.Column(db.String(), nullable=False) email = db.Column(db.String(), nullable=False, unique=True)
login = db.Column(db.String(), nullable=False)
hash_pass = db.Column(db.LargeBinary(), nullable=False) hash_pass = db.Column(db.LargeBinary(), nullable=False)
salt = db.Column(db.LargeBinary(), nullable=False) salt = db.Column(db.LargeBinary(), nullable=False)
is_admin = db.Column(db.Boolean, default=False, 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.email = email
self.login = login
self.hash_pass = hash_pass self.hash_pass = hash_pass
self.salt = salt self.salt = salt
self.is_admin = is_admin self.is_admin = is_admin
@ -22,7 +20,6 @@ class Users(db.Model):
return { return {
'id': self.id, 'id': self.id,
'email': self.email, 'email': self.email,
'login': self.login,
'hash_pass': self.hash_pass, 'hash_pass': self.hash_pass,
'salt': self.salt, 'salt': self.salt,
'is_admin': self.is_admin 'is_admin': self.is_admin
@ -32,7 +29,6 @@ class Users(db.Model):
return { return {
'id': self.id, 'id': self.id,
'email': self.email, 'email': self.email,
'login': self.login,
'is_admin': self.is_admin 'is_admin': self.is_admin
} }

1
backend/init-db1.sql
View file

@ -4,7 +4,6 @@ CREATE TABLE IF NOT EXISTS users
( (
id serial PRIMARY KEY, id serial PRIMARY KEY,
email character varying(320) NOT NULL, email character varying(320) NOT NULL,
login character varying(32) NOT NULL,
hash_pass bytea NOT NULL, hash_pass bytea NOT NULL,
salt bytea NOT NULL, salt bytea NOT NULL,
is_admin boolean NOT NULL DEFAULT FALSE is_admin boolean NOT NULL DEFAULT FALSE