mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-05 10:42:41 -05:00
notify-api-412 use black to enforce python style standards
This commit is contained in:
Kenneth Kehl
342
app/user/rest.py
342
app/user/rest.py
@@ -68,7 +68,7 @@ from app.user.users_schema import (
|
||||
)
|
||||
from app.utils import url_with_token
|
||||
|
||||
user_blueprint = Blueprint('user', __name__)
|
||||
user_blueprint = Blueprint("user", __name__)
|
||||
register_errors(user_blueprint)
|
||||
|
||||
|
||||
@@ -77,30 +77,40 @@ def handle_integrity_error(exc):
|
||||
"""
|
||||
Handle integrity errors caused by the auth type/mobile number check constraint
|
||||
"""
|
||||
if 'ck_user_has_mobile_or_other_auth' in str(exc):
|
||||
if "ck_user_has_mobile_or_other_auth" in str(exc):
|
||||
# we don't expect this to trip, so still log error
|
||||
current_app.logger.exception('Check constraint ck_user_has_mobile_or_other_auth triggered')
|
||||
return jsonify(result='error', message='Mobile number must be set if auth_type is set to sms_auth'), 400
|
||||
current_app.logger.exception(
|
||||
"Check constraint ck_user_has_mobile_or_other_auth triggered"
|
||||
)
|
||||
return (
|
||||
jsonify(
|
||||
result="error",
|
||||
message="Mobile number must be set if auth_type is set to sms_auth",
|
||||
),
|
||||
400,
|
||||
)
|
||||
|
||||
raise exc
|
||||
|
||||
|
||||
@user_blueprint.route('', methods=['POST'])
|
||||
@user_blueprint.route("", methods=["POST"])
|
||||
def create_user():
|
||||
req_json = request.get_json()
|
||||
user_to_create = create_user_schema.load(req_json)
|
||||
|
||||
save_model_user(user_to_create, password=req_json.get('password'), validated_email_access=True)
|
||||
save_model_user(
|
||||
user_to_create, password=req_json.get("password"), validated_email_access=True
|
||||
)
|
||||
result = user_to_create.serialize()
|
||||
return jsonify(data=result), 201
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>", methods=["POST"])
|
||||
def update_user_attribute(user_id):
|
||||
user_to_update = get_user_by_id(user_id=user_id)
|
||||
req_json = request.get_json()
|
||||
if 'updated_by' in req_json:
|
||||
updated_by = get_user_by_id(user_id=req_json.pop('updated_by'))
|
||||
if "updated_by" in req_json:
|
||||
updated_by = get_user_by_id(user_id=req_json.pop("updated_by"))
|
||||
else:
|
||||
updated_by = None
|
||||
|
||||
@@ -108,17 +118,21 @@ def update_user_attribute(user_id):
|
||||
|
||||
save_user_attribute(user_to_update, update_dict=update_dct)
|
||||
if updated_by:
|
||||
if 'email_address' in update_dct:
|
||||
template = dao_get_template_by_id(current_app.config['TEAM_MEMBER_EDIT_EMAIL_TEMPLATE_ID'])
|
||||
if "email_address" in update_dct:
|
||||
template = dao_get_template_by_id(
|
||||
current_app.config["TEAM_MEMBER_EDIT_EMAIL_TEMPLATE_ID"]
|
||||
)
|
||||
recipient = user_to_update.email_address
|
||||
reply_to = template.service.get_default_reply_to_email_address()
|
||||
elif 'mobile_number' in update_dct:
|
||||
template = dao_get_template_by_id(current_app.config['TEAM_MEMBER_EDIT_MOBILE_TEMPLATE_ID'])
|
||||
elif "mobile_number" in update_dct:
|
||||
template = dao_get_template_by_id(
|
||||
current_app.config["TEAM_MEMBER_EDIT_MOBILE_TEMPLATE_ID"]
|
||||
)
|
||||
recipient = user_to_update.mobile_number
|
||||
reply_to = get_sms_reply_to_for_notify_service(recipient, template)
|
||||
else:
|
||||
return jsonify(data=user_to_update.serialize()), 200
|
||||
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,
|
||||
@@ -126,14 +140,14 @@ def update_user_attribute(user_id):
|
||||
recipient=recipient,
|
||||
service=service,
|
||||
personalisation={
|
||||
'name': user_to_update.name,
|
||||
'servicemanagername': updated_by.name,
|
||||
'email address': user_to_update.email_address
|
||||
"name": user_to_update.name,
|
||||
"servicemanagername": updated_by.name,
|
||||
"email address": user_to_update.email_address,
|
||||
},
|
||||
notification_type=template.template_type,
|
||||
api_key_id=None,
|
||||
key_type=KEY_TYPE_NORMAL,
|
||||
reply_to_text=reply_to
|
||||
reply_to_text=reply_to,
|
||||
)
|
||||
|
||||
send_notification_to_queue(saved_notification, False, queue=QueueNames.NOTIFY)
|
||||
@@ -142,47 +156,47 @@ def update_user_attribute(user_id):
|
||||
|
||||
def get_sms_reply_to_for_notify_service(recipient, template):
|
||||
if not is_us_phone_number(recipient) and use_numeric_sender(recipient):
|
||||
reply_to = current_app.config['NOTIFY_INTERNATIONAL_SMS_SENDER']
|
||||
reply_to = current_app.config["NOTIFY_INTERNATIONAL_SMS_SENDER"]
|
||||
else:
|
||||
reply_to = template.service.get_default_sms_sender()
|
||||
return reply_to
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/archive', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>/archive", methods=["POST"])
|
||||
def archive_user(user_id):
|
||||
user = get_user_by_id(user_id)
|
||||
dao_archive_user(user)
|
||||
|
||||
return '', 204
|
||||
return "", 204
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/activate', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>/activate", methods=["POST"])
|
||||
def activate_user(user_id):
|
||||
user = get_user_by_id(user_id=user_id)
|
||||
if user.state == 'active':
|
||||
raise InvalidRequest('User already active', status_code=400)
|
||||
if user.state == "active":
|
||||
raise InvalidRequest("User already active", status_code=400)
|
||||
|
||||
user.state = 'active'
|
||||
user.state = "active"
|
||||
save_model_user(user)
|
||||
return jsonify(data=user.serialize()), 200
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/reset-failed-login-count', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>/reset-failed-login-count", methods=["POST"])
|
||||
def user_reset_failed_login_count(user_id):
|
||||
user_to_update = get_user_by_id(user_id=user_id)
|
||||
reset_failed_login_count(user_to_update)
|
||||
return jsonify(data=user_to_update.serialize()), 200
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/verify/password', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>/verify/password", methods=["POST"])
|
||||
def verify_user_password(user_id):
|
||||
user_to_verify = get_user_by_id(user_id=user_id)
|
||||
|
||||
try:
|
||||
txt_pwd = request.get_json()['password']
|
||||
txt_pwd = request.get_json()["password"]
|
||||
except KeyError:
|
||||
message = 'Required field missing data'
|
||||
errors = {'password': [message]}
|
||||
message = "Required field missing data"
|
||||
errors = {"password": [message]}
|
||||
raise InvalidRequest(errors, status_code=400)
|
||||
|
||||
if user_to_verify.check_password(txt_pwd):
|
||||
@@ -190,20 +204,22 @@ def verify_user_password(user_id):
|
||||
return jsonify({}), 204
|
||||
else:
|
||||
increment_failed_login_count(user_to_verify)
|
||||
message = 'Incorrect password'
|
||||
errors = {'password': [message]}
|
||||
message = "Incorrect password"
|
||||
errors = {"password": [message]}
|
||||
raise InvalidRequest(errors, status_code=400)
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/verify/code', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>/verify/code", methods=["POST"])
|
||||
def verify_user_code(user_id):
|
||||
data = request.get_json()
|
||||
validate(data, post_verify_code_schema)
|
||||
|
||||
user_to_verify = get_user_by_id(user_id=user_id)
|
||||
|
||||
code = get_user_code(user_to_verify, data['code'], data['code_type'])
|
||||
if user_to_verify.failed_login_count >= current_app.config.get('MAX_FAILED_LOGIN_COUNT'):
|
||||
code = get_user_code(user_to_verify, data["code"], data["code_type"])
|
||||
if user_to_verify.failed_login_count >= current_app.config.get(
|
||||
"MAX_FAILED_LOGIN_COUNT"
|
||||
):
|
||||
raise InvalidRequest("Code not found", status_code=404)
|
||||
if not code:
|
||||
# only relevant from sms
|
||||
@@ -216,7 +232,7 @@ def verify_user_code(user_id):
|
||||
|
||||
user_to_verify.current_session_id = str(uuid.uuid4())
|
||||
user_to_verify.logged_in_at = datetime.utcnow()
|
||||
if data['code_type'] == 'email':
|
||||
if data["code_type"] == "email":
|
||||
user_to_verify.email_access_validated_at = datetime.utcnow()
|
||||
user_to_verify.failed_login_count = 0
|
||||
save_model_user(user_to_verify)
|
||||
@@ -226,8 +242,8 @@ def verify_user_code(user_id):
|
||||
|
||||
|
||||
# TODO: Remove the "verify" endpoint once admin no longer points at it
|
||||
@user_blueprint.route('/<uuid:user_id>/complete/webauthn-login', methods=['POST'])
|
||||
@user_blueprint.route('/<uuid:user_id>/verify/webauthn-login', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>/complete/webauthn-login", methods=["POST"])
|
||||
@user_blueprint.route("/<uuid:user_id>/verify/webauthn-login", methods=["POST"])
|
||||
def complete_login_after_webauthn_authentication_attempt(user_id):
|
||||
"""
|
||||
complete login after a webauthn authentication. There's nothing webauthn specific in this code
|
||||
@@ -243,9 +259,9 @@ def complete_login_after_webauthn_authentication_attempt(user_id):
|
||||
validate(data, post_verify_webauthn_schema)
|
||||
|
||||
user = get_user_by_id(user_id=user_id)
|
||||
successful = data['successful']
|
||||
successful = data["successful"]
|
||||
|
||||
if user.failed_login_count >= current_app.config.get('MAX_VERIFY_CODE_COUNT'):
|
||||
if user.failed_login_count >= current_app.config.get("MAX_VERIFY_CODE_COUNT"):
|
||||
raise InvalidRequest("Maximum login count exceeded", status_code=403)
|
||||
|
||||
if successful:
|
||||
@@ -259,13 +275,17 @@ def complete_login_after_webauthn_authentication_attempt(user_id):
|
||||
return jsonify({}), 204
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/<code_type>-code', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>/<code_type>-code", methods=["POST"])
|
||||
def send_user_2fa_code(user_id, code_type):
|
||||
user_to_send_to = get_user_by_id(user_id=user_id)
|
||||
|
||||
if count_user_verify_codes(user_to_send_to) >= current_app.config.get('MAX_VERIFY_CODE_COUNT'):
|
||||
if count_user_verify_codes(user_to_send_to) >= current_app.config.get(
|
||||
"MAX_VERIFY_CODE_COUNT"
|
||||
):
|
||||
# Prevent more than `MAX_VERIFY_CODE_COUNT` active verify codes at a time
|
||||
current_app.logger.warning('Too many verify codes created for user {}'.format(user_to_send_to.id))
|
||||
current_app.logger.warning(
|
||||
"Too many verify codes created for user {}".format(user_to_send_to.id)
|
||||
)
|
||||
else:
|
||||
data = request.get_json()
|
||||
if code_type == SMS_TYPE:
|
||||
@@ -277,21 +297,21 @@ def send_user_2fa_code(user_id, code_type):
|
||||
else:
|
||||
abort(404)
|
||||
|
||||
return '{}', 204
|
||||
return "{}", 204
|
||||
|
||||
|
||||
def send_user_sms_code(user_to_send_to, data):
|
||||
recipient = data.get('to') or user_to_send_to.mobile_number
|
||||
recipient = data.get("to") or user_to_send_to.mobile_number
|
||||
|
||||
secret_code = create_secret_code()
|
||||
personalisation = {'verify_code': secret_code}
|
||||
personalisation = {"verify_code": secret_code}
|
||||
|
||||
create_2fa_code(
|
||||
current_app.config['SMS_CODE_TEMPLATE_ID'],
|
||||
current_app.config["SMS_CODE_TEMPLATE_ID"],
|
||||
user_to_send_to,
|
||||
secret_code,
|
||||
recipient,
|
||||
personalisation
|
||||
personalisation,
|
||||
)
|
||||
|
||||
|
||||
@@ -300,20 +320,27 @@ def send_user_email_code(user_to_send_to, data):
|
||||
|
||||
secret_code = str(uuid.uuid4())
|
||||
personalisation = {
|
||||
'name': user_to_send_to.name,
|
||||
'url': _create_2fa_url(user_to_send_to, secret_code, data.get('next'), data.get('email_auth_link_host'))
|
||||
"name": user_to_send_to.name,
|
||||
"url": _create_2fa_url(
|
||||
user_to_send_to,
|
||||
secret_code,
|
||||
data.get("next"),
|
||||
data.get("email_auth_link_host"),
|
||||
),
|
||||
}
|
||||
|
||||
create_2fa_code(
|
||||
current_app.config['EMAIL_2FA_TEMPLATE_ID'],
|
||||
current_app.config["EMAIL_2FA_TEMPLATE_ID"],
|
||||
user_to_send_to,
|
||||
secret_code,
|
||||
recipient,
|
||||
personalisation
|
||||
personalisation,
|
||||
)
|
||||
|
||||
|
||||
def create_2fa_code(template_id, user_to_send_to, secret_code, recipient, personalisation):
|
||||
def create_2fa_code(
|
||||
template_id, user_to_send_to, secret_code, recipient, personalisation
|
||||
):
|
||||
template = dao_get_template_by_id(template_id)
|
||||
|
||||
# save the code in the VerifyCode table
|
||||
@@ -332,7 +359,7 @@ def create_2fa_code(template_id, user_to_send_to, secret_code, recipient, person
|
||||
notification_type=template.template_type,
|
||||
api_key_id=None,
|
||||
key_type=KEY_TYPE_NORMAL,
|
||||
reply_to_text=reply_to
|
||||
reply_to_text=reply_to,
|
||||
)
|
||||
# Assume that we never want to observe the Notify service's research mode
|
||||
# setting for this notification - we still need to be able to log into the
|
||||
@@ -340,50 +367,58 @@ def create_2fa_code(template_id, user_to_send_to, secret_code, recipient, person
|
||||
send_notification_to_queue(saved_notification, False, queue=QueueNames.NOTIFY)
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/change-email-verification', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>/change-email-verification", methods=["POST"])
|
||||
def send_user_confirm_new_email(user_id):
|
||||
user_to_send_to = get_user_by_id(user_id=user_id)
|
||||
|
||||
email = email_data_request_schema.load(request.get_json())
|
||||
|
||||
template = dao_get_template_by_id(current_app.config['CHANGE_EMAIL_CONFIRMATION_TEMPLATE_ID'])
|
||||
service = Service.query.get(current_app.config['NOTIFY_SERVICE_ID'])
|
||||
template = dao_get_template_by_id(
|
||||
current_app.config["CHANGE_EMAIL_CONFIRMATION_TEMPLATE_ID"]
|
||||
)
|
||||
service = Service.query.get(current_app.config["NOTIFY_SERVICE_ID"])
|
||||
|
||||
saved_notification = persist_notification(
|
||||
template_id=template.id,
|
||||
template_version=template.version,
|
||||
recipient=email['email'],
|
||||
recipient=email["email"],
|
||||
service=service,
|
||||
personalisation={
|
||||
'name': user_to_send_to.name,
|
||||
'url': _create_confirmation_url(user=user_to_send_to, email_address=email['email']),
|
||||
'feedback_url': current_app.config['ADMIN_BASE_URL'] + '/support'
|
||||
"name": user_to_send_to.name,
|
||||
"url": _create_confirmation_url(
|
||||
user=user_to_send_to, email_address=email["email"]
|
||||
),
|
||||
"feedback_url": current_app.config["ADMIN_BASE_URL"] + "/support",
|
||||
},
|
||||
notification_type=template.template_type,
|
||||
api_key_id=None,
|
||||
key_type=KEY_TYPE_NORMAL,
|
||||
reply_to_text=service.get_default_reply_to_email_address()
|
||||
reply_to_text=service.get_default_reply_to_email_address(),
|
||||
)
|
||||
|
||||
send_notification_to_queue(saved_notification, False, queue=QueueNames.NOTIFY)
|
||||
return jsonify({}), 204
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/email-verification', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>/email-verification", methods=["POST"])
|
||||
def send_new_user_email_verification(user_id):
|
||||
current_app.logger.info('Sending email verification for user {}'.format(user_id))
|
||||
current_app.logger.info("Sending email verification for user {}".format(user_id))
|
||||
request_json = request.get_json()
|
||||
|
||||
# when registering, we verify all users' email addresses using this function
|
||||
user_to_send_to = get_user_by_id(user_id=user_id)
|
||||
current_app.logger.info('user_to_send_to is {}'.format(user_to_send_to))
|
||||
current_app.logger.info('user_to_send_to.email_address is {}'.format(user_to_send_to.email_address))
|
||||
current_app.logger.info("user_to_send_to is {}".format(user_to_send_to))
|
||||
current_app.logger.info(
|
||||
"user_to_send_to.email_address is {}".format(user_to_send_to.email_address)
|
||||
)
|
||||
|
||||
template = dao_get_template_by_id(current_app.config['NEW_USER_EMAIL_VERIFICATION_TEMPLATE_ID'])
|
||||
service = Service.query.get(current_app.config['NOTIFY_SERVICE_ID'])
|
||||
template = dao_get_template_by_id(
|
||||
current_app.config["NEW_USER_EMAIL_VERIFICATION_TEMPLATE_ID"]
|
||||
)
|
||||
service = Service.query.get(current_app.config["NOTIFY_SERVICE_ID"])
|
||||
|
||||
current_app.logger.info('template.id is {}'.format(template.id))
|
||||
current_app.logger.info('service.id is {}'.format(service.id))
|
||||
current_app.logger.info("template.id is {}".format(template.id))
|
||||
current_app.logger.info("service.id is {}".format(service.id))
|
||||
|
||||
saved_notification = persist_notification(
|
||||
template_id=template.id,
|
||||
@@ -391,73 +426,80 @@ def send_new_user_email_verification(user_id):
|
||||
recipient=user_to_send_to.email_address,
|
||||
service=service,
|
||||
personalisation={
|
||||
'name': user_to_send_to.name,
|
||||
'url': _create_verification_url(
|
||||
"name": user_to_send_to.name,
|
||||
"url": _create_verification_url(
|
||||
user_to_send_to,
|
||||
base_url=request_json.get('admin_base_url'),
|
||||
base_url=request_json.get("admin_base_url"),
|
||||
),
|
||||
},
|
||||
notification_type=template.template_type,
|
||||
api_key_id=None,
|
||||
key_type=KEY_TYPE_NORMAL,
|
||||
reply_to_text=service.get_default_reply_to_email_address()
|
||||
reply_to_text=service.get_default_reply_to_email_address(),
|
||||
)
|
||||
current_app.logger.info('Sending notification to queue')
|
||||
current_app.logger.info("Sending notification to queue")
|
||||
|
||||
send_notification_to_queue(saved_notification, False, queue=QueueNames.NOTIFY)
|
||||
|
||||
current_app.logger.info('Sent notification to queue')
|
||||
current_app.logger.info("Sent notification to queue")
|
||||
|
||||
return jsonify({}), 204
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/email-already-registered', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>/email-already-registered", methods=["POST"])
|
||||
def send_already_registered_email(user_id):
|
||||
current_app.logger.info('Email already registered for user {}'.format(user_id))
|
||||
current_app.logger.info("Email already registered for user {}".format(user_id))
|
||||
to = email_data_request_schema.load(request.get_json())
|
||||
|
||||
current_app.logger.info('To email is {}'.format(to['email']))
|
||||
current_app.logger.info("To email is {}".format(to["email"]))
|
||||
|
||||
template = dao_get_template_by_id(current_app.config['ALREADY_REGISTERED_EMAIL_TEMPLATE_ID'])
|
||||
service = Service.query.get(current_app.config['NOTIFY_SERVICE_ID'])
|
||||
template = dao_get_template_by_id(
|
||||
current_app.config["ALREADY_REGISTERED_EMAIL_TEMPLATE_ID"]
|
||||
)
|
||||
service = Service.query.get(current_app.config["NOTIFY_SERVICE_ID"])
|
||||
|
||||
current_app.logger.info('template.id is {}'.format(template.id))
|
||||
current_app.logger.info('service.id is {}'.format(service.id))
|
||||
current_app.logger.info("template.id is {}".format(template.id))
|
||||
current_app.logger.info("service.id is {}".format(service.id))
|
||||
|
||||
saved_notification = persist_notification(
|
||||
template_id=template.id,
|
||||
template_version=template.version,
|
||||
recipient=to['email'],
|
||||
recipient=to["email"],
|
||||
service=service,
|
||||
personalisation={
|
||||
'signin_url': current_app.config['ADMIN_BASE_URL'] + '/sign-in',
|
||||
'forgot_password_url': current_app.config['ADMIN_BASE_URL'] + '/forgot-password',
|
||||
'feedback_url': current_app.config['ADMIN_BASE_URL'] + '/support'
|
||||
"signin_url": current_app.config["ADMIN_BASE_URL"] + "/sign-in",
|
||||
"forgot_password_url": current_app.config["ADMIN_BASE_URL"]
|
||||
+ "/forgot-password",
|
||||
"feedback_url": current_app.config["ADMIN_BASE_URL"] + "/support",
|
||||
},
|
||||
notification_type=template.template_type,
|
||||
api_key_id=None,
|
||||
key_type=KEY_TYPE_NORMAL,
|
||||
reply_to_text=service.get_default_reply_to_email_address()
|
||||
reply_to_text=service.get_default_reply_to_email_address(),
|
||||
)
|
||||
|
||||
current_app.logger.info('Sending notification to queue')
|
||||
current_app.logger.info("Sending notification to queue")
|
||||
|
||||
send_notification_to_queue(saved_notification, False, queue=QueueNames.NOTIFY)
|
||||
|
||||
current_app.logger.info('Sent notification to queue')
|
||||
current_app.logger.info("Sent notification to queue")
|
||||
|
||||
return jsonify({}), 204
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>', methods=['GET'])
|
||||
@user_blueprint.route('', methods=['GET'])
|
||||
@user_blueprint.route("/<uuid:user_id>", methods=["GET"])
|
||||
@user_blueprint.route("", methods=["GET"])
|
||||
def get_user(user_id=None):
|
||||
users = get_user_by_id(user_id=user_id)
|
||||
result = [x.serialize() for x in users] if isinstance(users, list) else users.serialize()
|
||||
result = (
|
||||
[x.serialize() for x in users] if isinstance(users, list) else users.serialize()
|
||||
)
|
||||
return jsonify(data=result)
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/service/<uuid:service_id>/permission', methods=['POST'])
|
||||
@user_blueprint.route(
|
||||
"/<uuid:user_id>/service/<uuid:service_id>/permission", methods=["POST"]
|
||||
)
|
||||
def set_permissions(user_id, service_id):
|
||||
# TODO fix security hole, how do we verify that the user
|
||||
# who is making this request has permission to make the request.
|
||||
@@ -469,16 +511,18 @@ def set_permissions(user_id, service_id):
|
||||
validate(data, post_set_permissions_schema)
|
||||
|
||||
permission_list = [
|
||||
Permission(service_id=service_id, user_id=user_id, permission=p['permission'])
|
||||
for p in data['permissions']
|
||||
Permission(service_id=service_id, user_id=user_id, permission=p["permission"])
|
||||
for p in data["permissions"]
|
||||
]
|
||||
|
||||
permission_dao.set_user_service_permission(user, service, permission_list, _commit=True, replace=True)
|
||||
permission_dao.set_user_service_permission(
|
||||
user, service, permission_list, _commit=True, replace=True
|
||||
)
|
||||
|
||||
if 'folder_permissions' in data:
|
||||
if "folder_permissions" in data:
|
||||
folders = [
|
||||
dao_get_template_folder_by_id_and_service_id(folder_id, service_id)
|
||||
for folder_id in data['folder_permissions']
|
||||
for folder_id in data["folder_permissions"]
|
||||
]
|
||||
|
||||
service_user.folders = folders
|
||||
@@ -487,68 +531,68 @@ def set_permissions(user_id, service_id):
|
||||
return jsonify({}), 204
|
||||
|
||||
|
||||
@user_blueprint.route('/email', methods=['POST'])
|
||||
@user_blueprint.route("/email", methods=["POST"])
|
||||
def fetch_user_by_email():
|
||||
email = email_data_request_schema.load(request.get_json())
|
||||
|
||||
fetched_user = get_user_by_email(email['email'])
|
||||
fetched_user = get_user_by_email(email["email"])
|
||||
result = fetched_user.serialize()
|
||||
return jsonify(data=result)
|
||||
|
||||
|
||||
# TODO: Deprecate this GET endpoint
|
||||
@user_blueprint.route('/email', methods=['GET'])
|
||||
@user_blueprint.route("/email", methods=["GET"])
|
||||
def get_by_email():
|
||||
email = request.args.get('email')
|
||||
email = request.args.get("email")
|
||||
if not email:
|
||||
error = 'Invalid request. Email query string param required'
|
||||
error = "Invalid request. Email query string param required"
|
||||
raise InvalidRequest(error, status_code=400)
|
||||
fetched_user = get_user_by_email(email)
|
||||
result = fetched_user.serialize()
|
||||
return jsonify(data=result)
|
||||
|
||||
|
||||
@user_blueprint.route('/find-users-by-email', methods=['POST'])
|
||||
@user_blueprint.route("/find-users-by-email", methods=["POST"])
|
||||
def find_users_by_email():
|
||||
email = partial_email_data_request_schema.load(request.get_json())
|
||||
|
||||
fetched_users = get_users_by_partial_email(email['email'])
|
||||
fetched_users = get_users_by_partial_email(email["email"])
|
||||
result = [user.serialize_for_users_list() for user in fetched_users]
|
||||
return jsonify(data=result), 200
|
||||
|
||||
|
||||
@user_blueprint.route('/get-all-users', methods=['GET'])
|
||||
@user_blueprint.route("/get-all-users", methods=["GET"])
|
||||
def get_all_users():
|
||||
users = get_users()
|
||||
result = [user.serialize_for_users_list() for user in users]
|
||||
return jsonify(data=result), 200
|
||||
|
||||
|
||||
@user_blueprint.route('/reset-password', methods=['POST'])
|
||||
@user_blueprint.route("/reset-password", methods=["POST"])
|
||||
def send_user_reset_password():
|
||||
request_json = request.get_json()
|
||||
email = email_data_request_schema.load(request_json)
|
||||
|
||||
user_to_send_to = get_user_by_email(email['email'])
|
||||
template = dao_get_template_by_id(current_app.config['PASSWORD_RESET_TEMPLATE_ID'])
|
||||
service = Service.query.get(current_app.config['NOTIFY_SERVICE_ID'])
|
||||
user_to_send_to = get_user_by_email(email["email"])
|
||||
template = dao_get_template_by_id(current_app.config["PASSWORD_RESET_TEMPLATE_ID"])
|
||||
service = Service.query.get(current_app.config["NOTIFY_SERVICE_ID"])
|
||||
saved_notification = persist_notification(
|
||||
template_id=template.id,
|
||||
template_version=template.version,
|
||||
recipient=email['email'],
|
||||
recipient=email["email"],
|
||||
service=service,
|
||||
personalisation={
|
||||
'user_name': user_to_send_to.name,
|
||||
'url': _create_reset_password_url(
|
||||
"user_name": user_to_send_to.name,
|
||||
"url": _create_reset_password_url(
|
||||
user_to_send_to.email_address,
|
||||
base_url=request_json.get('admin_base_url'),
|
||||
next_redirect=request_json.get('next')
|
||||
)
|
||||
base_url=request_json.get("admin_base_url"),
|
||||
next_redirect=request_json.get("next"),
|
||||
),
|
||||
},
|
||||
notification_type=template.template_type,
|
||||
api_key_id=None,
|
||||
key_type=KEY_TYPE_NORMAL,
|
||||
reply_to_text=service.get_default_reply_to_email_address()
|
||||
reply_to_text=service.get_default_reply_to_email_address(),
|
||||
)
|
||||
|
||||
send_notification_to_queue(saved_notification, False, queue=QueueNames.NOTIFY)
|
||||
@@ -556,11 +600,11 @@ def send_user_reset_password():
|
||||
return jsonify({}), 204
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/update-password', methods=['POST'])
|
||||
@user_blueprint.route("/<uuid:user_id>/update-password", methods=["POST"])
|
||||
def update_password(user_id):
|
||||
user = get_user_by_id(user_id=user_id)
|
||||
req_json = request.get_json()
|
||||
password = req_json.get('_password')
|
||||
password = req_json.get("_password")
|
||||
|
||||
user_update_password_schema_load_json.load(req_json)
|
||||
|
||||
@@ -568,7 +612,7 @@ def update_password(user_id):
|
||||
return jsonify(data=user.serialize()), 200
|
||||
|
||||
|
||||
@user_blueprint.route('/<uuid:user_id>/organizations-and-services', methods=['GET'])
|
||||
@user_blueprint.route("/<uuid:user_id>/organizations-and-services", methods=["GET"])
|
||||
def get_organizations_and_services_for_user(user_id):
|
||||
user = get_user_and_accounts(user_id)
|
||||
data = get_orgs_and_services(user)
|
||||
@@ -576,52 +620,60 @@ def get_organizations_and_services_for_user(user_id):
|
||||
|
||||
|
||||
def _create_reset_password_url(email, next_redirect, base_url=None):
|
||||
data = json.dumps({'email': email, 'created_at': str(datetime.utcnow())})
|
||||
static_url_part = '/new-password/'
|
||||
full_url = url_with_token(data, static_url_part, current_app.config, base_url=base_url)
|
||||
data = json.dumps({"email": email, "created_at": str(datetime.utcnow())})
|
||||
static_url_part = "/new-password/"
|
||||
full_url = url_with_token(
|
||||
data, static_url_part, current_app.config, base_url=base_url
|
||||
)
|
||||
if next_redirect:
|
||||
full_url += '?{}'.format(urlencode({'next': next_redirect}))
|
||||
full_url += "?{}".format(urlencode({"next": next_redirect}))
|
||||
return full_url
|
||||
|
||||
|
||||
def _create_verification_url(user, base_url):
|
||||
data = json.dumps({'user_id': str(user.id), 'email': user.email_address})
|
||||
url = '/verify-email/'
|
||||
data = json.dumps({"user_id": str(user.id), "email": user.email_address})
|
||||
url = "/verify-email/"
|
||||
return url_with_token(data, url, current_app.config, base_url=base_url)
|
||||
|
||||
|
||||
def _create_confirmation_url(user, email_address):
|
||||
data = json.dumps({'user_id': str(user.id), 'email': email_address})
|
||||
url = '/user-profile/email/confirm/'
|
||||
data = json.dumps({"user_id": str(user.id), "email": email_address})
|
||||
url = "/user-profile/email/confirm/"
|
||||
return url_with_token(data, url, current_app.config)
|
||||
|
||||
|
||||
def _create_2fa_url(user, secret_code, next_redirect, email_auth_link_host):
|
||||
data = json.dumps({'user_id': str(user.id), 'secret_code': secret_code})
|
||||
url = '/email-auth/'
|
||||
full_url = url_with_token(data, url, current_app.config, base_url=email_auth_link_host)
|
||||
data = json.dumps({"user_id": str(user.id), "secret_code": secret_code})
|
||||
url = "/email-auth/"
|
||||
full_url = url_with_token(
|
||||
data, url, current_app.config, base_url=email_auth_link_host
|
||||
)
|
||||
if next_redirect:
|
||||
full_url += '?{}'.format(urlencode({'next': next_redirect}))
|
||||
full_url += "?{}".format(urlencode({"next": next_redirect}))
|
||||
return full_url
|
||||
|
||||
|
||||
def get_orgs_and_services(user):
|
||||
return {
|
||||
'organizations': [
|
||||
"organizations": [
|
||||
{
|
||||
'name': org.name,
|
||||
'id': org.id,
|
||||
'count_of_live_services': len(org.live_services),
|
||||
"name": org.name,
|
||||
"id": org.id,
|
||||
"count_of_live_services": len(org.live_services),
|
||||
}
|
||||
for org in user.organizations if org.active
|
||||
for org in user.organizations
|
||||
if org.active
|
||||
],
|
||||
'services': [
|
||||
"services": [
|
||||
{
|
||||
'id': service.id,
|
||||
'name': service.name,
|
||||
'restricted': service.restricted,
|
||||
'organization': service.organization.id if service.organization else None,
|
||||
"id": service.id,
|
||||
"name": service.name,
|
||||
"restricted": service.restricted,
|
||||
"organization": service.organization.id
|
||||
if service.organization
|
||||
else None,
|
||||
}
|
||||
for service in user.services if service.active
|
||||
]
|
||||
for service in user.services
|
||||
if service.active
|
||||
],
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user