This commit is contained in:
Kenneth Kehl
2023-08-29 14:54:30 -07:00
parent 19dcd7a48b
commit 1ecb747c6d
588 changed files with 34100 additions and 23589 deletions

View File

@@ -24,24 +24,28 @@ from app.organization.organization_schema import (
)
from app.schema_validation import validate
organization_invite_blueprint = Blueprint('organization_invite', __name__)
organization_invite_blueprint = Blueprint("organization_invite", __name__)
register_errors(organization_invite_blueprint)
@organization_invite_blueprint.route('/organization/<uuid:organization_id>/invite', methods=['POST'])
@organization_invite_blueprint.route(
"/organization/<uuid:organization_id>/invite", methods=["POST"]
)
def invite_user_to_org(organization_id):
data = request.get_json()
validate(data, post_create_invited_org_user_status_schema)
invited_org_user = InvitedOrganizationUser(
email_address=data['email_address'],
invited_by_id=data['invited_by'],
organization_id=organization_id
email_address=data["email_address"],
invited_by_id=data["invited_by"],
organization_id=organization_id,
)
save_invited_org_user(invited_org_user)
template = dao_get_template_by_id(current_app.config['ORGANIZATION_INVITATION_EMAIL_TEMPLATE_ID'])
template = dao_get_template_by_id(
current_app.config["ORGANIZATION_INVITATION_EMAIL_TEMPLATE_ID"]
)
saved_notification = persist_notification(
template_id=template.id,
@@ -49,21 +53,21 @@ def invite_user_to_org(organization_id):
recipient=invited_org_user.email_address,
service=template.service,
personalisation={
'user_name': (
'The GOV.UK Notify team'
"user_name": (
"The GOV.UK Notify team"
if invited_org_user.invited_by.platform_admin
else invited_org_user.invited_by.name
),
'organization_name': invited_org_user.organization.name,
'url': invited_org_user_url(
"organization_name": invited_org_user.organization.name,
"url": invited_org_user_url(
invited_org_user.id,
data.get('invite_link_host'),
data.get("invite_link_host"),
),
},
notification_type=EMAIL_TYPE,
api_key_id=None,
key_type=KEY_TYPE_NORMAL,
reply_to_text=invited_org_user.invited_by.email_address
reply_to_text=invited_org_user.invited_by.email_address,
)
send_notification_to_queue(saved_notification, queue=QueueNames.NOTIFY)
@@ -71,15 +75,16 @@ def invite_user_to_org(organization_id):
return jsonify(data=invited_org_user.serialize()), 201
@organization_invite_blueprint.route('/organization/<uuid:organization_id>/invite', methods=['GET'])
@organization_invite_blueprint.route(
"/organization/<uuid:organization_id>/invite", methods=["GET"]
)
def get_invited_org_users_by_organization(organization_id):
invited_org_users = get_invited_org_users_for_organization(organization_id)
return jsonify(data=[x.serialize() for x in invited_org_users]), 200
@organization_invite_blueprint.route(
'/organization/<uuid:organization_id>/invite/<invited_org_user_id>',
methods=['GET']
"/organization/<uuid:organization_id>/invite/<invited_org_user_id>", methods=["GET"]
)
def get_invited_org_user_by_organization(organization_id, invited_org_user_id):
invited_org_user = dao_get_invited_org_user(organization_id, invited_org_user_id)
@@ -87,16 +92,18 @@ def get_invited_org_user_by_organization(organization_id, invited_org_user_id):
@organization_invite_blueprint.route(
'/organization/<uuid:organization_id>/invite/<invited_org_user_id>',
methods=['POST']
"/organization/<uuid:organization_id>/invite/<invited_org_user_id>",
methods=["POST"],
)
def update_org_invite_status(organization_id, invited_org_user_id):
fetched = dao_get_invited_org_user(organization_id=organization_id, invited_org_user_id=invited_org_user_id)
fetched = dao_get_invited_org_user(
organization_id=organization_id, invited_org_user_id=invited_org_user_id
)
data = request.get_json()
validate(data, post_update_invited_org_user_status_schema)
fetched.status = data['status']
fetched.status = data["status"]
save_invited_org_user(fetched)
return jsonify(data=fetched.serialize()), 200
@@ -105,40 +112,48 @@ def update_org_invite_status(organization_id, invited_org_user_id):
def invited_org_user_url(invited_org_user_id, invite_link_host=None):
token = generate_token(
str(invited_org_user_id),
current_app.config['SECRET_KEY'],
current_app.config['DANGEROUS_SALT']
current_app.config["SECRET_KEY"],
current_app.config["DANGEROUS_SALT"],
)
if invite_link_host is None:
invite_link_host = current_app.config['ADMIN_BASE_URL']
invite_link_host = current_app.config["ADMIN_BASE_URL"]
return '{0}/organization-invitation/{1}'.format(invite_link_host, token)
return "{0}/organization-invitation/{1}".format(invite_link_host, token)
@organization_invite_blueprint.route('/invite/organization/<uuid:invited_org_user_id>', methods=['GET'])
@organization_invite_blueprint.route(
"/invite/organization/<uuid:invited_org_user_id>", methods=["GET"]
)
def get_invited_org_user(invited_org_user_id):
invited_user = get_invited_org_user_by_id(invited_org_user_id)
return jsonify(data=invited_user.serialize()), 200
@organization_invite_blueprint.route('/invite/organization/<token>', methods=['GET'])
@organization_invite_blueprint.route('/invite/organization/check/<token>', methods=['GET'])
@organization_invite_blueprint.route("/invite/organization/<token>", methods=["GET"])
@organization_invite_blueprint.route(
"/invite/organization/check/<token>", methods=["GET"]
)
def validate_invitation_token(token):
max_age_seconds = 60 * 60 * 24 * current_app.config['INVITATION_EXPIRATION_DAYS']
max_age_seconds = 60 * 60 * 24 * current_app.config["INVITATION_EXPIRATION_DAYS"]
try:
invited_user_id = check_token(token,
current_app.config['SECRET_KEY'],
current_app.config['DANGEROUS_SALT'],
max_age_seconds)
invited_user_id = check_token(
token,
current_app.config["SECRET_KEY"],
current_app.config["DANGEROUS_SALT"],
max_age_seconds,
)
except SignatureExpired:
errors = {'invitation':
'Your invitation to GOV.UK Notify has expired. '
'Please ask the person that invited you to send you another one'}
errors = {
"invitation": "Your invitation to GOV.UK Notify has expired. "
"Please ask the person that invited you to send you another one"
}
raise InvalidRequest(errors, status_code=400)
except BadData:
errors = {'invitation': 'Somethings wrong with this link. Make sure youve copied the whole thing.'}
errors = {
"invitation": "Somethings wrong with this link. Make sure youve copied the whole thing."
}
raise InvalidRequest(errors, status_code=400)
invited_user = get_invited_org_user_by_id(invited_user_id)