Skip to content

Commit b41272e

Browse files
fix: remove send_email flag everywhere
1 parent fb6b9e3 commit b41272e

File tree

6 files changed

+16
-17
lines changed

6 files changed

+16
-17
lines changed

config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class Settings(BaseSettings):
1616
jwt_secret_key: str
1717
auth0_algorithms: list[str] = ["RS256"]
1818
admin_roles: list[str] = []
19-
send_email: bool = False
2019
# Note we process this separately in app startup as it needs
2120
# to be available before the app starts
2221
cors_allowed_origins: str

routers/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ def approve_group_membership(user_id: Annotated[str, UserIdParam],
638638
client=client,
639639
db_session=db_session,
640640
)
641-
if status_changed and settings.send_email and membership.user and membership.user.email:
641+
if status_changed and membership.user and membership.user.email:
642642
background_tasks.add_task(
643643
send_group_membership_approved_email,
644644
membership.user.email,

routers/biocommons_groups.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,16 @@ def request_group_access(
7070
updated_by=None
7171
)
7272
membership.save(session=db_session, commit=True)
73-
if settings.send_email:
74-
logger.info("Sending emails to group admins for approval")
75-
admin_emails = membership.group.get_admins(auth0_client=auth0_client)
76-
for email in admin_emails:
77-
background_tasks.add_task(send_group_approval_email,
78-
approver_email=email, request=membership, email_service=email_service, settings=settings)
73+
logger.info("Sending emails to group admins for approval")
74+
admin_emails = membership.group.get_admins(auth0_client=auth0_client)
75+
for email in admin_emails:
76+
background_tasks.add_task(
77+
send_group_approval_email,
78+
approver_email=email,
79+
request=membership,
80+
email_service=email_service,
81+
settings=settings,
82+
)
7983
return {"message": f"Group membership for {group_id} requested successfully."}
8084

8185

@@ -118,7 +122,7 @@ def approve_group_access(
118122
membership.save(session=db_session, commit=True)
119123
if membership.user is None:
120124
db_session.refresh(membership, attribute_names=["user"])
121-
if settings.send_email and membership.user and membership.user.email:
125+
if membership.user and membership.user.email:
122126
background_tasks.add_task(
123127
send_group_membership_approved_email,
124128
membership.user.email,

routers/biocommons_register.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,8 @@ async def register_biocommons_user(
104104
auth0_client=auth0_client
105105
)
106106
# Send approval email in the background
107-
if bundle is not None:
108-
if settings.send_email and not bundle.group_auto_approve:
109-
background_tasks.add_task(send_approval_email, registration, settings)
107+
if bundle is not None and not bundle.group_auto_approve:
108+
background_tasks.add_task(send_approval_email, registration, settings)
110109

111110
logger.info(
112111
f"Successfully registered biocommons user: {auth0_user_data.user_id}"

routers/sbp_register.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@ async def register_sbp_user(
9797
_create_sbp_user_record(auth0_user_data, auth0_client=auth0_client, session=db_session)
9898

9999
# Send approval email in the background
100-
if settings.send_email:
101-
background_tasks.add_task(send_approval_email, registration, settings)
102-
logger.info("Approval email queued for sending")
100+
background_tasks.add_task(send_approval_email, registration, settings)
101+
logger.info("Bundle approval email queued for sending")
103102

104103
return {"message": "User registered successfully. Approval pending.", "user": auth0_user_data.model_dump(mode="json")}
105104

tests/conftest.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ def mock_settings():
135135
auth0_db_connection="Username-Password-Authentication",
136136
jwt_secret_key="mock-secret-key",
137137
cors_allowed_origins="https://test",
138-
send_email=False,
139138
admin_roles=["Admin"],
140139
auth0_algorithms=["RS256"]
141140
)
@@ -174,7 +173,6 @@ def test_client_with_email(mock_settings, mock_galaxy_settings):
174173
"""
175174
Create a test client with email sending enabled.
176175
"""
177-
mock_settings.send_email = True
178176
# Define override
179177
def override_settings():
180178
return mock_settings

0 commit comments

Comments
 (0)