darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 18:31:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Invites are now working.

Browse Source 
Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-11-07 08:37:55 -05:00
parent 958c3cd61e
commit 70404a2a8b
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/dao/users_dao.py
View File

@@ -52,22 +52,15 @@ def get_login_gov_user(login_uuid, email_address):
current_app.logger.exception("Error getting login.gov user") current_app.logger.exception("Error getting login.gov user")
db.session.rollback() db.session.rollback()
print("In here instead!")
return user return user
# Remove this 1 July 2025, all users should have login.gov uuids by now # Remove this 1 July 2025, all users should have login.gov uuids by now
stmt = select(User).filter(User.email_address.ilike(email_address)) stmt = select(User).filter(User.email_address.ilike(email_address))
user = db.session.execute(stmt).scalars().first() user = db.session.execute(stmt).scalars().first()
print("*" * 80)
print(user)
if user: if user:
print(f"login_uuid: {login_uuid}")
save_user_attribute(user, {"login_uuid": login_uuid}) save_user_attribute(user, {"login_uuid": login_uuid})
return user return user
print("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% WTF")
return None return None

2
app/service/rest.py
View File

@@ -373,7 +373,7 @@ def add_user_to_service(service_id, user_id):
service = dao_fetch_service_by_id(service_id) service = dao_fetch_service_by_id(service_id)
user = get_user_by_id(user_id=user_id) user = get_user_by_id(user_id=user_id)
if user in service.users: if user in service.users:
error = "User id: {} already part of service id: {}".format(user_id, service_id) error = f"User id: {user_id} already part of service id: {service_id}"
raise InvalidRequest(error, status_code=400) raise InvalidRequest(error, status_code=400)
data = request.get_json() data = request.get_json()

6
app/service_invite/rest.py
View File

@@ -87,6 +87,8 @@ def _create_service_invite(invited_user, nonce, state):
) )
send_notification_to_queue(saved_notification, queue=QueueNames.NOTIFY) send_notification_to_queue(saved_notification, queue=QueueNames.NOTIFY)
return data
@service_invite.route("/service/<service_id>/invite", methods=["POST"]) @service_invite.route("/service/<service_id>/invite", methods=["POST"])
def create_invited_user(service_id): def create_invited_user(service_id):
@@ -105,9 +107,9 @@ def create_invited_user(service_id):
invited_user = invited_user_schema.load(request_json) invited_user = invited_user_schema.load(request_json)
save_invited_user(invited_user) save_invited_user(invited_user)
_create_service_invite(invited_user, nonce, state) invite_data = _create_service_invite(invited_user, nonce, state)
return jsonify(data=invited_user_schema.dump(invited_user)), 201 return jsonify(data=invited_user_schema.dump(invited_user), invite=invite_data), 201
@service_invite.route("/service/<service_id>/invite/expired", methods=["GET"]) @service_invite.route("/service/<service_id>/invite/expired", methods=["GET"])