mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-04 18:31:13 -05:00
Invites are now working.
Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
@@ -52,22 +52,15 @@ def get_login_gov_user(login_uuid, email_address):
|
||||
current_app.logger.exception("Error getting login.gov user")
|
||||
db.session.rollback()
|
||||
|
||||
print("In here instead!")
|
||||
return user
|
||||
# Remove this 1 July 2025, all users should have login.gov uuids by now
|
||||
stmt = select(User).filter(User.email_address.ilike(email_address))
|
||||
user = db.session.execute(stmt).scalars().first()
|
||||
|
||||
print("*" * 80)
|
||||
print(user)
|
||||
|
||||
if user:
|
||||
print(f"login_uuid: {login_uuid}")
|
||||
save_user_attribute(user, {"login_uuid": login_uuid})
|
||||
return user
|
||||
|
||||
print("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% WTF")
|
||||
|
||||
return None
|
||||
|
||||
|
||||
|
||||
@@ -373,7 +373,7 @@ def add_user_to_service(service_id, user_id):
|
||||
service = dao_fetch_service_by_id(service_id)
|
||||
user = get_user_by_id(user_id=user_id)
|
||||
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)
|
||||
|
||||
data = request.get_json()
|
||||
|
||||
@@ -87,6 +87,8 @@ def _create_service_invite(invited_user, nonce, state):
|
||||
)
|
||||
send_notification_to_queue(saved_notification, queue=QueueNames.NOTIFY)
|
||||
|
||||
return data
|
||||
|
||||
|
||||
@service_invite.route("/service/<service_id>/invite", methods=["POST"])
|
||||
def create_invited_user(service_id):
|
||||
@@ -105,9 +107,9 @@ def create_invited_user(service_id):
|
||||
invited_user = invited_user_schema.load(request_json)
|
||||
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"])
|
||||
|
||||
Reference in New Issue
Block a user