IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4223 from Ocelot-Social-Community/smtp_secure_option

Browse Source 
Smtp secure option
This commit is contained in:
Ulf Gebhardt 2021-02-15 21:41:27 +01:00 committed by GitHub
commit dabc36d1b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13810 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13904
CHANGELOG.md
View File

File diff suppressed because it is too large Load Diff

2
backend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "ocelot-social-backend",
"version": "0.6.11",
"version": "0.6.12",
"description": "GraphQL Backend for ocelot.social",
"repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
"author": "ocelot.social Community",

3
backend/src/config/index.js
View File

@ -40,7 +40,8 @@ const server = {
const smtp = {
SMTP_HOST: env.SMTP_HOST,
SMTP_PORT: env.SMTP_PORT,
SMTP_IGNORE_TLS: env.SMTP_IGNORE_TLS || true,
SMTP_IGNORE_TLS: env.SMTP_IGNORE_TLS === 'true' || true,
SMTP_SECURE: env.SMTP_IGNORE_TLS === 'true' || false,
SMTP_USERNAME: env.SMTP_USERNAME,
SMTP_PASSWORD: env.SMTP_PASSWORD,
}

4
backend/src/middleware/email/emailMiddleware.js
View File

@ -22,8 +22,8 @@ if (!hasEmailConfig) {
const transporter = nodemailer.createTransport({
host: CONFIG.SMTP_HOST,
port: CONFIG.SMTP_PORT,
ignoreTLS: CONFIG.SMTP_IGNORE_TLS === 'true',
secure: false, // true for 465, false for other ports
ignoreTLS: CONFIG.SMTP_IGNORE_TLS,
secure: CONFIG.SMTP_SECURE, // true for 465, false for other ports
auth: hasAuthData && {
user: CONFIG.SMTP_USERNAME,
pass: CONFIG.SMTP_PASSWORD,

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "ocelot-social",
"version": "0.6.11",
"version": "0.6.12",
"description": "Fullstack and API tests with cypress and cucumber for ocelot.social",
"author": "ocelot.social Community",
"license": "MIT",

2
webapp/package.json
View File

@ -1,6 +1,6 @@
{
"name": "ocelot-social-webapp",
"version": "0.6.11",
"version": "0.6.12",
"description": "ocelot.social Frontend",
"repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
"author": "ocelot.social Community",