Development

docker/routlin-dash/app/pages/accountcreate/action.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from flask import Blueprint, request, session, redirect, flash
-import os, bcrypt, secrets, smtplib
+import bcrypt, secrets, smtplib
 import time
 from email.message import EmailMessage
 import auth
@@ -15,14 +15,16 @@ CODE_TTL_SECS = 15 * 60
 
 
 def _send_verification_email(to_address, code):
-    host      = os.environ.get('SMTP_HOST', '')
-    port      = int(os.environ.get('SMTP_PORT', 587))
-    user      = os.environ.get('SMTP_USER', '')
-    password  = os.environ.get('SMTP_PASSWORD', '')
-    from_addr = os.environ.get('SMTP_FROM', user)
+    import settings as _s
+    smtp      = _s.get_smtp_config()
+    host      = smtp['host']
+    port      = smtp['port']
+    user      = smtp['user']
+    password  = smtp['password']
+    from_addr = smtp['from'] or user
 
     if not host:
-        raise RuntimeError('SMTP_HOST is not configured.')
+        raise RuntimeError('SMTP host is not configured.')
 
     msg = EmailMessage()
     msg['Subject'] = f'{config_utils.WEB_APP_DISPLAY_NAME} - Email Verification'

docker/routlin-dash/app/pages/accountmanage/action.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 from flask import Blueprint, request, session, redirect, flash
 import os, re, secrets, sqlite3, time
+import settings
 from datetime import datetime, timezone
 import auth
 import config_utils
@@ -215,7 +216,7 @@ def accounts_delete():
     target        = accounts[row_index]
     target_email  = target.get('email_address', '').lower()
     current_email = session.get('email_address', '').lower()
-    initial_email = os.environ.get('INITIAL_MANAGER_EMAIL', '').strip().lower()
+    initial_email = settings.get_initial_manager_email()
 
     if target_email == current_email and target_email != initial_email:
         flash('You cannot remove your own account.', 'error')