mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-02-05 02:42:26 -05:00
Merge branch 'master' of github.com:alphagov/notifications-admin
This commit is contained in:
Martyn Inglis
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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')])
|
||||
|
||||
@@ -14,12 +14,6 @@ def govuk():
|
||||
return render_template('govuk_template.html')
|
||||
|
||||
|
||||
@main.route("/register")
|
||||
@login_required
|
||||
def register():
|
||||
return render_template('register.html')
|
||||
|
||||
|
||||
@main.route("/register-from-invite")
|
||||
@login_required
|
||||
def registerfrominvite():
|
||||
@@ -38,6 +32,11 @@ def verifymobile():
|
||||
return render_template('verify-mobile.html')
|
||||
|
||||
|
||||
@main.route("/text-not-received-2")
|
||||
def textnotreceived2():
|
||||
return render_template('text-not-received-2.html')
|
||||
|
||||
|
||||
@main.route("/dashboard")
|
||||
@login_required
|
||||
def dashboard():
|
||||
|
||||
33
app/main/views/register.py
Normal file
33
app/main/views/register.py
Normal 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='encountered database error'), 400
|
||||
else:
|
||||
return jsonify(form.errors), 400
|
||||
@@ -14,27 +14,29 @@ GOV.UK Notify | Create an account
|
||||
|
||||
<p>You need to have access to your email account and a mobile phone to register.</p>
|
||||
|
||||
<p>
|
||||
<label class="form-label" for="name-f1">Name</label>
|
||||
<input class="form-control-2-3" id="name-f1" type="text">
|
||||
</p>
|
||||
<p>
|
||||
<label class="form-label" for="email">Email address</label>
|
||||
<input class="form-control-2-3" id="email" type="text"><br>
|
||||
<span class="font-xsmall">Your email address must end in .gov.uk</span>
|
||||
</p>
|
||||
<p>
|
||||
<label class="form-label" for="mobile">Mobile phone number</label>
|
||||
<input class="form-control-1-4" id="mobile" type="text">
|
||||
</p>
|
||||
<p>
|
||||
<label class="form-label" for="password">Password</label>
|
||||
<input class="form-control-1-4" id="password" type="password">
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<a class="button" href="verify" role="button">Continue</a>
|
||||
</p>
|
||||
<form autocomplete="off" action="" method="post">
|
||||
{{ form.hidden_tag() }}
|
||||
<p>
|
||||
<label class="form-label"> {{ form.name.label }} </label>
|
||||
{{ form.name(class="form-control-2-3", autocomplete="off") }} <br>
|
||||
</p>
|
||||
<p>
|
||||
<label class="form-label">{{ form.email_address.label }} </label>
|
||||
{{ form.email_address(class="form-control-2-3", autocomplete="off") }} <br>
|
||||
<span class="font-xsmall">Your email address must end in .gov.uk</span>
|
||||
</p>
|
||||
<p>
|
||||
<label class="form-label">{{ form.mobile_number.label }}</label>
|
||||
{{ form.mobile_number(class="form-control-1-4", autocomplete="off") }} <br>
|
||||
</p>
|
||||
<p>
|
||||
<label class="form-label"> {{ form.password.label}} </label>
|
||||
{{ form.password(class="form-control-1-4", autocomplete="off") }} <br>
|
||||
</p>
|
||||
<p>
|
||||
<button class="button" role="button">Continue</button>
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
39
tests/app/main/views/test_register.py
Normal file
39
tests/app/main/views/test_register.py
Normal file
@@ -0,0 +1,39 @@
|
||||
|
||||
|
||||
def test_render_register_returns_template_with_form(notifications_admin, notifications_admin_db):
|
||||
response = notifications_admin.test_client().get('/register')
|
||||
|
||||
assert response.status_code == 200
|
||||
assert 'Create an account' in response.get_data(as_text=True)
|
||||
|
||||
|
||||
def test_process_register_creates_new_user(notifications_admin, notifications_admin_db):
|
||||
response = notifications_admin.test_client().post('/register',
|
||||
data={'name': 'Some One Valid',
|
||||
'email_address': 'someone@example.gov.uk',
|
||||
'mobile_number': '+441231231231',
|
||||
'password': 'validPassword!'})
|
||||
assert response.status_code == 302
|
||||
assert response.location == 'http://localhost/two-factor'
|
||||
|
||||
|
||||
def test_process_register_returns_400_when_mobile_number_is_invalid(notifications_admin, notifications_admin_db):
|
||||
response = notifications_admin.test_client().post('/register',
|
||||
data={'name': 'Bad Mobile',
|
||||
'email_address': 'bad_mobile@example.gov.uk',
|
||||
'mobile_number': 'not good',
|
||||
'password': 'validPassword!'})
|
||||
|
||||
assert response.status_code == 400
|
||||
assert 'Please enter a +44 mobile number' in response.get_data(as_text=True)
|
||||
|
||||
|
||||
def test_should_return_400_when_email_is_not_gov_uk(notifications_admin, notifications_admin_db):
|
||||
response = notifications_admin.test_client().post('/register',
|
||||
data={'name': 'Bad Mobile',
|
||||
'email_address': 'bad_mobile@example.not.right',
|
||||
'mobile_number': '+44123412345',
|
||||
'password': 'validPassword!'})
|
||||
|
||||
assert response.status_code == 400
|
||||
assert 'Please enter a gov.uk email address' in response.get_data(as_text=True)
|
||||
Reference in New Issue
Block a user