diff --git a/.eslintrc.js b/.eslintrc.js index 4e3e565..479a8ea 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -64,6 +64,7 @@ module.exports = { 'space-in-parens': [ 'error', 'always' - ] + ], + 'no-var': 'error' } }; diff --git a/src/server/app.js b/src/server/app.js index 30f20e7..7b9d1f2 100644 --- a/src/server/app.js +++ b/src/server/app.js @@ -15,8 +15,8 @@ const bodyParser = require( 'body-parser' ); const cookieParser = require( 'cookie-parser' ); const http = require( 'http' ); const fs = require( 'fs' ); -// const sql = require( './backend/db/mysqldb.js' ); -// const sqld = new sql(); +const mail = require( './backend/mail/mailSender.js' ); +const mailManager = new mail(); // const env = process.env.PROD || false; diff --git a/src/server/backend/db/db.js b/src/server/backend/db/db.js index 3b6a897..5f9155b 100644 --- a/src/server/backend/db/db.js +++ b/src/server/backend/db/db.js @@ -7,9 +7,27 @@ * */ +const path = require( 'path' ); +const fs = require( 'fs' ); + module.exports.getData = function getData ( db, searchQuery ) { console.log( db + searchQuery ); return new Promise( resolve => { resolve( '$2b$05$ElMYWoMjk7567lXkIkee.e.6cxCrWU4gkfuNLB8gmGYLQQPm7gT3O' ); } ); +}; + +module.exports.getJSONData = function getData ( file ) { + return new Promise( ( resolve, reject ) => { + fs.readFile( path.join( __dirname + '/../../' + file ), ( error, data ) => { + if ( error ) { + reject( 'Error occurred: Error trace: ' + error ); + } + resolve( JSON.parse( data ) ); + } ); + } ); +}; + +module.exports.getJSONDataSync = function getData ( file ) { + return JSON.parse( fs.readFileSync( path.join( __dirname + '/../../' + file ) ) ); }; \ No newline at end of file diff --git a/src/server/backend/db/jsondb.js b/src/server/backend/db/jsondb.js index e69de29..8440d15 100644 --- a/src/server/backend/db/jsondb.js +++ b/src/server/backend/db/jsondb.js @@ -0,0 +1 @@ +class \ No newline at end of file diff --git a/src/server/backend/mail/mailSender.js b/src/server/backend/mail/mailSender.js index ec9d591..8891444 100644 --- a/src/server/backend/mail/mailSender.js +++ b/src/server/backend/mail/mailSender.js @@ -10,9 +10,10 @@ const mailer = require( 'nodemailer' ); const html2text = require( 'html-to-text' ); -// import jsondb.js file and let it import mail config +const db = require( '../db/db.js' ); + +let transporter = mailer.createTransport( db.getJSONDataSync( 'mail.secret.json' ) ); -var transporter = mailer.createTransport( ); class MailManager { constructor () { @@ -26,7 +27,7 @@ class MailManager { */ sendMail ( recipient, html, subject, sender ) { let text = html2text.convert( html, this.options ); - var mailOptions = { + let mailOptions = { from: sender, to: recipient, subject: subject, @@ -43,7 +44,7 @@ class MailManager { sendMailWithAttachment ( recipient, html, subject, attachments, from ) { let text = html2text.convert( html, this.options ); - var mailOptions = { + let mailOptions = { from: from, to: recipient, subject: subject,