Fix merge conflicts for variable imports

backend/src/services/smtp.ts

@@ -3,7 +3,8 @@ import {
   SMTP_HOST_SENDGRID, 
   SMTP_HOST_MAILGUN,
   SMTP_HOST_SOCKETLABS,
-  SMTP_HOST_ZOHOMAIL
+  SMTP_HOST_ZOHOMAIL,
+  SMTP_HOST_GMAIL
 } from '../variables';
 import SMTPConnection from 'nodemailer/lib/smtp-connection';
 import * as Sentry from '@sentry/node';
@@ -46,6 +47,12 @@ export const initSmtp = async () => {
         }
         break;
       case SMTP_HOST_ZOHOMAIL:
+        mailOpts.requireTLS = true; 
+        mailOpts.tls = {
+          ciphers: 'TLSv1.2'
+        }
+        break;
+      case SMTP_HOST_GMAIL:
         mailOpts.requireTLS = true; 
         mailOpts.tls = {
           ciphers: 'TLSv1.2'

backend/src/variables/index.ts

@@ -10,4 +10,4 @@ export * from './secret';
 export * from './smtp';
 export * from './stripe';
 export * from './token';
-export * from './user';
+export * from './user';

backend/src/variables/smtp.ts

@@ -1,4 +1,5 @@
 export const SMTP_HOST_SENDGRID = 'smtp.sendgrid.net';
 export const SMTP_HOST_MAILGUN = 'smtp.mailgun.org';
 export const SMTP_HOST_SOCKETLABS = 'smtp.socketlabs.com';
-export const SMTP_HOST_ZOHOMAIL = 'smtp.zoho.com';
+export const SMTP_HOST_ZOHOMAIL = 'smtp.zoho.com';
+export const SMTP_HOST_GMAIL = 'smtp.gmail.com';