pass mail instance around as argument

Author: tdjsnelling

api/src/controllers/user.js

@@ -8,10 +8,9 @@ import Invite from '../schema/invite'
 import Progress from '../schema/progress'
 import { getTorrentsPage } from './torrent'
 import { getUserRatio } from '../utils/ratio'
-import { mail } from '../index'
 import { BYTES_GB } from '../tracker/announce'
 
-export const sendVerificationEmail = async (address, token) => {
+export const sendVerificationEmail = async (mail, address, token) => {
   await mail.sendMail({
     from: `"${process.env.SQ_SITE_NAME}" <${process.env.SQ_MAIL_FROM_ADDRESS}>`,
     to: address,
@@ -22,7 +21,7 @@ ${process.env.SQ_BASE_URL}/verify-email?token=${token}`,
   })
 }
 
-export const register = async (req, res) => {
+export const register = (mail) => async (req, res) => {
   if (
     process.env.SQ_ALLOW_REGISTER !== 'open' &&
     process.env.SQ_ALLOW_REGISTER !== 'invite'
@@ -131,7 +130,11 @@ export const register = async (req, res) => {
           },
           process.env.SQ_JWT_SECRET
         )
-        await sendVerificationEmail(req.body.email, emailVerificationToken)
+        await sendVerificationEmail(
+          mail,
+          req.body.email,
+          emailVerificationToken
+        )
 
         if (createdUser) {
           if (req.body.invite) {
@@ -248,7 +251,7 @@ export const login = async (req, res) => {
   }
 }
 
-export const generateInvite = async (req, res) => {
+export const generateInvite = (mail) => async (req, res) => {
   if (process.env.SQ_ALLOW_REGISTER !== 'invite') {
     res
       .status(403)
@@ -311,7 +314,7 @@ export const fetchInvites = async (req, res) => {
   }
 }
 
-export const changePassword = async (req, res) => {
+export const changePassword = (mail) => async (req, res) => {
   if (req.body.password && req.body.newPassword) {
     try {
       const user = await User.findOne({ _id: req.userId }).lean()
@@ -357,7 +360,7 @@ ${process.env.SQ_BASE_URL}/reset-password/initiate`,
   }
 }
 
-export const initiatePasswordReset = async (req, res) => {
+export const initiatePasswordReset = (mail) => async (req, res) => {
   if (req.body.email) {
     try {
       const user = await User.findOne({ email: req.body.email }).lean()

api/src/index.js

@@ -34,8 +34,6 @@ import { downloadTorrent } from './controllers/torrent'
 import { rssFeed } from './controllers/rss'
 import createAdminUser from './setup/createAdminUser'
 
-let mail
-
 validateConfig(config).then(() => {
   if (process.env.SENTRY_DSN) {
     Sentry.init({
@@ -52,6 +50,16 @@ validateConfig(config).then(() => {
     })
   }
 
+  const mail = nodemailer.createTransport({
+    host: process.env.SQ_SMTP_HOST,
+    port: process.env.SQ_SMTP_PORT,
+    secure: process.env.SQ_SMTP_SECURE,
+    auth: {
+      user: process.env.SQ_SMTP_USER,
+      pass: process.env.SQ_SMTP_PASS,
+    },
+  })
+
   const connectToDb = () => {
     console.log('[sq] initiating db connection...')
     mongoose
@@ -69,17 +77,7 @@ validateConfig(config).then(() => {
 
   mongoose.connection.once('open', async () => {
     console.log('[sq] connected to mongodb successfully')
-    await createAdminUser()
-  })
-
-  mail = nodemailer.createTransport({
-    host: process.env.SQ_SMTP_HOST,
-    port: process.env.SQ_SMTP_PORT,
-    secure: process.env.SQ_SMTP_SECURE,
-    auth: {
-      user: process.env.SQ_SMTP_USER,
-      pass: process.env.SQ_SMTP_PASS,
-    },
+    await createAdminUser(mail)
   })
 
   const app = express()
@@ -133,7 +131,6 @@ validateConfig(config).then(() => {
     http: false,
     udp: false,
     ws: false,
-    trustProxy: true,
   })
   const onTrackerRequest = tracker._onRequest.bind(tracker)
   app.get('/sq/*/announce', createTrackerRoute('announce', onTrackerRequest))
@@ -148,9 +145,9 @@ validateConfig(config).then(() => {
   )
 
   // auth routes
-  app.post('/register', register)
+  app.post('/register', register(mail))
   app.post('/login', login)
-  app.post('/reset-password/initiate', initiatePasswordReset)
+  app.post('/reset-password/initiate', initiatePasswordReset(mail))
   app.post('/reset-password/finalise', finalisePasswordReset)
   app.post('/verify-email', verifyUserEmail)
 
@@ -163,7 +160,7 @@ validateConfig(config).then(() => {
   // everything from here on requires user auth
   app.use(auth)
 
-  app.use('/account', accountRoutes())
+  app.use('/account', accountRoutes(mail))
   app.use('/user', userRoutes(tracker))
   app.use('/torrent', torrentRoutes(tracker))
   app.use('/announcements', announcementRoutes())
@@ -176,5 +173,3 @@ validateConfig(config).then(() => {
     console.log(`[sq] ■ sqtracker running http://localhost:${port}`)
   })
 })
-
-export { mail }

api/src/routes/account.js

@@ -14,10 +14,10 @@ import {
 
 const router = express.Router()
 
-export default () => {
+export default (mail) => {
   router.get('/invites', fetchInvites)
-  router.post('/generate-invite', generateInvite)
-  router.post('/change-password', changePassword)
+  router.post('/generate-invite', generateInvite(mail))
+  router.post('/change-password', changePassword(mail))
   router.get('/get-stats', getUserStats)
   router.get('/get-role', getUserRole)
   router.get('/get-verified', getUserVerifiedEmailStatus)

api/src/setup/createAdminUser.js

@@ -4,7 +4,7 @@ import jwt from 'jsonwebtoken'
 import User from '../schema/user'
 import { sendVerificationEmail } from '../controllers/user'
 
-const createAdminUser = async () => {
+const createAdminUser = async (mail) => {
   const existingAdmin = await User.findOne({ username: 'admin' }).lean()
   if (!existingAdmin) {
     const created = Date.now()
@@ -44,9 +44,12 @@ const createAdminUser = async () => {
       process.env.SQ_JWT_SECRET
     )
     await sendVerificationEmail(
+      mail,
       process.env.SQ_ADMIN_EMAIL,
       emailVerificationToken
     )
+
+    console.log('[sq] created initial admin user')
   }
 }