blsmedia/bot
2
0
Fork 0
Code Activity

fix(auth): 🔧 Add ignoreTLS option for SMTP creds

Browse Source
This commit is contained in:
Baptiste Arnaud
2022-06-13 11:50:05 +02:00
parent 177789c1a6
commit 3105adedb3
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/builder/pages/api/auth/[...nextauth].ts
View File

@@ -4,7 +4,7 @@ import GitHubProvider from 'next-auth/providers/github'
import GitlabProvider from 'next-auth/providers/gitlab' import GitlabProvider from 'next-auth/providers/gitlab'
import GoogleProvider from 'next-auth/providers/google' import GoogleProvider from 'next-auth/providers/google'
import FacebookProvider from 'next-auth/providers/facebook' import FacebookProvider from 'next-auth/providers/facebook'
import AzureADProvider from "next-auth/providers/azure-ad"; import AzureADProvider from 'next-auth/providers/azure-ad'
import prisma from 'libs/prisma' import prisma from 'libs/prisma'
import { Provider } from 'next-auth/providers' import { Provider } from 'next-auth/providers'
import { NextApiRequest, NextApiResponse } from 'next' import { NextApiRequest, NextApiResponse } from 'next'
@@ -36,6 +36,7 @@ if (
user: process.env.SMTP_USERNAME, user: process.env.SMTP_USERNAME,
pass: process.env.SMTP_PASSWORD, pass: process.env.SMTP_PASSWORD,
}, },
ignoreTLS: process.env.SMTP_IGNORE_TLS === 'true',
}, },
from: process.env.NEXT_PUBLIC_SMTP_FROM, from: process.env.NEXT_PUBLIC_SMTP_FROM,
}) })
@@ -90,7 +91,7 @@ if (
clientId: process.env.AZURE_AD_CLIENT_ID, clientId: process.env.AZURE_AD_CLIENT_ID,
clientSecret: process.env.AZURE_AD_CLIENT_SECRET, clientSecret: process.env.AZURE_AD_CLIENT_SECRET,
tenantId: process.env.AZURE_AD_TENANT_ID, tenantId: process.env.AZURE_AD_TENANT_ID,
}), })
) )
} }

16
apps/docs/docs/self-hosting/configuration.mdx
View File

@@ -46,6 +46,7 @@ Used for sending email notifications and authentication
| SMTP_PORT | 25 | SMTP port | | SMTP_PORT | 25 | SMTP port |
| NEXT_PUBLIC_SMTP_FROM | - | From name and email (i.e. `'Typebot Notifications' <notifications@host.com>`) | | NEXT_PUBLIC_SMTP_FROM | - | From name and email (i.e. `'Typebot Notifications' <notifications@host.com>`) |
| SMTP_AUTH_DISABLED | false | To disable the authentication by email but still use the provided config for notifications | | SMTP_AUTH_DISABLED | false | To disable the authentication by email but still use the provided config for notifications |
| SMTP_IGNORE_TLS | false | Don't use TLS even if the server supports STARTTLS extension |
</p></details> </p></details>
@@ -265,13 +266,14 @@ These can also be added to the `viewer` environment
Used for sending email notifications and authentication Used for sending email notifications and authentication
| Parameter | Default | Description | | Parameter | Default | Description |
| ------------- | ------- | ------------------------------------------------------------------------------- | | --------------- | ------- | ------------------------------------------------------------------------------- |
| SMTP_USERNAME | -- | SMTP username | | SMTP_USERNAME | -- | SMTP username |
| SMTP_PASSWORD | -- | SMTP password | | SMTP_PASSWORD | -- | SMTP password |
| SMTP_HOST | -- | SMTP host. (i.e. `smtp.host.com`) | | SMTP_HOST | -- | SMTP host. (i.e. `smtp.host.com`) |
| SMTP_PORT | 25 | SMTP port | | SMTP_PORT | 25 | SMTP port |
| SMTP_FROM | - | From name and email (i.e. `'Typebot Notifications' <notifications@typebot.io>`) | | SMTP_FROM | - | From name and email (i.e. `'Typebot Notifications' <notifications@typebot.io>`) |
| SMTP_IGNORE_TLS | false | Don't use TLS even if the server supports STARTTLS extension |
</p></details> </p></details>

5
apps/docs/docs/self-hosting/docker.mdx
View File

@@ -104,7 +104,8 @@ services:
- '80:80' - '80:80'
- '443:443' - '443:443'
depends_on: depends_on:
- typebot - typebot-builder
- typebot-viewer
typebot-builder: typebot-builder:
labels: labels:
@@ -112,7 +113,7 @@ services:
virtual.port: '8080' virtual.port: '8080'
virtual.tls-email: 'admin@example.com' # change to your email virtual.tls-email: 'admin@example.com' # change to your email
typebot-builder: typebot-viewer:
labels: labels:
virtual.host: 'bot.domain.com' # change to your domain name virtual.host: 'bot.domain.com' # change to your domain name
virtual.port: '8081' virtual.port: '8081'

2
apps/viewer/pages/api/typebots/[typebotId]/integrations/email.ts
View File

@@ -31,11 +31,11 @@ const cors = initMiddleware(Cors())
const defaultTransportOptions = { const defaultTransportOptions = {
host: process.env.SMTP_HOST, host: process.env.SMTP_HOST,
port: Number(process.env.SMTP_PORT), port: Number(process.env.SMTP_PORT),
secure: false,
auth: { auth: {
user: process.env.SMTP_USERNAME, user: process.env.SMTP_USERNAME,
pass: process.env.SMTP_PASSWORD, pass: process.env.SMTP_PASSWORD,
}, },
ignoreTLS: process.env.SMTP_IGNORE_TLS === 'true',
} }
const defaultFrom = { const defaultFrom = {