make User.password nullable, add SocialAuth model
This commit is contained in:
parent
e90c8b5e0a
commit
7f70dd1678
|
@ -103,7 +103,7 @@ class User(db.Model, ModelMixin, UserMixin):
|
||||||
__tablename__ = "users"
|
__tablename__ = "users"
|
||||||
email = db.Column(db.String(256), unique=True, nullable=False)
|
email = db.Column(db.String(256), unique=True, nullable=False)
|
||||||
salt = db.Column(db.String(128), nullable=False)
|
salt = db.Column(db.String(128), nullable=False)
|
||||||
password = db.Column(db.String(128), nullable=False)
|
password = db.Column(db.String(128), nullable=True)
|
||||||
name = db.Column(db.String(128), nullable=False)
|
name = db.Column(db.String(128), nullable=False)
|
||||||
is_admin = db.Column(db.Boolean, nullable=False, default=False)
|
is_admin = db.Column(db.Boolean, nullable=False, default=False)
|
||||||
alias_generator = db.Column(
|
alias_generator = db.Column(
|
||||||
|
@ -156,12 +156,9 @@ class User(db.Model, ModelMixin, UserMixin):
|
||||||
def create(cls, email, name, password=None, **kwargs):
|
def create(cls, email, name, password=None, **kwargs):
|
||||||
user: User = super(User, cls).create(email=email, name=name, **kwargs)
|
user: User = super(User, cls).create(email=email, name=name, **kwargs)
|
||||||
|
|
||||||
if not password:
|
if password:
|
||||||
# set a random password
|
user.set_password(password)
|
||||||
password = random_string(20)
|
db.session.flush()
|
||||||
|
|
||||||
user.set_password(password)
|
|
||||||
db.session.flush()
|
|
||||||
|
|
||||||
# create a first alias mail to show user how to use when they login
|
# create a first alias mail to show user how to use when they login
|
||||||
GenEmail.create_new(user.id, prefix="my-first-alias")
|
GenEmail.create_new(user.id, prefix="my-first-alias")
|
||||||
|
@ -241,6 +238,8 @@ class User(db.Model, ModelMixin, UserMixin):
|
||||||
self.password = password_hash
|
self.password = password_hash
|
||||||
|
|
||||||
def check_password(self, password) -> bool:
|
def check_password(self, password) -> bool:
|
||||||
|
if not self.password:
|
||||||
|
return False
|
||||||
password_hash = bcrypt.hashpw(password.encode(), self.salt.encode())
|
password_hash = bcrypt.hashpw(password.encode(), self.salt.encode())
|
||||||
return self.password.encode() == password_hash
|
return self.password.encode() == password_hash
|
||||||
|
|
||||||
|
@ -351,6 +350,17 @@ class ResetPasswordCode(db.Model, ModelMixin):
|
||||||
return self.expired < arrow.now()
|
return self.expired < arrow.now()
|
||||||
|
|
||||||
|
|
||||||
|
class SocialAuth(db.Model, ModelMixin):
|
||||||
|
"""Store how user authenticates with social login"""
|
||||||
|
|
||||||
|
user_id = db.Column(db.ForeignKey(User.id, ondelete="cascade"), nullable=False)
|
||||||
|
|
||||||
|
# name of the social login used, could be facebook, google or github
|
||||||
|
social = db.Column(db.String(128), nullable=False)
|
||||||
|
|
||||||
|
__table_args__ = (db.UniqueConstraint("user_id", "social", name="uq_social_auth"),)
|
||||||
|
|
||||||
|
|
||||||
# <<< OAUTH models >>>
|
# <<< OAUTH models >>>
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue