Skip to content

Commit 1eb6021

Browse files
committed
remove default SMTP server, user, and pass
1 parent bf7fee2 commit 1eb6021

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

backend/onyx/configs/app_configs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,10 @@
210210
REQUIRE_EMAIL_VERIFICATION = (
211211
os.environ.get("REQUIRE_EMAIL_VERIFICATION", "").lower() == "true"
212212
)
213-
SMTP_SERVER = os.environ.get("SMTP_SERVER") or "smtp.gmail.com"
213+
SMTP_SERVER = os.environ.get("SMTP_SERVER") or None
214214
SMTP_PORT = int(os.environ.get("SMTP_PORT") or "587")
215-
SMTP_USER = os.environ.get("SMTP_USER", "your-email@gmail.com")
216-
SMTP_PASS = os.environ.get("SMTP_PASS", "your-gmail-password")
215+
SMTP_USER = os.environ.get("SMTP_USER") or None
216+
SMTP_PASS = os.environ.get("SMTP_PASS") or None
217217
EMAIL_FROM = os.environ.get("EMAIL_FROM") or SMTP_USER
218218

219219
SENDGRID_API_KEY = os.environ.get("SENDGRID_API_KEY") or ""

backend/onyx/server/manage/models.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636

3737

3838
class EmailInviteStatus(str, Enum):
39-
sent = "sent"
40-
not_configured = "not_configured"
41-
send_failed = "send_failed"
42-
disabled = "disabled"
39+
SENT = "SENT"
40+
NOT_CONFIGURED = "NOT_CONFIGURED"
41+
SEND_FAILED = "SEND_FAILED"
42+
DISABLED = "DISABLED"
4343

4444

4545
class BulkInviteResponse(BaseModel):

backend/onyx/server/manage/users.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,17 +431,17 @@ def bulk_invite_users(
431431

432432
# send out email invitations only to new users (not already invited or existing)
433433
if not ENABLE_EMAIL_INVITES:
434-
email_invite_status = EmailInviteStatus.disabled
434+
email_invite_status = EmailInviteStatus.DISABLED
435435
elif not EMAIL_CONFIGURED:
436-
email_invite_status = EmailInviteStatus.not_configured
436+
email_invite_status = EmailInviteStatus.NOT_CONFIGURED
437437
else:
438438
try:
439439
for email in emails_needing_seats:
440440
send_user_email_invite(email, current_user, AUTH_TYPE)
441-
email_invite_status = EmailInviteStatus.sent
441+
email_invite_status = EmailInviteStatus.SENT
442442
except Exception as e:
443443
logger.error(f"Error sending email invite to invited users: {e}")
444-
email_invite_status = EmailInviteStatus.send_failed
444+
email_invite_status = EmailInviteStatus.SEND_FAILED
445445

446446
if not MULTI_TENANT or DEV_MODE:
447447
return BulkInviteResponse(

backend/tests/unit/onyx/server/manage/test_bulk_invite_limit.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def test_trial_tenant_can_invite_within_limit(*_mocks: None) -> None:
4848
result = bulk_invite_users(emails=emails)
4949

5050
assert result.invited_count == 3
51-
assert result.email_invite_status == EmailInviteStatus.disabled
51+
assert result.email_invite_status == EmailInviteStatus.DISABLED
5252

5353

5454
# --- email_invite_status tests ---
@@ -75,7 +75,7 @@ def test_email_invite_status_disabled(*_mocks: None) -> None:
7575
"""When email invites are disabled, status is disabled."""
7676
result = bulk_invite_users(emails=["user@example.com"])
7777

78-
assert result.email_invite_status == EmailInviteStatus.disabled
78+
assert result.email_invite_status == EmailInviteStatus.DISABLED
7979

8080

8181
@_with_common_patches
@@ -85,7 +85,7 @@ def test_email_invite_status_not_configured(*_mocks: None) -> None:
8585
"""When email invites are enabled but no server is configured, status is not_configured."""
8686
result = bulk_invite_users(emails=["user@example.com"])
8787

88-
assert result.email_invite_status == EmailInviteStatus.not_configured
88+
assert result.email_invite_status == EmailInviteStatus.NOT_CONFIGURED
8989

9090

9191
@_with_common_patches
@@ -97,7 +97,7 @@ def test_email_invite_status_sent(mock_send: MagicMock, *_mocks: None) -> None:
9797
result = bulk_invite_users(emails=["user@example.com"])
9898

9999
mock_send.assert_called_once()
100-
assert result.email_invite_status == EmailInviteStatus.sent
100+
assert result.email_invite_status == EmailInviteStatus.SENT
101101

102102

103103
@_with_common_patches
@@ -111,5 +111,5 @@ def test_email_invite_status_send_failed(*_mocks: None) -> None:
111111
"""When email sending throws, status is send_failed and invite is still saved."""
112112
result = bulk_invite_users(emails=["user@example.com"])
113113

114-
assert result.email_invite_status == EmailInviteStatus.send_failed
114+
assert result.email_invite_status == EmailInviteStatus.SEND_FAILED
115115
assert result.invited_count == 1

web/src/app/admin/users/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,11 @@ function AddUserButton() {
273273
);
274274
setBulkAddUsersModal(false);
275275
toast.success("Users invited!");
276-
if (emailInviteStatus === "not_configured") {
276+
if (emailInviteStatus === "NOT_CONFIGURED") {
277277
toast.warning(
278278
"No email server is configured. Share the signup link with invited users manually."
279279
);
280-
} else if (emailInviteStatus === "send_failed") {
280+
} else if (emailInviteStatus === "SEND_FAILED") {
281281
toast.warning(
282282
"Email sending failed. Check your SMTP/SendGrid configuration."
283283
);

0 commit comments

Comments
 (0)