diff --git a/ereuse_devicehub/forms.py b/ereuse_devicehub/forms.py new file mode 100644 index 00000000..5c2b8d15 --- /dev/null +++ b/ereuse_devicehub/forms.py @@ -0,0 +1,62 @@ +from flask_wtf import FlaskForm +from werkzeug.security import generate_password_hash +from wtforms import EmailField, PasswordField, validators + +from ereuse_devicehub.resources.user.models import User + + +class LoginForm(FlaskForm): + email = EmailField('Email Address', [validators.Length(min=6, max=35)]) + password = PasswordField('Password', [ + validators.DataRequired(), + ]) + + error_messages = { + 'invalid_login': ( + "Please enter a correct email and password. Note that both " + "fields may be case-sensitive." + ), + 'inactive': "This account is inactive.", + } + + def validate(self, extra_validators=None): + is_valid = super().validate(extra_validators) + + if not is_valid: + return False + + email = self.email.data + password = self.password.data + self.user_cache = self.authenticate(email, password) + + if self.user_cache is None: + self.form_errors.append(self.error_messages['invalid_login']) + return False + + return self.confirm_login_allowed(self.user_cache) + + def authenticate(self, email, password): + if email is None or password is None: + return + user = User.query.filter_by(email=email).first() + if user is None: + # Run the default password hasher once to reduce the timing + # difference between an existing and a nonexistent user (#20760). + generate_password_hash(password) + else: + if user.check_password(password): + return user + + def confirm_login_allowed(self, user): + """ + Controls whether the given User may log in. This is a policy setting, + independent of end-user authentication. This default behavior is to + allow login by active users, and reject login by inactive users. + If the given user cannot log in, this method should raise a + ``ValidationError``. + If the given user may log in, this method should return None. + """ + if not user.is_active: + self.form_errors.append(self.error_messages['inactive']) + + return user.is_active diff --git a/ereuse_devicehub/resources/user/models.py b/ereuse_devicehub/resources/user/models.py index 79525286..c9d3fef7 100644 --- a/ereuse_devicehub/resources/user/models.py +++ b/ereuse_devicehub/resources/user/models.py @@ -1,7 +1,7 @@ from uuid import uuid4 -from citext import CIText from flask import current_app as app +from flask_login import UserMixin from sqlalchemy import Column, Boolean, BigInteger, Sequence from sqlalchemy.dialects.postgresql import UUID from sqlalchemy_utils import EmailType, PasswordType @@ -13,7 +13,7 @@ from ereuse_devicehub.resources.models import STR_SIZE, Thing from ereuse_devicehub.resources.enums import SessionType -class User(Thing): +class User(UserMixin, Thing): __table_args__ = {'schema': 'common'} id = Column(UUID(as_uuid=True), default=uuid4, primary_key=True) email = Column(EmailType, nullable=False, unique=True) @@ -66,6 +66,15 @@ class User(Thing): return return self.email.split('@')[0].split('_')[1] + @property + def is_active(self): + """Alias because flask-login expects `is_active` attribute""" + return self.active + + def check_password(self, password): + # take advantage of SQL Alchemy PasswordType to verify password + return self.password == password + class UserInventory(db.Model): """Relationship between users and their inventories.""" diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html index 5d86efed..b8696521 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html @@ -22,22 +22,30 @@
Enter your username & password to login
+ {% if form.form_errors %} +
+ {% for error in form.form_errors %}
+ {{ error }}
+ {% endfor %}
+