highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-06-27 00:11:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

update email invites (#3349)

Browse Source
This commit is contained in:
pablodanswer 2024-12-04 19:29:07 -08:00 committed by GitHub
parent e70e0ab859
commit c89b98b4f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/danswer/server/manage/users.py
View File

@ -194,11 +194,11 @@ def bulk_invite_users(
) )
tenant_id = CURRENT_TENANT_ID_CONTEXTVAR.get() tenant_id = CURRENT_TENANT_ID_CONTEXTVAR.get()
normalized_emails = [] new_invited_emails = []
try: try:
for email in emails: for email in emails:
email_info = validate_email(email) email_info = validate_email(email)
normalized_emails.append(email_info.normalized) # type: ignore new_invited_emails.append(email_info.normalized)
except (EmailUndeliverableError, EmailNotValidError) as e: except (EmailUndeliverableError, EmailNotValidError) as e:
raise HTTPException( raise HTTPException(
@ -210,7 +210,7 @@ def bulk_invite_users(
try: try:
fetch_ee_implementation_or_noop( fetch_ee_implementation_or_noop(
"danswer.server.tenants.provisioning", "add_users_to_tenant", None "danswer.server.tenants.provisioning", "add_users_to_tenant", None
)(normalized_emails, tenant_id) )(new_invited_emails, tenant_id)
except IntegrityError as e: except IntegrityError as e:
if isinstance(e.orig, UniqueViolation): if isinstance(e.orig, UniqueViolation):
@ -224,7 +224,7 @@ def bulk_invite_users(
initial_invited_users = get_invited_users() initial_invited_users = get_invited_users()
all_emails = list(set(normalized_emails) | set(initial_invited_users)) all_emails = list(set(new_invited_emails) | set(initial_invited_users))
number_of_invited_users = write_invited_users(all_emails) number_of_invited_users = write_invited_users(all_emails)
if not MULTI_TENANT: if not MULTI_TENANT:
@ -236,7 +236,7 @@ def bulk_invite_users(
)(CURRENT_TENANT_ID_CONTEXTVAR.get(), get_total_users_count(db_session)) )(CURRENT_TENANT_ID_CONTEXTVAR.get(), get_total_users_count(db_session))
if ENABLE_EMAIL_INVITES: if ENABLE_EMAIL_INVITES:
try: try:
for email in all_emails: for email in new_invited_emails:
send_user_email_invite(email, current_user) send_user_email_invite(email, current_user)
except Exception as e: except Exception as e:
logger.error(f"Error sending email invite to invited users: {e}") logger.error(f"Error sending email invite to invited users: {e}")
@ -250,7 +250,7 @@ def bulk_invite_users(
write_invited_users(initial_invited_users) # Reset to original state write_invited_users(initial_invited_users) # Reset to original state
fetch_ee_implementation_or_noop( fetch_ee_implementation_or_noop(
"danswer.server.tenants.user_mapping", "remove_users_from_tenant", None "danswer.server.tenants.user_mapping", "remove_users_from_tenant", None
)(normalized_emails, tenant_id) )(new_invited_emails, tenant_id)
raise e raise e