108536366: Implement register flow

Includes validation for gov.uk email address, mobile number with +44, password at least 10 char.
Form validation errors will be added to template in a later story.
User is created when form validates.
This commit is contained in:
Rebecca Law
2015-12-01 13:23:54 +00:00
parent 5879e59f34
commit 64d2cbb927
8 changed files with 120 additions and 28 deletions

View File

@@ -3,4 +3,4 @@ from flask import Blueprint
main = Blueprint('main', __name__)
from app.main.views import index, sign_in
from app.main.views import index, sign_in, register

View File

@@ -6,4 +6,5 @@ def hashpw(password):
def checkpw(password, hashed_password):
# If salt is invalid throws a 500 should add try/catch here
return check_password_hash(hashed_password, password)

View File

@@ -1,6 +1,6 @@
from flask_wtf import Form
from wtforms import StringField, PasswordField
from wtforms.validators import DataRequired, Email, Length
from wtforms.validators import DataRequired, Email, Length, Regexp
class LoginForm(Form):
@@ -12,3 +12,24 @@ class LoginForm(Form):
password = PasswordField('Password', validators=[
DataRequired(message='Please enter your password')
])
gov_uk_email = "(^[^@^\\s]+@[^@^\\.^\\s]+(\\.[^@^\\.^\\s]*)*.gov.uk)"
mobile_number = "^\\+44[\\d]{10}$"
class RegisterUserForm(Form):
name = StringField('Name',
validators=[DataRequired(message='Name can not be empty')])
email_address = StringField('Email address', validators=[
Length(min=5, max=255),
DataRequired(message='Email cannot be empty'),
Email(message='Please enter a valid email address'),
Regexp(regex=gov_uk_email, message='Please enter a gov.uk email address')
])
mobile_number = StringField('Mobile phone number',
validators=[DataRequired(message='Please enter your mobile number'),
Regexp(regex=mobile_number, message='Please enter a +44 mobile number')])
password = PasswordField('Password',
validators=[DataRequired(message='Please enter your password'),
Length(10, 255, message='Password must be at least 10 characters')])

View File

@@ -14,11 +14,6 @@ def govuk():
return render_template('govuk_template.html')
@main.route("/register")
def register():
return render_template('register.html')
@main.route("/register-from-invite")
@login_required
def registerfrominvite():

View File

@@ -0,0 +1,33 @@
from datetime import datetime
from flask import render_template, redirect, jsonify
from app.main import main
from app.main.dao import users_dao
from app.main.forms import RegisterUserForm
from app.models import User
@main.route("/register", methods=['GET'])
def render_register():
return render_template('register.html', form=RegisterUserForm())
@main.route('/register', methods=['POST'])
def process_register():
form = RegisterUserForm()
if form.validate_on_submit():
user = User(name=form.name.data,
email_address=form.email_address.data,
mobile_number=form.mobile_number.data,
password=form.password.data,
created_at=datetime.now(),
role_id=1)
try:
users_dao.insert_user(user)
return redirect('/two-factor')
except Exception as e:
return jsonify(database_error=e.message), 400
else:
return jsonify(form.errors), 400