mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-06-04 05:20:46 -04:00
It looks like, by default, Flask no longer makes full URLs, for example `https://example.com/path`. Instead it does `/path`. This will still work fine, and if anything is better because it reduces the number of bytes of HTML we are sending. It won’t mean that requests go over `http` instead of `https` without the protocol because we set the appropriate HSTS header here:0c57da7781/ansible/roles/paas-proxy/templates/admin.conf.j2 (L11)This commit changes all our tests to reflect that URLs no longer have the protocol and domain in them. `_external=True` is Flask’s way of saying whether a URL should be generated with the domain and protocol (`True`) or without it (`False`). Again, I can’t find the changelog or diff where this was introuduced, but if you’d like to go spelunking then here’s a starting point:50374e3cfe/src/flask/helpers.py (L192)
128 lines
5.6 KiB
Python
128 lines
5.6 KiB
Python
from flask import abort, flash, redirect, render_template, session, url_for
|
||
from flask_login import current_user
|
||
from markupsafe import Markup
|
||
|
||
from app.main import main
|
||
from app.models.organisation import Organisation
|
||
from app.models.service import Service
|
||
from app.models.user import (
|
||
InvitedOrgUser,
|
||
InvitedUser,
|
||
OrganisationUsers,
|
||
User,
|
||
Users,
|
||
)
|
||
|
||
|
||
@main.route("/invitation/<token>")
|
||
def accept_invite(token):
|
||
invited_user = InvitedUser.from_token(token)
|
||
|
||
if not current_user.is_anonymous and current_user.email_address.lower() != invited_user.email_address.lower():
|
||
message = Markup("""
|
||
You’re signed in as {}.
|
||
This invite is for another email address.
|
||
<a href={} class="govuk-link govuk-link--no-visited-state">Sign out</a>
|
||
and click the link again to accept this invite.
|
||
""".format(
|
||
current_user.email_address,
|
||
url_for("main.sign_out")))
|
||
|
||
flash(message=message)
|
||
|
||
abort(403)
|
||
|
||
if invited_user.status == 'cancelled':
|
||
service = Service.from_id(invited_user.service)
|
||
return render_template('views/cancelled-invitation.html',
|
||
from_user=invited_user.from_user.name,
|
||
service_name=service.name)
|
||
if invited_user.status == 'accepted':
|
||
session.pop('invited_user_id', None)
|
||
service = Service.from_id(invited_user.service)
|
||
if service.has_permission('broadcast'):
|
||
if service.live:
|
||
return redirect(url_for('main.broadcast_tour_live', service_id=service.id, step_index=1))
|
||
else:
|
||
return redirect(url_for('main.broadcast_tour', service_id=service.id, step_index=1))
|
||
return redirect(url_for('main.service_dashboard', service_id=invited_user.service))
|
||
|
||
session['invited_user_id'] = invited_user.id
|
||
|
||
existing_user = User.from_email_address_or_none(invited_user.email_address)
|
||
|
||
if existing_user:
|
||
existing_user.update_email_access_validated_at()
|
||
invited_user.accept_invite()
|
||
if existing_user in Users(invited_user.service):
|
||
return redirect(url_for('main.service_dashboard', service_id=invited_user.service))
|
||
else:
|
||
service = Service.from_id(invited_user.service)
|
||
# if the service you're being added to can modify auth type, then check if we can do this;
|
||
# if the user is a Platform Admin, we silently leave this unchanged to prevent a security
|
||
# issue where someone could switch their auth type to something less secure
|
||
if service.has_permission('email_auth') and not existing_user.platform_admin:
|
||
if invited_user.auth_type == 'email_auth' or (
|
||
# they have a phone number, we want them to start using it.
|
||
# if they dont have a mobile we just ignore that option of the invite
|
||
existing_user.mobile_number and invited_user.auth_type == 'sms_auth'
|
||
):
|
||
existing_user.update(auth_type=invited_user.auth_type)
|
||
existing_user.add_to_service(
|
||
service_id=invited_user.service,
|
||
permissions=invited_user.permissions,
|
||
folder_permissions=invited_user.folder_permissions,
|
||
invited_by_id=invited_user.from_user.id,
|
||
)
|
||
if service.has_permission('broadcast'):
|
||
if service.live:
|
||
return redirect(url_for('main.broadcast_tour_live', service_id=service.id, step_index=1))
|
||
else:
|
||
return redirect(url_for('main.broadcast_tour', service_id=service.id, step_index=1))
|
||
return redirect(url_for('main.service_dashboard', service_id=service.id))
|
||
else:
|
||
return redirect(url_for('main.register_from_invite'))
|
||
|
||
|
||
@main.route("/organisation-invitation/<token>")
|
||
def accept_org_invite(token):
|
||
invited_org_user = InvitedOrgUser.from_token(token)
|
||
|
||
if not current_user.is_anonymous and current_user.email_address.lower() != invited_org_user.email_address.lower():
|
||
message = Markup("""
|
||
You’re signed in as {}.
|
||
This invite is for another email address.
|
||
<a class="govuk-link govuk-link--no-visited-state" href={}>Sign out</a>
|
||
and click the link again to accept this invite.
|
||
""".format(
|
||
current_user.email_address,
|
||
url_for("main.sign_out")))
|
||
|
||
flash(message=message)
|
||
|
||
abort(403)
|
||
|
||
if invited_org_user.status == 'cancelled':
|
||
organisation = Organisation.from_id(invited_org_user.organisation)
|
||
return render_template('views/cancelled-invitation.html',
|
||
from_user=invited_org_user.invited_by.name,
|
||
organisation_name=organisation.name)
|
||
|
||
if invited_org_user.status == 'accepted':
|
||
session.pop('invited_org_user_id', None)
|
||
return redirect(url_for('main.organisation_dashboard', org_id=invited_org_user.organisation))
|
||
|
||
session['invited_org_user_id'] = invited_org_user.id
|
||
|
||
existing_user = User.from_email_address_or_none(invited_org_user.email_address)
|
||
organisation_users = OrganisationUsers(invited_org_user.organisation)
|
||
|
||
if existing_user:
|
||
existing_user.update_email_access_validated_at()
|
||
invited_org_user.accept_invite()
|
||
if existing_user not in organisation_users:
|
||
existing_user.add_to_organisation(organisation_id=invited_org_user.organisation)
|
||
return redirect(url_for('main.organisation_dashboard', org_id=invited_org_user.organisation))
|
||
else:
|
||
return redirect(url_for('main.register_from_org_invite'))
|