darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-16 10:12:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge issues

Browse Source
This commit is contained in:
Martyn Inglis
2016-02-22 13:27:47 +00:00
parent 2c51535b7e
commit 530c8a2faa
3 changed files with 16 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/user/rest.py
View File

@@ -42,8 +42,8 @@ def create_user():
@user.route('/<int:user_id>', methods=['PUT'])
def update_user(user_id):
user = get_model_users(user_id=user_id)
if not user:
user_to_update = get_model_users(user_id=user_id)
if not user_to_update:
return jsonify(result="error", message="User not found"), 404
req_json = request.get_json()
@@ -110,6 +110,9 @@ def verify_user_code(user_id):
def send_user_sms_code(user_id):
user_to_send_to = get_model_users(user_id=user_id)
if not user_to_send_to:
return jsonify(result="error", message="No user found"), 404
verify_code, errors = request_verify_code_schema.load(request.get_json())
if errors:
return jsonify(result="error", message=errors), 400
@@ -129,7 +132,9 @@ def send_user_sms_code(user_id):
@user.route('/<int:user_id>/email-code', methods=['POST'])
def send_user_email_code(user_id):
user_to_send_to = get_model_users(user_id=user_id)
print(user_to_send_to)
if not user_to_send_to:
return jsonify(result="error", message="No user found"), 404
verify_code, errors = request_verify_code_schema.load(request.get_json())
if errors:
return jsonify(result="error", message=errors), 400
@@ -151,6 +156,9 @@ def send_user_email_code(user_id):
def send_user_code(user_id):
user_to_send_to = get_model_users(user_id=user_id)
if not user_to_send_to:
return jsonify(result="error", message="not found"), 404
verify_code, errors = old_request_verify_code_schema.load(request.get_json())
if errors:
return jsonify(result="error", message=errors), 400