highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-07-14 15:13:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tiny Mail From Fix (#953)

Browse Source
This commit is contained in:
Yuhong Sun
2024-01-15 22:03:38 -08:00
committed by GitHub
parent 621967d2b6
commit f5be0cc2c0
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/danswer/auth/users.py
View File

@ -31,6 +31,7 @@ from danswer.auth.schemas import UserCreate
from danswer.auth.schemas import UserRole from danswer.auth.schemas import UserRole
from danswer.configs.app_configs import AUTH_TYPE from danswer.configs.app_configs import AUTH_TYPE
from danswer.configs.app_configs import DISABLE_AUTH from danswer.configs.app_configs import DISABLE_AUTH
from danswer.configs.app_configs import EMAIL_FROM
from danswer.configs.app_configs import REQUIRE_EMAIL_VERIFICATION from danswer.configs.app_configs import REQUIRE_EMAIL_VERIFICATION
from danswer.configs.app_configs import SECRET from danswer.configs.app_configs import SECRET
from danswer.configs.app_configs import SESSION_EXPIRE_TIME_SECONDS from danswer.configs.app_configs import SESSION_EXPIRE_TIME_SECONDS
@ -38,7 +39,6 @@ from danswer.configs.app_configs import SMTP_PASS
from danswer.configs.app_configs import SMTP_PORT from danswer.configs.app_configs import SMTP_PORT
from danswer.configs.app_configs import SMTP_SERVER from danswer.configs.app_configs import SMTP_SERVER
from danswer.configs.app_configs import SMTP_USER from danswer.configs.app_configs import SMTP_USER
from danswer.configs.app_configs import MAIL_FROM
from danswer.configs.app_configs import VALID_EMAIL_DOMAINS from danswer.configs.app_configs import VALID_EMAIL_DOMAINS
from danswer.configs.app_configs import WEB_DOMAIN from danswer.configs.app_configs import WEB_DOMAIN
from danswer.configs.constants import AuthType from danswer.configs.constants import AuthType
@ -108,11 +108,16 @@ def verify_email_domain(email: str) -> None:
) )
def send_user_verification_email(user_email: str, token: str) -> None: def send_user_verification_email(
user_email: str,
token: str,
mail_from: str = EMAIL_FROM,
) -> None:
msg = MIMEMultipart() msg = MIMEMultipart()
msg["Subject"] = "Danswer Email Verification" msg["Subject"] = "Danswer Email Verification"
msg["To"] = user_email msg["To"] = user_email
msg["From"] = MAIL_FROM if mail_from:
msg["From"] = mail_from
link = f"{WEB_DOMAIN}/auth/verify-email?token={token}" link = f"{WEB_DOMAIN}/auth/verify-email?token={token}"

2
backend/danswer/configs/app_configs.py
View File

@ -81,7 +81,7 @@ SMTP_SERVER = os.environ.get("SMTP_SERVER") or "smtp.gmail.com"
SMTP_PORT = int(os.environ.get("SMTP_PORT") or "587") SMTP_PORT = int(os.environ.get("SMTP_PORT") or "587")
SMTP_USER = os.environ.get("SMTP_USER", "your-email@gmail.com") SMTP_USER = os.environ.get("SMTP_USER", "your-email@gmail.com")
SMTP_PASS = os.environ.get("SMTP_PASS", "your-gmail-password") SMTP_PASS = os.environ.get("SMTP_PASS", "your-gmail-password")
MAIL_FROM = os.environ.get("EMAIL_FROM", SMTP_USER) EMAIL_FROM = os.environ.get("EMAIL_FROM") or SMTP_USER
##### #####

2
deployment/docker_compose/docker-compose.dev.yml
View File

@ -27,7 +27,7 @@ services:
- SMTP_PORT=${SMTP_PORT:-587} # For sending verification emails, if unspecified then defaults to '587' - SMTP_PORT=${SMTP_PORT:-587} # For sending verification emails, if unspecified then defaults to '587'
- SMTP_USER=${SMTP_USER:-} - SMTP_USER=${SMTP_USER:-}
- SMTP_PASS=${SMTP_PASS:-} - SMTP_PASS=${SMTP_PASS:-}
- MAIL_FROM=${MAIL_FROM:-} - EMAIL_FROM=${EMAIL_FROM:-}
# Gen AI Settings # Gen AI Settings
- GEN_AI_MODEL_PROVIDER=${GEN_AI_MODEL_PROVIDER:-openai} - GEN_AI_MODEL_PROVIDER=${GEN_AI_MODEL_PROVIDER:-openai}
- GEN_AI_MODEL_VERSION=${GEN_AI_MODEL_VERSION:-gpt-3.5-turbo} - GEN_AI_MODEL_VERSION=${GEN_AI_MODEL_VERSION:-gpt-3.5-turbo}

4
deployment/docker_compose/env.prod.template
View File

@ -47,8 +47,8 @@ SECRET=
# The below are only needed if you aren't using gmail as your SMTP # The below are only needed if you aren't using gmail as your SMTP
#SMTP_SERVER= #SMTP_SERVER=
#SMTP_PORT= #SMTP_PORT=
# when missing SMTP_USER used instead # When missing SMTP_USER, this is used instead
#MAIL_FROM= #EMAIL_FROM=
# OpenID Connect (OIDC) # OpenID Connect (OIDC)
#OPENID_CONFIG_URL= #OPENID_CONFIG_URL=

2
deployment/kubernetes/env-configmap.yaml
View File

@ -11,7 +11,7 @@ data:
SMTP_PORT: "" # For sending verification emails, if unspecified then defaults to '587' SMTP_PORT: "" # For sending verification emails, if unspecified then defaults to '587'
SMTP_USER: "" # 'your-email@company.com' SMTP_USER: "" # 'your-email@company.com'
SMTP_PASS: "" # 'your-gmail-password' SMTP_PASS: "" # 'your-gmail-password'
MAIL_FROM: "" # 'your-email@company.com' SMTP_USER missing used instead EMAIL_FROM: "" # 'your-email@company.com' SMTP_USER missing used instead
# Gen AI Settings # Gen AI Settings
GEN_AI_MODEL_PROVIDER: "openai" GEN_AI_MODEL_PROVIDER: "openai"
GEN_AI_MODEL_VERSION: "gpt-3.5-turbo" # Use GPT-4 if you have it GEN_AI_MODEL_VERSION: "gpt-3.5-turbo" # Use GPT-4 if you have it