darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 14:29:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-free-sms-history

Browse Source
This commit is contained in:
venusbb
2017-11-14 09:40:05 +00:00
parent 1ab4681ff5 694a92e92a
commit 581759931f
21 changed files with 409 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/main/views/code_not_received.py
View File

@@ -31,8 +31,7 @@ def check_and_resend_text_code():
form = TextNotReceivedForm(mobile_number=user.mobile_number)
if form.validate_on_submit():
user_api_client.send_verify_code(user.id, 'sms', to=form.mobile_number.data)
user.mobile_number = form.mobile_number.data
user_api_client.update_user(user)
user = user_api_client.update_user_attribute(user.id, mobile_number=form.mobile_number.data)
return redirect(url_for('.verify'))
return render_template('views/text-not-received.html', form=form)
@@ -47,3 +46,17 @@ def check_and_resend_verification_code():
return redirect(url_for('main.verify'))
else:
return redirect(url_for('main.two_factor'))
@main.route('/email-not-received', methods=['GET'])
@redirect_to_sign_in
def email_not_received():
return render_template('views/email-not-received.html')
@main.route('/send-new-email-token', methods=['GET'])
@redirect_to_sign_in
def resend_email_link():
user_api_client.send_verify_code(session['user_details']['id'], 'email', None)
session.pop('user_details')
return redirect(url_for('main.two_factor_email_sent', email_resent=True))

15
app/main/views/send.py
View File

@@ -217,18 +217,18 @@ def set_sender(service_id, template_id):
def get_sender_context(sender_details, template_type):
context = {
'email': {
'title': "Choose where to send replies",
'description': "Select an email address that recipients can reply to",
'title': 'Send to one recipient',
'description': 'Where should replies go?',
'field_name': 'email_address'
},
'letter': {
'title': 'Choose sender address',
'description': 'Select an address that recipients can reply to',
'title': 'Send to one recipient',
'description': 'What should appear in the top right of the letter?',
'field_name': 'contact_block'
},
'sms': {
'title': 'Chose text message sender',
'description': 'Select a text message sender that the recipients can reply to',
'title': 'Send to one recipient',
'description': 'Who should the message come from?',
'field_name': 'sms_sender'
}
}[template_type]
@@ -410,7 +410,8 @@ def send_test_step(service_id, template_id, step_index):
if (
request.endpoint == 'main.send_one_off_step' and
step_index == 0 and
template.template_type != 'letter'
template.template_type != 'letter' and
not (template.template_type == 'sms' and current_user.mobile_number is None)
):
skip_link = (
'Use my {}'.format(first_column_headings[template.template_type][0]),

22
app/main/views/service_settings.py
View File

@@ -432,28 +432,6 @@ def service_edit_email_reply_to(service_id, reply_to_email_id):
reply_to_email_address_id=reply_to_email_address['id'])
@main.route("/services/<service_id>/service-settings/set-sms-sender", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
def service_set_sms_sender(service_id):
form = ServiceSmsSenderForm()
if form.validate_on_submit():
if 'inbound_sms' in current_service['permissions']:
abort(403)
service_api_client.update_service(
current_service['id'],
sms_sender=form.sms_sender.data or None
)
return redirect(url_for('.service_settings', service_id=service_id))
if request.method == 'GET':
form.sms_sender.data = current_service.get('sms_sender')
return render_template(
'views/service-settings/set-sms-sender.html',
form=form)
@main.route("/services/<service_id>/service-settings/set-inbound-number", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)

24
app/main/views/sign_in.py
View File

@@ -48,11 +48,11 @@ def sign_in():
if user:
session['user_details'] = {"email": user.email_address, "id": user.id}
if user.is_active:
user_api_client.send_verify_code(user.id, 'sms', user.mobile_number)
if request.args.get('next'):
return redirect(url_for('.two_factor', next=request.args.get('next')))
if user.auth_type == "email_auth":
return sign_in_email(user.id, user.email_address)
else:
return redirect(url_for('.two_factor'))
return sign_in_sms(user.id, user.mobile_number)
# Vague error message for login in case of user not known, locked, inactive or password not verified
flash(Markup(
(
@@ -70,6 +70,22 @@ def sign_in():
)
def sign_in_email(user_id, to):
if request.args.get('next'):
user_api_client.send_verify_code(user_id, 'email', None, request.args.get('next'))
else:
user_api_client.send_verify_code(user_id, 'email', None)
return redirect(url_for('.two_factor_email_sent'))
def sign_in_sms(user_id, to):
user_api_client.send_verify_code(user_id, 'sms', to)
if request.args.get('next'):
return redirect(url_for('.two_factor', next=request.args.get('next')))
else:
return redirect(url_for('.two_factor'))
@login_manager.unauthorized_handler
def sign_in_again():
return redirect(

108
app/main/views/two_factor.py
View File

@@ -1,16 +1,65 @@
import json
from flask import (
render_template,
redirect,
session,
url_for,
request
request,
current_app,
flash
)
from flask_login import login_user, current_user
from app.main import main
from app.main.forms import TwoFactorForm
from app import service_api_client, user_api_client
from app.utils import redirect_to_sign_in
from notifications_utils.url_safe_token import check_token
from itsdangerous import SignatureExpired
@main.route('/two-factor-email-sent', methods=['GET'])
def two_factor_email_sent():
title = 'Email resent' if request.args.get('email_resent') else 'Check your email'
return render_template(
'views/two-factor-email.html',
title=title
)
@main.route('/email-auth/<token>', methods=['GET'])
def two_factor_email(token):
if current_user.is_authenticated:
return redirect_when_logged_in(current_user.id)
# checks url is valid, and hasn't timed out
try:
token_data = json.loads(check_token(
token,
current_app.config['SECRET_KEY'],
current_app.config['DANGEROUS_SALT'],
current_app.config['EMAIL_2FA_EXPIRY_SECONDS']
))
except SignatureExpired as exc:
# lets decode again, without the expiry, to get the user id out
orig_data = json.loads(check_token(
token,
current_app.config['SECRET_KEY'],
current_app.config['DANGEROUS_SALT'],
None
))
session['user_details'] = {'id': orig_data['user_id']}
flash("The link in the email we sent you has expired. We’ve sent you a new one.")
return redirect(url_for('.resend_email_link'))
user_id = token_data['user_id']
# checks if code was already used
logged_in, msg = user_api_client.check_verify_code(user_id, token_data['secret_code'], "email")
if not logged_in:
flash("This link has already been used")
session['user_details'] = {'id': user_id}
return redirect(url_for('.resend_email_link'))
return log_in_user(user_id)
@main.route('/two-factor', methods=['GET', 'POST'])
@@ -24,29 +73,7 @@ def two_factor():
form = TwoFactorForm(_check_code)
if form.validate_on_submit():
try:
user = user_api_client.get_user(user_id)
# the user will have a new current_session_id set by the API - store it in the cookie for future requests
session['current_session_id'] = user.current_session_id
services = service_api_client.get_active_services({'user_id': str(user_id)}).get('data', [])
# Check if coming from new password page
if 'password' in session['user_details']:
user = user_api_client.update_password(user.id, password=session['user_details']['password'])
activated_user = user_api_client.activate_user(user)
login_user(activated_user)
finally:
del session['user_details']
next_url = request.args.get('next')
if next_url and _is_safe_redirect_url(next_url):
return redirect(next_url)
if current_user.platform_admin:
return redirect(url_for('main.platform_admin'))
if len(services) == 1:
return redirect(url_for('main.service_dashboard', service_id=services[0]['id']))
else:
return redirect(url_for('main.choose_service'))
return log_in_user(user_id)
return render_template('views/two-factor.html', form=form)
@@ -58,3 +85,34 @@ def _is_safe_redirect_url(target):
redirect_url = urlparse(urljoin(request.host_url, target))
return redirect_url.scheme in ('http', 'https') and \
host_url.netloc == redirect_url.netloc
def log_in_user(user_id):
try:
user = user_api_client.get_user(user_id)
# the user will have a new current_session_id set by the API - store it in the cookie for future requests
session['current_session_id'] = user.current_session_id
# Check if coming from new password page
if 'password' in session.get('user_details', {}):
user = user_api_client.update_password(user.id, password=session['user_details']['password'])
activated_user = user_api_client.activate_user(user)
login_user(activated_user)
finally:
session.pop("user_details", None)
return redirect_when_logged_in(user_id)
def redirect_when_logged_in(user_id):
next_url = request.args.get('next')
if next_url and _is_safe_redirect_url(next_url):
return redirect(next_url)
if current_user.platform_admin:
return redirect(url_for('main.platform_admin'))
services = service_api_client.get_active_services({'user_id': str(user_id)}).get('data', [])
if len(services) == 1:
return redirect(url_for('main.service_dashboard', service_id=services[0]['id']))
else:
return redirect(url_for('main.choose_service'))