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

@@ -18,21 +18,21 @@ from app.notifications.process_notifications import (
)
from app.schemas import invited_user_schema
service_invite = Blueprint('service_invite', __name__)
service_invite = Blueprint("service_invite", __name__)
register_errors(service_invite)
@service_invite.route('/service/<service_id>/invite', methods=['POST'])
@service_invite.route("/service/<service_id>/invite", methods=["POST"])
def create_invited_user(service_id):
request_json = request.get_json()
invited_user = invited_user_schema.load(request_json)
save_invited_user(invited_user)
template_id = current_app.config['INVITATION_EMAIL_TEMPLATE_ID']
template_id = current_app.config["INVITATION_EMAIL_TEMPLATE_ID"]
template = dao_get_template_by_id(template_id)
service = Service.query.get(current_app.config['NOTIFY_SERVICE_ID'])
service = Service.query.get(current_app.config["NOTIFY_SERVICE_ID"])
saved_notification = persist_notification(
template_id=template.id,
@@ -40,17 +40,17 @@ def create_invited_user(service_id):
recipient=invited_user.email_address,
service=service,
personalisation={
'user_name': invited_user.from_user.name,
'service_name': invited_user.service.name,
'url': invited_user_url(
"user_name": invited_user.from_user.name,
"service_name": invited_user.service.name,
"url": invited_user_url(
invited_user.id,
request_json.get('invite_link_host'),
request_json.get("invite_link_host"),
),
},
notification_type=EMAIL_TYPE,
api_key_id=None,
key_type=KEY_TYPE_NORMAL,
reply_to_text=invited_user.from_user.email_address
reply_to_text=invited_user.from_user.email_address,
)
send_notification_to_queue(saved_notification, queue=QueueNames.NOTIFY)
@@ -58,21 +58,25 @@ def create_invited_user(service_id):
return jsonify(data=invited_user_schema.dump(invited_user)), 201
@service_invite.route('/service/<service_id>/invite', methods=['GET'])
@service_invite.route("/service/<service_id>/invite", methods=["GET"])
def get_invited_users_by_service(service_id):
invited_users = get_invited_users_for_service(service_id)
return jsonify(data=invited_user_schema.dump(invited_users, many=True)), 200
@service_invite.route('/service/<service_id>/invite/<invited_user_id>', methods=['GET'])
@service_invite.route("/service/<service_id>/invite/<invited_user_id>", methods=["GET"])
def get_invited_user_by_service(service_id, invited_user_id):
invited_user = get_invited_user_by_service_and_id(service_id, invited_user_id)
return jsonify(data=invited_user_schema.dump(invited_user)), 200
@service_invite.route('/service/<service_id>/invite/<invited_user_id>', methods=['POST'])
@service_invite.route(
"/service/<service_id>/invite/<invited_user_id>", methods=["POST"]
)
def update_invited_user(service_id, invited_user_id):
fetched = get_invited_user_by_service_and_id(service_id=service_id, invited_user_id=invited_user_id)
fetched = get_invited_user_by_service_and_id(
service_id=service_id, invited_user_id=invited_user_id
)
current_data = dict(invited_user_schema.dump(fetched).items())
current_data.update(request.get_json())
@@ -82,38 +86,46 @@ def update_invited_user(service_id, invited_user_id):
def invited_user_url(invited_user_id, invite_link_host=None):
token = generate_token(str(invited_user_id), current_app.config['SECRET_KEY'], current_app.config['DANGEROUS_SALT'])
token = generate_token(
str(invited_user_id),
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}/invitation/{1}'.format(invite_link_host, token)
return "{0}/invitation/{1}".format(invite_link_host, token)
@service_invite.route('/invite/service/<uuid:invited_user_id>', methods=['GET'])
@service_invite.route("/invite/service/<uuid:invited_user_id>", methods=["GET"])
def get_invited_user(invited_user_id):
invited_user = get_invited_user_by_id(invited_user_id)
return jsonify(data=invited_user_schema.dump(invited_user)), 200
@service_invite.route('/invite/service/<token>', methods=['GET'])
@service_invite.route('/invite/service/check/<token>', methods=['GET'])
@service_invite.route("/invite/service/<token>", methods=["GET"])
@service_invite.route("/invite/service/check/<token>", methods=["GET"])
def validate_service_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_user_by_id(invited_user_id)