public_git/bambuddy
1
0
Fork 0
mirror of https://github.com/maziggy/bambuddy.git synced 2026-10-18 11:56:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update email settings to match notification provider fields and rename tab to Global Email

Browse Source 
Co-authored-by: cadtoolbox <12723486+cadtoolbox@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-02-08 23:03:28 +00:00
co-authored by cadtoolbox
parent bb9c35ef03
commit 3231a487c9
9 changed files with 253 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/api/routes/auth.py
+2 -1
View File
@@ -351,7 +351,8 @@ async def test_smtp_connection(
smtp_port=test_request.smtp_port,
smtp_username=test_request.smtp_username,
smtp_password=test_request.smtp_password,
smtp_use_tls=test_request.smtp_use_tls,
smtp_security=test_request.smtp_security,
smtp_auth_enabled=test_request.smtp_auth_enabled,
smtp_from_email=test_request.smtp_from_email,
)
backend/app/schemas/auth.py
+12 -6
View File
@@ -89,21 +89,27 @@ class ResetPasswordResponse(BaseModel):
class SMTPSettings(BaseModel):
smtp_host: str
smtp_port: int
smtp_username: str
smtp_password: str | None = None # Optional for read operations
smtp_use_tls: bool = True
smtp_username: str | None = None # Optional when auth is disabled
smtp_password: str | None = None # Optional for read operations or when auth is disabled
smtp_security: str = "starttls" # 'starttls', 'ssl', 'none'
smtp_auth_enabled: bool = True
smtp_from_email: str
smtp_from_name: str = "BamBuddy"
# Deprecated field for backward compatibility
smtp_use_tls: bool | None = None
class TestSMTPRequest(BaseModel):
smtp_host: str
smtp_port: int
smtp_username: str
smtp_password: str
smtp_use_tls: bool = True
smtp_username: str | None = None # Optional when auth is disabled
smtp_password: str | None = None # Optional when auth is disabled
smtp_security: str = "starttls" # 'starttls', 'ssl', 'none'
smtp_auth_enabled: bool = True
smtp_from_email: str
test_recipient: str
# Deprecated field for backward compatibility
smtp_use_tls: bool | None = None
class TestSMTPResponse(BaseModel):
backend/app/services/email_service.py
+38 -13
View File
@@ -71,6 +71,8 @@ async def get_smtp_settings(db: AsyncSession) -> SMTPSettings | None:
"smtp_username",
"smtp_password",
"smtp_use_tls",
"smtp_security",
"smtp_auth_enabled",
"smtp_from_email",
"smtp_from_name",
])
@@ -79,16 +81,26 @@ async def get_smtp_settings(db: AsyncSession) -> SMTPSettings | None:
settings_dict = {s.key: s.value for s in result.scalars().all()}
# Check if minimum required settings are present
required_keys = ["smtp_host", "smtp_port", "smtp_username", "smtp_from_email"]
required_keys = ["smtp_host", "smtp_port", "smtp_from_email"]
if not all(key in settings_dict for key in required_keys):
return None
# Handle migration: convert old smtp_use_tls to smtp_security if needed
smtp_security = settings_dict.get("smtp_security")
if not smtp_security:
# Migrate from old smtp_use_tls format
smtp_use_tls = settings_dict.get("smtp_use_tls", "true").lower() == "true"
smtp_security = "starttls" if smtp_use_tls else "ssl"
smtp_auth_enabled = settings_dict.get("smtp_auth_enabled", "true").lower() == "true"
return SMTPSettings(
smtp_host=settings_dict["smtp_host"],
smtp_port=int(settings_dict["smtp_port"]),
smtp_username=settings_dict["smtp_username"],
smtp_username=settings_dict.get("smtp_username"),
smtp_password=settings_dict.get("smtp_password"),
smtp_use_tls=settings_dict.get("smtp_use_tls", "true").lower() == "true",
smtp_security=smtp_security,
smtp_auth_enabled=smtp_auth_enabled,
smtp_from_email=settings_dict["smtp_from_email"],
smtp_from_name=settings_dict.get("smtp_from_name", "BamBuddy"),
)
@@ -107,12 +119,16 @@ async def save_smtp_settings(db: AsyncSession, smtp_settings: SMTPSettings) -> N
settings_data = {
"smtp_host": smtp_settings.smtp_host,
"smtp_port": str(smtp_settings.smtp_port),
"smtp_username": smtp_settings.smtp_username,
"smtp_use_tls": "true" if smtp_settings.smtp_use_tls else "false",
"smtp_security": smtp_settings.smtp_security,
"smtp_auth_enabled": "true" if smtp_settings.smtp_auth_enabled else "false",
"smtp_from_email": smtp_settings.smtp_from_email,
"smtp_from_name": smtp_settings.smtp_from_name,
}
# Only save username if auth is enabled or if provided
if smtp_settings.smtp_username:
settings_data["smtp_username"] = smtp_settings.smtp_username
# Only save password if provided
if smtp_settings.smtp_password:
settings_data["smtp_password"] = smtp_settings.smtp_password
@@ -159,18 +175,27 @@ def send_email(
# Send email
try:
if smtp_settings.smtp_use_tls:
# Use TLS (port 587 typically)
security = smtp_settings.smtp_security
auth_enabled = smtp_settings.smtp_auth_enabled
if security == "ssl":
# Direct SSL connection (typically port 465)
with smtplib.SMTP_SSL(smtp_settings.smtp_host, smtp_settings.smtp_port, timeout=10) as server:
if auth_enabled and smtp_settings.smtp_password:
server.login(smtp_settings.smtp_username or "", smtp_settings.smtp_password)
server.send_message(msg)
elif security == "starttls":
# STARTTLS upgrade (typically port 587)
with smtplib.SMTP(smtp_settings.smtp_host, smtp_settings.smtp_port, timeout=10) as server:
server.starttls()
if smtp_settings.smtp_password:
server.login(smtp_settings.smtp_username, smtp_settings.smtp_password)
if auth_enabled and smtp_settings.smtp_password:
server.login(smtp_settings.smtp_username or "", smtp_settings.smtp_password)
server.send_message(msg)
else:
# Use SSL (port 465 typically) or no encryption
with smtplib.SMTP_SSL(smtp_settings.smtp_host, smtp_settings.smtp_port, timeout=10) as server:
if smtp_settings.smtp_password:
server.login(smtp_settings.smtp_username, smtp_settings.smtp_password)
# No encryption (typically port 25) - use with caution
with smtplib.SMTP(smtp_settings.smtp_host, smtp_settings.smtp_port, timeout=10) as server:
if auth_enabled and smtp_settings.smtp_password:
server.login(smtp_settings.smtp_username or "", smtp_settings.smtp_password)
server.send_message(msg)
logger.info(f"Email sent successfully to {to_email}")
except Exception as e:
frontend/package-lock.json
Generated
+34 -20
View File
@@ -143,6 +143,7 @@
"integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/code-frame": "^7.27.1",
"@babel/generator": "^7.28.5",
@@ -496,6 +497,7 @@
"url": "https://opencollective.com/csstools"
}
],
"peer": true,
"engines": {
"node": ">=18"
},
@@ -518,6 +520,7 @@
"url": "https://opencollective.com/csstools"
}
],
"peer": true,
"engines": {
"node": ">=18"
}
@@ -545,6 +548,7 @@
"resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
"integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
"license": "MIT",
"peer": true,
"dependencies": {
"@dnd-kit/accessibility": "^3.1.1",
"@dnd-kit/utilities": "^3.2.2",
@@ -1190,16 +1194,6 @@
"@floating-ui/utils": "^0.2.10"
}
},
"node_modules/@floating-ui/dom": {
"version": "1.7.4",
"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
"integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
"optional": true,
"dependencies": {
"@floating-ui/core": "^1.7.3",
"@floating-ui/utils": "^0.2.10"
}
},
"node_modules/@floating-ui/utils": {
"version": "0.2.10",
"resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
@@ -2312,6 +2306,7 @@
"resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.11.1.tgz",
"integrity": "sha512-q7uzYrCq40JOIi6lceWe2HuA8tSr97iPwP/xtJd0bZjyL1rWhUyqxMb7y+aq4RcELrx/aNRa2JIvLtRRdy02Dg==",
"license": "MIT",
"peer": true,
"funding": {
"type": "github",
"url": "https://github.com/sponsors/ueberdosis"
@@ -2560,6 +2555,7 @@
"resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.11.1.tgz",
"integrity": "sha512-XJRN9pOPMi3SsaKv4qM8WBEi3YDrjXYtYlAlZutQe1JpdKykSjLwwYq7k3V8UHqR3YKxyOV8HTYOYoOaZ9TMTQ==",
"license": "MIT",
"peer": true,
"funding": {
"type": "github",
"url": "https://github.com/sponsors/ueberdosis"
@@ -2665,6 +2661,7 @@
"resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.11.1.tgz",
"integrity": "sha512-KLLrABvf609/Z4dPChRowvpqeefYiq5csEj4Ogfp4EFd3KqDvPZIoFepau1+BW4gOAlm8UK+ig+fOLgnUzH7ww==",
"license": "MIT",
"peer": true,
"funding": {
"type": "github",
"url": "https://github.com/sponsors/ueberdosis"
@@ -2691,6 +2688,7 @@
"resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.11.1.tgz",
"integrity": "sha512-/xXJdV+EVvSQv2slvAUChb5iGVv5K0EqBqxPGAAuBHdIc4Y7Id1aaKKSiyDmqon+kjSnnQIIda9oUt+o/Z66uA==",
"license": "MIT",
"peer": true,
"funding": {
"type": "github",
"url": "https://github.com/sponsors/ueberdosis"
@@ -2705,6 +2703,7 @@
"resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.11.1.tgz",
"integrity": "sha512-8RIUhlEoCFGsbdNb+EUdQctG1Wnd7rl4wlMLS6giO7UcZT5dVfg625eMZVrl0/kA7JBJdKLIuqNmzzQ0MxsJEw==",
"license": "MIT",
"peer": true,
"dependencies": {
"prosemirror-changeset": "^2.3.0",
"prosemirror-collab": "^1.3.1",
@@ -2803,8 +2802,7 @@
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
"integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
"dev": true,
"peer": true
"dev": true
},
"node_modules/@types/babel__core": {
"version": "7.20.5",
@@ -2972,6 +2970,7 @@
"integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"undici-types": "~7.16.0"
}
@@ -2981,6 +2980,7 @@
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
"integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
"license": "MIT",
"peer": true,
"dependencies": {
"csstype": "^3.2.2"
}
@@ -2990,6 +2990,7 @@
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz",
"integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
"license": "MIT",
"peer": true,
"peerDependencies": {
"@types/react": "^19.2.0"
}
@@ -3079,6 +3080,7 @@
"integrity": "sha512-jCzKdm/QK0Kg4V4IK/oMlRZlY+QOcdjv89U2NgKHZk1CYTj82/RVSx1mV/0gqCVMJ/DA+Zf/S4NBWNF8GQ+eqQ==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@typescript-eslint/scope-manager": "8.48.0",
"@typescript-eslint/types": "8.48.0",
@@ -3477,6 +3479,7 @@
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -3677,6 +3680,7 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"baseline-browser-mapping": "^2.8.25",
"caniuse-lite": "^1.0.30001754",
@@ -4239,8 +4243,7 @@
"version": "0.5.16",
"resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
"integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
"dev": true,
"peer": true
"dev": true
},
"node_modules/dunder-proto": {
"version": "1.0.1",
@@ -4432,6 +4435,7 @@
"integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.8.0",
"@eslint-community/regexpp": "^4.12.1",
@@ -5119,6 +5123,7 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.28.4"
},
@@ -5891,7 +5896,6 @@
"resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
"integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
"dev": true,
"peer": true,
"bin": {
"lz-string": "bin/bin.js"
}
@@ -6380,6 +6384,7 @@
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=12"
},
@@ -6407,6 +6412,7 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"nanoid": "^3.3.11",
"picocolors": "^1.1.1",
@@ -6438,7 +6444,6 @@
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
"integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
"dev": true,
"peer": true,
"dependencies": {
"ansi-regex": "^5.0.1",
"ansi-styles": "^5.0.0",
@@ -6453,7 +6458,6 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
"dev": true,
"peer": true,
"engines": {
"node": ">=10"
},
@@ -6465,8 +6469,7 @@
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
"dev": true,
"peer": true
"dev": true
},
"node_modules/process-nextick-args": {
"version": "2.0.1",
@@ -6586,6 +6589,7 @@
"resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.25.4.tgz",
"integrity": "sha512-PIM7E43PBxKce8OQeezAs9j4TP+5yDpZVbuurd1h5phUxEKIu+G2a+EUZzIC5nS1mJktDJWzbqS23n1tsAf5QA==",
"license": "MIT",
"peer": true,
"dependencies": {
"orderedmap": "^2.0.0"
}
@@ -6615,6 +6619,7 @@
"resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.4.tgz",
"integrity": "sha512-6jiYHH2CIGbCfnxdHbXZ12gySFY/fz/ulZE333G6bPqIZ4F+TXo9ifiR86nAHpWnfoNjOb3o5ESi7J8Uz1jXHw==",
"license": "MIT",
"peer": true,
"dependencies": {
"prosemirror-model": "^1.0.0",
"prosemirror-transform": "^1.0.0",
@@ -6663,6 +6668,7 @@
"resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.41.3.tgz",
"integrity": "sha512-SqMiYMUQNNBP9kfPhLO8WXEk/fon47vc52FQsUiJzTBuyjKgEcoAwMyF04eQ4WZ2ArMn7+ReypYL60aKngbACQ==",
"license": "MIT",
"peer": true,
"dependencies": {
"prosemirror-model": "^1.20.0",
"prosemirror-state": "^1.0.0",
@@ -6693,6 +6699,7 @@
"resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
"integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
"license": "MIT",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
@@ -6702,6 +6709,7 @@
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
"integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
"license": "MIT",
"peer": true,
"dependencies": {
"scheduler": "^0.27.0"
},
@@ -6748,6 +6756,7 @@
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
"integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
"license": "MIT",
"peer": true,
"dependencies": {
"@types/use-sync-external-store": "^0.0.6",
"use-sync-external-store": "^1.4.0"
@@ -6876,7 +6885,8 @@
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
"integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/redux-thunk": {
"version": "3.1.0",
@@ -7491,6 +7501,7 @@
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
"devOptional": true,
"license": "Apache-2.0",
"peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@@ -7629,6 +7640,7 @@
"integrity": "sha512-NL8jTlbo0Tn4dUEXEsUg8KeyG/Lkmc4Fnzb8JXN/Ykm9G4HNImjtABMJgkQoVjOBN/j2WAwDTRytdqJbZsah7w==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"esbuild": "^0.25.0",
"fdir": "^6.5.0",
@@ -7725,6 +7737,7 @@
"resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
"integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
"dev": true,
"peer": true,
"dependencies": {
"@types/chai": "^5.2.2",
"@vitest/expect": "3.2.4",
@@ -8136,6 +8149,7 @@
"integrity": "sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig==",
"dev": true,
"license": "MIT",
"peer": true,
"funding": {
"url": "https://github.com/sponsors/colinhacks"
}
frontend/src/api/client.ts
+7 -5
View File
@@ -1894,9 +1894,10 @@ export interface ResetPasswordResponse {
export interface SMTPSettings {
smtp_host: string;
smtp_port: number;
smtp_username: string;
smtp_username?: string;
smtp_password?: string;
smtp_use_tls: boolean;
smtp_security: 'starttls' | 'ssl' | 'none';
smtp_auth_enabled: boolean;
smtp_from_email: string;
smtp_from_name: string;
}
@@ -1904,9 +1905,10 @@ export interface SMTPSettings {
export interface TestSMTPRequest {
smtp_host: string;
smtp_port: number;
smtp_username: string;
smtp_password: string;
smtp_use_tls: boolean;
smtp_username?: string;
smtp_password?: string;
smtp_security: 'starttls' | 'ssl' | 'none';
smtp_auth_enabled: boolean;
smtp_from_email: string;
test_recipient: string;
}
frontend/src/components/EmailSettings.tsx
+146 -110
View File
@@ -19,7 +19,8 @@ export function EmailSettings() {
smtp_port: 587,
smtp_username: '',
smtp_password: '',
smtp_use_tls: true,
smtp_security: 'starttls',
smtp_auth_enabled: true,
smtp_from_email: '',
smtp_from_name: 'BamBuddy',
});
@@ -86,10 +87,15 @@ export function EmailSettings() {
const handleSave = () => {
// Validate required fields
if (!smtpSettings.smtp_host || !smtpSettings.smtp_username || !smtpSettings.smtp_from_email) {
if (!smtpSettings.smtp_host || !smtpSettings.smtp_from_email) {
showToast('Please fill in all required fields', 'error');
return;
}
// Validate auth fields when authentication is enabled
if (smtpSettings.smtp_auth_enabled && (!smtpSettings.smtp_username)) {
showToast('Username is required when authentication is enabled', 'error');
return;
}
saveMutation.mutate(smtpSettings);
};
@@ -98,8 +104,13 @@ export function EmailSettings() {
showToast('Please enter a test email address', 'error');
return;
}
if (!smtpSettings.smtp_host || !smtpSettings.smtp_username || !smtpSettings.smtp_password || !smtpSettings.smtp_from_email) {
showToast('Please fill in all SMTP settings before testing', 'error');
if (!smtpSettings.smtp_host || !smtpSettings.smtp_from_email) {
showToast('Please fill in SMTP Server and From Email before testing', 'error');
return;
}
// Validate auth fields when authentication is enabled
if (smtpSettings.smtp_auth_enabled && (!smtpSettings.smtp_username || !smtpSettings.smtp_password)) {
showToast('Username and Password are required when authentication is enabled', 'error');
return;
}
testMutation.mutate({
@@ -107,7 +118,8 @@ export function EmailSettings() {
smtp_port: smtpSettings.smtp_port,
smtp_username: smtpSettings.smtp_username,
smtp_password: smtpSettings.smtp_password,
smtp_use_tls: smtpSettings.smtp_use_tls,
smtp_security: smtpSettings.smtp_security,
smtp_auth_enabled: smtpSettings.smtp_auth_enabled,
smtp_from_email: smtpSettings.smtp_from_email,
test_recipient: testEmail,
});
@@ -131,73 +143,6 @@ export function EmailSettings() {
return (
<div className="space-y-6">
{/* Advanced Authentication Toggle */}
<Card>
<CardHeader>
<div className="flex items-center justify-between">
<div className="flex items-center gap-2">
<Mail className="w-5 h-5 text-bambu-green" />
<h2 className="text-lg font-semibold text-white">
{t('settings.email.advancedAuth') || 'Advanced Authentication'}
</h2>
</div>
<Button
onClick={handleToggleAdvancedAuth}
disabled={toggleAdvancedAuthMutation.isPending}
variant={advancedAuthStatus?.advanced_auth_enabled ? 'danger' : 'primary'}
>
{advancedAuthStatus?.advanced_auth_enabled ? (
<>
<Unlock className="w-4 h-4" />
{t('settings.email.disable') || 'Disable'}
</>
) : (
<>
<Lock className="w-4 h-4" />
{t('settings.email.enable') || 'Enable'}
</>
)}
</Button>
</div>
</CardHeader>
<CardContent>
<div className="space-y-4">
{advancedAuthStatus?.advanced_auth_enabled ? (
<div className="bg-green-500/10 border border-green-500/30 rounded-lg p-4">
<div className="flex items-start gap-3">
<CheckCircle className="w-5 h-5 text-green-400 mt-0.5 flex-shrink-0" />
<div className="space-y-2">
<p className="text-white font-medium">
{t('settings.email.advancedAuthEnabled') || 'Advanced Authentication is enabled'}
</p>
<ul className="text-sm text-green-300 space-y-1 list-disc list-inside">
<li>{t('settings.email.feature1') || 'Passwords are auto-generated and emailed to new users'}</li>
<li>{t('settings.email.feature2') || 'Users can login with username or email'}</li>
<li>{t('settings.email.feature3') || 'Forgot password feature is available'}</li>
<li>{t('settings.email.feature4') || 'Admins can reset user passwords via email'}</li>
</ul>
</div>
</div>
</div>
) : (
<div className="bg-yellow-500/10 border border-yellow-500/30 rounded-lg p-4">
<div className="flex items-start gap-3">
<AlertTriangle className="w-5 h-5 text-yellow-400 mt-0.5 flex-shrink-0" />
<div className="space-y-2">
<p className="text-white font-medium">
{t('settings.email.advancedAuthDisabled') || 'Advanced Authentication is disabled'}
</p>
<p className="text-sm text-yellow-300">
{t('settings.email.advancedAuthDisabledDesc') || 'Configure and test SMTP settings below, then enable advanced authentication to activate email-based features.'}
</p>
</div>
</div>
</div>
)}
</div>
</CardContent>
</Card>
{/* SMTP Configuration */}
<Card>
<CardHeader>
@@ -222,42 +167,77 @@ export function EmailSettings() {
</div>
<div>
<label className="block text-sm font-medium text-white mb-2">
{t('settings.email.smtpPort') || 'Port'} *
{t('settings.email.smtpPort') || 'SMTP Port'}
</label>
<input
type="number"
value={smtpSettings.smtp_port}
onChange={(e) => setSMTPSettings({ ...smtpSettings, smtp_port: parseInt(e.target.value) || 587 })}
placeholder="587"
className="w-full px-4 py-3 bg-bambu-dark-secondary border border-bambu-dark-tertiary rounded-lg text-white placeholder-bambu-gray focus:outline-none focus:ring-2 focus:ring-bambu-green/50 focus:border-bambu-green transition-colors"
/>
</div>
</div>
<div>
<label className="block text-sm font-medium text-white mb-2">
{t('settings.email.username') || 'Username'} *
</label>
<input
type="text"
value={smtpSettings.smtp_username}
onChange={(e) => setSMTPSettings({ ...smtpSettings, smtp_username: e.target.value })}
placeholder="your.email@gmail.com"
className="w-full px-4 py-3 bg-bambu-dark-secondary border border-bambu-dark-tertiary rounded-lg text-white placeholder-bambu-gray focus:outline-none focus:ring-2 focus:ring-bambu-green/50 focus:border-bambu-green transition-colors"
/>
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<div>
<label className="block text-sm font-medium text-white mb-2">
{t('settings.email.security') || 'Security'}
</label>
<select
value={smtpSettings.smtp_security}
onChange={(e) => setSMTPSettings({ ...smtpSettings, smtp_security: e.target.value as 'starttls' | 'ssl' | 'none' })}
className="w-full px-4 py-3 bg-bambu-dark-secondary border border-bambu-dark-tertiary rounded-lg text-white focus:outline-none focus:ring-2 focus:ring-bambu-green/50 focus:border-bambu-green transition-colors"
>
<option value="starttls">STARTTLS (Port 587)</option>
<option value="ssl">SSL/TLS (Port 465)</option>
<option value="none">None (Port 25)</option>
</select>
</div>
<div>
<label className="block text-sm font-medium text-white mb-2">
{t('settings.email.authentication') || 'Authentication'}
</label>
<select
value={smtpSettings.smtp_auth_enabled ? 'true' : 'false'}
onChange={(e) => setSMTPSettings({ ...smtpSettings, smtp_auth_enabled: e.target.value === 'true' })}
className="w-full px-4 py-3 bg-bambu-dark-secondary border border-bambu-dark-tertiary rounded-lg text-white focus:outline-none focus:ring-2 focus:ring-bambu-green/50 focus:border-bambu-green transition-colors"
>
<option value="true">Enabled</option>
<option value="false">Disabled</option>
</select>
</div>
</div>
<div>
<label className="block text-sm font-medium text-white mb-2">
{t('settings.email.password') || 'Password'} *
</label>
<input
type="password"
value={smtpSettings.smtp_password}
onChange={(e) => setSMTPSettings({ ...smtpSettings, smtp_password: e.target.value })}
placeholder={existingSettings ? '••••••••' : 'Enter password'}
className="w-full px-4 py-3 bg-bambu-dark-secondary border border-bambu-dark-tertiary rounded-lg text-white placeholder-bambu-gray focus:outline-none focus:ring-2 focus:ring-bambu-green/50 focus:border-bambu-green transition-colors"
/>
</div>
{smtpSettings.smtp_auth_enabled && (
<>
<div>
<label className="block text-sm font-medium text-white mb-2">
{t('settings.email.username') || 'Username'}
</label>
<input
type="text"
value={smtpSettings.smtp_username || ''}
onChange={(e) => setSMTPSettings({ ...smtpSettings, smtp_username: e.target.value })}
placeholder="your.email@gmail.com"
className="w-full px-4 py-3 bg-bambu-dark-secondary border border-bambu-dark-tertiary rounded-lg text-white placeholder-bambu-gray focus:outline-none focus:ring-2 focus:ring-bambu-green/50 focus:border-bambu-green transition-colors"
/>
</div>
<div>
<label className="block text-sm font-medium text-white mb-2">
{t('settings.email.password') || 'Password'}
</label>
<input
type="password"
value={smtpSettings.smtp_password || ''}
onChange={(e) => setSMTPSettings({ ...smtpSettings, smtp_password: e.target.value })}
placeholder={existingSettings ? '••••••••' : 'App password'}
className="w-full px-4 py-3 bg-bambu-dark-secondary border border-bambu-dark-tertiary rounded-lg text-white placeholder-bambu-gray focus:outline-none focus:ring-2 focus:ring-bambu-green/50 focus:border-bambu-green transition-colors"
/>
</div>
</>
)}
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<div>
@@ -268,7 +248,7 @@ export function EmailSettings() {
type="email"
value={smtpSettings.smtp_from_email}
onChange={(e) => setSMTPSettings({ ...smtpSettings, smtp_from_email: e.target.value })}
placeholder="noreply@yourdomain.com"
placeholder="your@email.com"
className="w-full px-4 py-3 bg-bambu-dark-secondary border border-bambu-dark-tertiary rounded-lg text-white placeholder-bambu-gray focus:outline-none focus:ring-2 focus:ring-bambu-green/50 focus:border-bambu-green transition-colors"
/>
</div>
@@ -286,19 +266,6 @@ export function EmailSettings() {
</div>
</div>
<div className="flex items-center gap-2">
<input
type="checkbox"
id="use_tls"
checked={smtpSettings.smtp_use_tls}
onChange={(e) => setSMTPSettings({ ...smtpSettings, smtp_use_tls: e.target.checked })}
className="w-4 h-4 rounded border-bambu-gray text-bambu-green focus:ring-bambu-green focus:ring-offset-0 bg-bambu-dark"
/>
<label htmlFor="use_tls" className="text-sm text-white">
{t('settings.email.useTLS') || 'Use TLS (recommended)'}
</label>
</div>
<div className="flex gap-2">
<Button
onClick={handleSave}
@@ -360,6 +327,75 @@ export function EmailSettings() {
</div>
</CardContent>
</Card>
{/* Advanced Authentication Toggle - Only show when SMTP is configured */}
{advancedAuthStatus?.smtp_configured && (
<Card>
<CardHeader>
<div className="flex items-center justify-between">
<div className="flex items-center gap-2">
<Mail className="w-5 h-5 text-bambu-green" />
<h2 className="text-lg font-semibold text-white">
{t('settings.email.advancedAuth') || 'Advanced Authentication'}
</h2>
</div>
<Button
onClick={handleToggleAdvancedAuth}
disabled={toggleAdvancedAuthMutation.isPending}
variant={advancedAuthStatus?.advanced_auth_enabled ? 'danger' : 'primary'}
>
{advancedAuthStatus?.advanced_auth_enabled ? (
<>
<Unlock className="w-4 h-4" />
{t('settings.email.disable') || 'Disable'}
</>
) : (
<>
<Lock className="w-4 h-4" />
{t('settings.email.enable') || 'Enable'}
</>
)}
</Button>
</div>
</CardHeader>
<CardContent>
<div className="space-y-4">
{advancedAuthStatus?.advanced_auth_enabled ? (
<div className="bg-green-500/10 border border-green-500/30 rounded-lg p-4">
<div className="flex items-start gap-3">
<CheckCircle className="w-5 h-5 text-green-400 mt-0.5 flex-shrink-0" />
<div className="space-y-2">
<p className="text-white font-medium">
{t('settings.email.advancedAuthEnabled') || 'Advanced Authentication is enabled'}
</p>
<ul className="text-sm text-green-300 space-y-1 list-disc list-inside">
<li>{t('settings.email.feature1') || 'Passwords are auto-generated and emailed to new users'}</li>
<li>{t('settings.email.feature2') || 'Users can login with username or email'}</li>
<li>{t('settings.email.feature3') || 'Forgot password feature is available'}</li>
<li>{t('settings.email.feature4') || 'Admins can reset user passwords via email'}</li>
</ul>
</div>
</div>
</div>
) : (
<div className="bg-yellow-500/10 border border-yellow-500/30 rounded-lg p-4">
<div className="flex items-start gap-3">
<AlertTriangle className="w-5 h-5 text-yellow-400 mt-0.5 flex-shrink-0" />
<div className="space-y-2">
<p className="text-white font-medium">
{t('settings.email.advancedAuthDisabled') || 'Advanced Authentication is disabled'}
</p>
<p className="text-sm text-yellow-300">
{t('settings.email.advancedAuthDisabledDesc') || 'Enable advanced authentication to activate email-based features for user management.'}
</p>
</div>
</div>
</div>
)}
</div>
</CardContent>
</Card>
)}
</div>
);
}
frontend/src/pages/SettingsPage.tsx
+12 -12
View File
@@ -29,7 +29,7 @@ import { useTheme, type ThemeStyle, type DarkBackground, type LightBackground, t
import { useState, useEffect, useRef, useCallback } from 'react';
import { Palette } from 'lucide-react';
const validTabs = ['general', 'network', 'plugs', 'notifications', 'filament', 'apikeys', 'virtual-printer', 'users', 'email', 'backup'] as const;
const validTabs = ['general', 'network', 'plugs', 'email', 'notifications', 'filament', 'apikeys', 'virtual-printer', 'users', 'backup'] as const;
type TabType = typeof validTabs[number];
export function SettingsPage() {
@@ -945,6 +945,17 @@ export function SettingsPage() {
</span>
)}
</button>
<button
onClick={() => handleTabChange('email')}
className={`px-4 py-2 text-sm font-medium transition-colors border-b-2 -mb-px flex items-center gap-2 ${
activeTab === 'email'
? 'text-bambu-green border-bambu-green'
: 'text-bambu-gray hover:text-gray-900 dark:hover:text-white border-transparent'
}`}
>
<Mail className="w-4 h-4" />
{t('settings.tabs.globalEmail') || 'Global Email'}
</button>
<button
onClick={() => handleTabChange('notifications')}
className={`px-4 py-2 text-sm font-medium transition-colors border-b-2 -mb-px flex items-center gap-2 ${
@@ -1026,17 +1037,6 @@ export function SettingsPage() {
<span className="w-2 h-2 rounded-full bg-green-400" />
)}
</button>
<button
onClick={() => handleTabChange('email')}
className={`px-4 py-2 text-sm font-medium transition-colors border-b-2 -mb-px flex items-center gap-2 ${
activeTab === 'email'
? 'text-bambu-green border-bambu-green'
: 'text-bambu-gray hover:text-gray-900 dark:hover:text-white border-transparent'
}`}
>
<Mail className="w-4 h-4" />
{t('settings.tabs.email') || 'Email'}
</button>
<button
onClick={() => handleTabChange('backup')}
className={`px-4 py-2 text-sm font-medium transition-colors border-b-2 -mb-px flex items-center gap-2 ${
static/assets/index-Ce6bi4R2.js → static/assets/index-CXR9zkfR.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/index.html
+1 -1
View File
@@ -23,7 +23,7 @@
<!-- Splash screens for iOS -->
<link rel="apple-touch-startup-image" href="/img/android-chrome-512x512.png" />
<script type="module" crossorigin src="/assets/index-Ce6bi4R2.js"></script>
<script type="module" crossorigin src="/assets/index-CXR9zkfR.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-962x7uln.css">
</head>
<body>