2016-10-13 17:05:37 +01:00
|
|
|
import json
|
|
|
|
|
|
2019-06-14 12:32:47 +01:00
|
|
|
from flask import (
|
|
|
|
|
abort,
|
|
|
|
|
current_app,
|
|
|
|
|
redirect,
|
|
|
|
|
render_template,
|
|
|
|
|
session,
|
|
|
|
|
url_for,
|
|
|
|
|
)
|
2019-07-01 15:22:08 +01:00
|
|
|
from flask_login import current_user
|
2016-10-13 17:05:37 +01:00
|
|
|
from notifications_utils.url_safe_token import check_token
|
2016-03-17 13:07:52 +00:00
|
|
|
|
2018-02-20 11:22:17 +00:00
|
|
|
from app import user_api_client
|
2016-01-12 09:52:00 +00:00
|
|
|
from app.main import main
|
2016-01-12 10:28:14 +00:00
|
|
|
from app.main.forms import (
|
2016-03-17 13:07:52 +00:00
|
|
|
ChangeEmailForm,
|
|
|
|
|
ChangeMobileNumberForm,
|
2018-02-20 11:22:17 +00:00
|
|
|
ChangeNameForm,
|
|
|
|
|
ChangePasswordForm,
|
|
|
|
|
ConfirmPasswordForm,
|
2019-06-13 19:00:17 +01:00
|
|
|
ServiceOnOffSettingForm,
|
2018-05-07 22:53:36 +01:00
|
|
|
TwoFactorForm,
|
2016-01-12 10:28:14 +00:00
|
|
|
)
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
from app.models.user import User
|
2019-07-01 15:22:08 +01:00
|
|
|
from app.utils import user_is_gov_user, user_is_logged_in
|
2016-10-28 11:45:05 +01:00
|
|
|
|
2016-01-25 10:47:27 +00:00
|
|
|
NEW_EMAIL = 'new-email'
|
|
|
|
|
NEW_MOBILE = 'new-mob'
|
|
|
|
|
NEW_MOBILE_PASSWORD_CONFIRMED = 'new-mob-password-confirmed'
|
|
|
|
|
|
2016-01-12 09:52:00 +00:00
|
|
|
|
|
|
|
|
@main.route("/user-profile")
|
2019-07-01 15:22:08 +01:00
|
|
|
@user_is_logged_in
|
2016-01-15 17:46:09 +00:00
|
|
|
def user_profile():
|
2016-10-28 11:45:05 +01:00
|
|
|
return render_template(
|
|
|
|
|
'views/user-profile.html',
|
2018-12-12 12:29:08 +00:00
|
|
|
can_see_edit=current_user.is_gov_user,
|
2016-10-28 11:45:05 +01:00
|
|
|
)
|
2016-01-12 10:28:14 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
@main.route("/user-profile/name", methods=['GET', 'POST'])
|
2019-07-01 15:22:08 +01:00
|
|
|
@user_is_logged_in
|
2016-01-15 17:46:09 +00:00
|
|
|
def user_profile_name():
|
2016-01-12 10:28:14 +00:00
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
form = ChangeNameForm(new_name=current_user.name)
|
|
|
|
|
|
|
|
|
|
if form.validate_on_submit():
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
current_user.update(name=form.new_name.data)
|
2016-01-15 17:46:09 +00:00
|
|
|
return redirect(url_for('.user_profile'))
|
2016-01-12 10:28:14 +00:00
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
return render_template(
|
|
|
|
|
'views/user-profile/change.html',
|
|
|
|
|
thing='name',
|
|
|
|
|
form_field=form.new_name
|
|
|
|
|
)
|
|
|
|
|
|
2016-01-12 10:28:14 +00:00
|
|
|
|
|
|
|
|
@main.route("/user-profile/email", methods=['GET', 'POST'])
|
2019-07-01 15:22:08 +01:00
|
|
|
@user_is_logged_in
|
2018-12-12 13:10:46 +00:00
|
|
|
@user_is_gov_user
|
2016-01-15 17:46:09 +00:00
|
|
|
def user_profile_email():
|
2016-01-12 10:28:14 +00:00
|
|
|
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
form = ChangeEmailForm(User.already_registered,
|
2016-01-27 12:22:32 +00:00
|
|
|
email_address=current_user.email_address)
|
2016-01-22 16:34:36 +00:00
|
|
|
|
|
|
|
|
if form.validate_on_submit():
|
2016-01-25 10:47:27 +00:00
|
|
|
session[NEW_EMAIL] = form.email_address.data
|
2016-01-15 17:46:09 +00:00
|
|
|
return redirect(url_for('.user_profile_email_authenticate'))
|
2016-01-22 16:34:36 +00:00
|
|
|
return render_template(
|
|
|
|
|
'views/user-profile/change.html',
|
|
|
|
|
thing='email address',
|
|
|
|
|
form_field=form.email_address
|
|
|
|
|
)
|
|
|
|
|
|
2016-01-12 11:25:46 +00:00
|
|
|
|
|
|
|
|
@main.route("/user-profile/email/authenticate", methods=['GET', 'POST'])
|
2019-07-01 15:22:08 +01:00
|
|
|
@user_is_logged_in
|
2016-01-15 17:46:09 +00:00
|
|
|
def user_profile_email_authenticate():
|
2016-01-22 16:34:36 +00:00
|
|
|
# Validate password for form
|
|
|
|
|
def _check_password(pwd):
|
2016-03-30 09:58:10 +01:00
|
|
|
return user_api_client.verify_password(current_user.id, pwd)
|
2016-01-22 16:34:36 +00:00
|
|
|
form = ConfirmPasswordForm(_check_password)
|
2016-01-12 11:25:46 +00:00
|
|
|
|
2016-01-25 10:47:27 +00:00
|
|
|
if NEW_EMAIL not in session:
|
|
|
|
|
return redirect('main.user_profile_email')
|
|
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
if form.validate_on_submit():
|
2016-10-13 17:05:37 +01:00
|
|
|
user_api_client.send_change_email_verification(current_user.id, session[NEW_EMAIL])
|
|
|
|
|
return render_template('views/change-email-continue.html',
|
|
|
|
|
new_email=session[NEW_EMAIL])
|
2016-01-12 10:28:14 +00:00
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
return render_template(
|
2016-09-28 09:34:16 +01:00
|
|
|
'views/user-profile/authenticate.html',
|
|
|
|
|
thing='email address',
|
|
|
|
|
form=form,
|
|
|
|
|
back_link=url_for('.user_profile_email')
|
2016-01-22 16:34:36 +00:00
|
|
|
)
|
|
|
|
|
|
2016-01-12 10:28:14 +00:00
|
|
|
|
2016-10-13 17:05:37 +01:00
|
|
|
@main.route("/user-profile/email/confirm/<token>", methods=['GET'])
|
2019-07-01 15:22:08 +01:00
|
|
|
@user_is_logged_in
|
2016-10-13 17:05:37 +01:00
|
|
|
def user_profile_email_confirm(token):
|
|
|
|
|
token_data = check_token(token,
|
|
|
|
|
current_app.config['SECRET_KEY'],
|
|
|
|
|
current_app.config['DANGEROUS_SALT'],
|
|
|
|
|
current_app.config['EMAIL_EXPIRY_SECONDS'])
|
|
|
|
|
token_data = json.loads(token_data)
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
user = User.from_id(token_data['user_id'])
|
|
|
|
|
user.update(email_address=token_data['email'])
|
2016-10-14 14:46:31 +01:00
|
|
|
session.pop(NEW_EMAIL, None)
|
2016-10-13 17:05:37 +01:00
|
|
|
|
|
|
|
|
return redirect(url_for('.user_profile'))
|
|
|
|
|
|
|
|
|
|
|
2016-01-12 10:28:14 +00:00
|
|
|
@main.route("/user-profile/mobile-number", methods=['GET', 'POST'])
|
2019-07-01 15:22:08 +01:00
|
|
|
@user_is_logged_in
|
2016-01-15 17:46:09 +00:00
|
|
|
def user_profile_mobile_number():
|
2016-01-12 10:28:14 +00:00
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
form = ChangeMobileNumberForm(mobile_number=current_user.mobile_number)
|
|
|
|
|
|
|
|
|
|
if form.validate_on_submit():
|
2016-01-25 10:47:27 +00:00
|
|
|
session[NEW_MOBILE] = form.mobile_number.data
|
2016-01-15 17:46:09 +00:00
|
|
|
return redirect(url_for('.user_profile_mobile_number_authenticate'))
|
2016-01-12 11:25:46 +00:00
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
return render_template(
|
|
|
|
|
'views/user-profile/change.html',
|
|
|
|
|
thing='mobile number',
|
|
|
|
|
form_field=form.mobile_number
|
|
|
|
|
)
|
|
|
|
|
|
2016-01-12 11:25:46 +00:00
|
|
|
|
|
|
|
|
@main.route("/user-profile/mobile-number/authenticate", methods=['GET', 'POST'])
|
2019-07-01 15:22:08 +01:00
|
|
|
@user_is_logged_in
|
2016-01-15 17:46:09 +00:00
|
|
|
def user_profile_mobile_number_authenticate():
|
2016-01-12 11:25:46 +00:00
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
# Validate password for form
|
|
|
|
|
def _check_password(pwd):
|
2016-03-30 09:58:10 +01:00
|
|
|
return user_api_client.verify_password(current_user.id, pwd)
|
2016-01-22 16:34:36 +00:00
|
|
|
form = ConfirmPasswordForm(_check_password)
|
2016-01-12 11:25:46 +00:00
|
|
|
|
2016-01-25 10:47:27 +00:00
|
|
|
if NEW_MOBILE not in session:
|
|
|
|
|
return redirect(url_for('.user_profile_mobile_number'))
|
|
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
if form.validate_on_submit():
|
2016-01-25 10:47:27 +00:00
|
|
|
session[NEW_MOBILE_PASSWORD_CONFIRMED] = True
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
current_user.send_verify_code(to=session[NEW_MOBILE])
|
2016-01-15 17:46:09 +00:00
|
|
|
return redirect(url_for('.user_profile_mobile_number_confirm'))
|
2016-01-12 10:28:14 +00:00
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
return render_template(
|
|
|
|
|
'views/user-profile/authenticate.html',
|
|
|
|
|
thing='mobile number',
|
|
|
|
|
form=form,
|
|
|
|
|
back_link=url_for('.user_profile_mobile_number_confirm')
|
|
|
|
|
)
|
|
|
|
|
|
2016-01-12 10:28:14 +00:00
|
|
|
|
|
|
|
|
@main.route("/user-profile/mobile-number/confirm", methods=['GET', 'POST'])
|
2019-07-01 15:22:08 +01:00
|
|
|
@user_is_logged_in
|
2016-01-15 17:46:09 +00:00
|
|
|
def user_profile_mobile_number_confirm():
|
2016-01-12 10:28:14 +00:00
|
|
|
|
2016-01-27 12:22:32 +00:00
|
|
|
# Validate verify code for form
|
|
|
|
|
def _check_code(cde):
|
2016-03-30 09:58:10 +01:00
|
|
|
return user_api_client.check_verify_code(current_user.id, cde, 'sms')
|
2016-01-27 12:22:32 +00:00
|
|
|
|
|
|
|
|
if NEW_MOBILE_PASSWORD_CONFIRMED not in session:
|
|
|
|
|
return redirect(url_for('.user_profile_mobile_number'))
|
|
|
|
|
|
2018-05-07 22:53:36 +01:00
|
|
|
form = TwoFactorForm(_check_code)
|
2016-01-12 10:28:14 +00:00
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
if form.validate_on_submit():
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
current_user.refresh_session_id()
|
2016-11-03 11:20:24 +00:00
|
|
|
mobile_number = session[NEW_MOBILE]
|
2016-01-25 10:47:27 +00:00
|
|
|
del session[NEW_MOBILE]
|
|
|
|
|
del session[NEW_MOBILE_PASSWORD_CONFIRMED]
|
Make user API client return JSON, not a model
The data flow of other bits of our application looks like this:
```
API (returns JSON)
⬇
API client (returns a built in type, usually `dict`)
⬇
Model (returns an instance, eg of type `Service`)
⬇
View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:
```
API (returns JSON)
⬇
API client (returns a model, of type `User`, `InvitedUser`, etc)
⬇
View (returns HTML)
```
This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.
It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.
For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.
2019-05-23 15:27:35 +01:00
|
|
|
current_user.update(mobile_number=mobile_number)
|
2016-01-15 17:46:09 +00:00
|
|
|
return redirect(url_for('.user_profile'))
|
2016-01-12 10:28:14 +00:00
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
return render_template(
|
|
|
|
|
'views/user-profile/confirm.html',
|
|
|
|
|
form_field=form.sms_code,
|
|
|
|
|
thing='mobile number'
|
|
|
|
|
)
|
|
|
|
|
|
2016-01-12 10:28:14 +00:00
|
|
|
|
|
|
|
|
@main.route("/user-profile/password", methods=['GET', 'POST'])
|
2019-07-01 15:22:08 +01:00
|
|
|
@user_is_logged_in
|
2016-01-15 17:46:09 +00:00
|
|
|
def user_profile_password():
|
2016-01-12 10:28:14 +00:00
|
|
|
|
2016-01-27 12:22:32 +00:00
|
|
|
# Validate password for form
|
|
|
|
|
def _check_password(pwd):
|
2016-03-30 09:58:10 +01:00
|
|
|
return user_api_client.verify_password(current_user.id, pwd)
|
2016-01-27 12:22:32 +00:00
|
|
|
form = ChangePasswordForm(_check_password)
|
2016-01-12 10:28:14 +00:00
|
|
|
|
2016-01-22 16:34:36 +00:00
|
|
|
if form.validate_on_submit():
|
2017-02-07 13:32:20 +00:00
|
|
|
user_api_client.update_password(current_user.id, password=form.new_password.data)
|
2016-01-15 17:46:09 +00:00
|
|
|
return redirect(url_for('.user_profile'))
|
2016-01-22 16:34:36 +00:00
|
|
|
|
|
|
|
|
return render_template(
|
|
|
|
|
'views/user-profile/change-password.html',
|
|
|
|
|
form=form
|
|
|
|
|
)
|
2019-06-13 19:00:17 +01:00
|
|
|
|
|
|
|
|
|
2019-06-14 12:32:47 +01:00
|
|
|
@main.route("/user-profile/disable-platform-admin-view", methods=['GET', 'POST'])
|
2019-07-01 15:22:08 +01:00
|
|
|
@user_is_logged_in
|
2019-06-14 12:32:47 +01:00
|
|
|
def user_profile_disable_platform_admin_view():
|
|
|
|
|
if not current_user.platform_admin and not session.get('disable_platform_admin_view'):
|
2019-06-13 19:00:17 +01:00
|
|
|
abort(403)
|
|
|
|
|
|
|
|
|
|
form = ServiceOnOffSettingForm(
|
2019-06-14 12:32:47 +01:00
|
|
|
name="Signing in again clears this setting",
|
|
|
|
|
enabled=not session.get('disable_platform_admin_view'),
|
|
|
|
|
truthy='Yes',
|
|
|
|
|
falsey='No',
|
2019-06-13 19:00:17 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if form.validate_on_submit():
|
2019-06-14 12:32:47 +01:00
|
|
|
session['disable_platform_admin_view'] = not form.enabled.data
|
2019-06-13 19:00:17 +01:00
|
|
|
return redirect(url_for('.user_profile'))
|
|
|
|
|
|
|
|
|
|
return render_template(
|
2019-06-14 12:32:47 +01:00
|
|
|
'views/user-profile/disable-platform-admin-view.html',
|
2019-06-13 19:00:17 +01:00
|
|
|
form=form
|
|
|
|
|
)
|