fix(mail): mail prints to console in development

Author: BrainBacon

CHANGELOG.md

@@ -1,3 +1,35 @@
+<a name="1.0.0"></a>
+# [1.0.0](https://github.com/Beg-in/server/compare/1.0.0-beta.4...1.0.0) (2018-10-19)
+
+
+### Bug Fixes
+
+* **mail:** mail prints to console in development ([4e35d36](https://github.com/Beg-in/server/commit/4e35d36))
+
+
+
+<a name="1.0.0-beta.4"></a>
+# [1.0.0-beta.4](https://github.com/Beg-in/server/compare/1.0.0-beta.1...1.0.0-beta.4) (2018-10-16)
+
+
+### Bug Fixes
+
+* **auth:** buffers for secure-password ([c9a9e75](https://github.com/Beg-in/server/commit/c9a9e75))
+* **db:** bump version for production properties fix ([75a3746](https://github.com/Beg-in/server/commit/75a3746))
+* **properties:** internal api overrides environment variables ([cd1a230](https://github.com/Beg-in/server/commit/cd1a230))
+
+
+### Features
+
+* **roles:** add role system ([da312f0](https://github.com/Beg-in/server/commit/da312f0))
+
+
+
+<a name="1.0.0-beta.1"></a>
+# [1.0.0-beta.1](https://github.com/Beg-in/server/compare/0.4.0...1.0.0-beta.1) (2018-10-11)
+
+
+
 <a name="0.4.0"></a>
 # [0.4.0](https://github.com/Beg-in/server/compare/0.3.3...0.4.0) (2017-10-17)
 
@@ -45,7 +77,7 @@
 
 
 <a name="0.2.1"></a>
-## [0.2.1](https://github.com/Beg-in/server/compare/0.2.0...0.2.1) (2017-06-16)
+## [0.2.1](https://github.com/Beg-in/server/compare/0.1.3...0.2.1) (2017-06-16)
 
 
 ### Bug Fixes
@@ -54,11 +86,6 @@
 
 
 
-<a name="0.2.0"></a>
-# [0.2.0](https://github.com/Beg-in/server/compare/0.1.3...0.2.0) (2017-06-16)
-
-
-
 <a name="0.1.3"></a>
 ## [0.1.3](https://github.com/Beg-in/server/compare/0.1.2...0.1.3) (2017-06-13)
 

auth/index.js

@@ -146,6 +146,7 @@ module.exports = {
   hash,
   verifyHash,
   getToken,
+  decodeToken,
   test,
 
   async access(ctx, config) {

mail/index.js

@@ -5,19 +5,21 @@ let sesTransport = require('nodemailer-ses-transport');
 let properties = require('../properties');
 let aws = require('../aws');
 let renderer = require('../template');
+let log = require('../log');
 
 const NAME = properties.mail.name(properties.name());
 const ADDRESS = properties.mail.address(`info@${properties.domain()}`);
 const FROM = `"${NAME}" <${ADDRESS}>`;
 const TRANSPORT = nodemailer.createTransport(sesTransport({ ses: aws.SES() }));
 const support = properties.mail.support(ADDRESS);
+const isDevelopment = properties.isDevelopment();
 
-module.exports = (config, ...args) => {
+module.exports = async (config = {}) => {
   let {
     to,
     subject,
     template,
-    options,
+    options = {},
   } = config;
   let {
     from = FROM,
@@ -31,7 +33,10 @@ module.exports = (config, ...args) => {
   let locals = Object.assign({}, config);
   locals.mail = Object.assign({ support }, mail);
   if (template && !html) {
-    html = renderer(template, locals, ...args);
+    html = renderer(template, locals);
+  }
+  if (isDevelopment) {
+    return log.debug(`Mail Sent to ${to}, open this link in your browser:`, `data:text/html;base64,${Buffer.from(html).toString('base64')}`);
   }
   return TRANSPORT.sendMail(Object.assign({ html }, options, mail));
 };

mail/template.pug

@@ -5,10 +5,10 @@ html(lang="en")
     block meta
     title
       block title
-        | Notification from #{properties.name}
+        | Notification from #{properties.name()}
   body
     block greeting
       p Hello,
     block content
     block footer
-      p If you believe this message has been sent to you in error or you are experiencing any issues please contact support at #[a(href=`mailto:${mail.support}`) #{properties.mail.support}].
+      p If you believe this message has been sent to you in error or you are experiencing any issues please contact support at #[a(href=`mailto:${mail.support}`) #{mail.support}].

package.json

@@ -1,6 +1,6 @@
 {
   "name": "begin-server",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0",
   "description": "Node.js server-side organizational framework",
   "engines": {
     "node": ">=7.6"

profile/change-password.pug

@@ -1,4 +1,4 @@
 extends ../mail/template
 
 block content
-  p You can reset your password by #[a(href=`https://${properties.domain}/password-reset?reset=${reset}`) clicking here].
+  p You can reset your password by #[a(href=`${properties.build.root()}/auth?reset=${reset}`) clicking here].

profile/verify-email.pug

@@ -1,4 +1,4 @@
 extends ../mail/template
 
 block content
-  p Please verify your email address by #[a(href=`https://${properties.domain}/?verify=${verify}`) clicking here].
+  p Please verify your email address by #[a(href=`${properties.build.root()}/?verify=${verify}`) clicking here].

properties/index.js

@@ -27,11 +27,26 @@ const domain = process.env.SERVER_DOMAIN || (
 let production = properties.production || {};
 let config = STAGE === 'production' ? production : assignDeep(production, properties[STAGE] || {});
 let { build } = config;
+let port = +(process.env.PORT || (config.server && config.server.port) || 8081);
+build = Object.assign({
+  cdn: `https://cdn.${domain}`,
+  api: `https://api.${domain}`,
+  root: `https://${domain}`,
+}, build);
+if (isDevelopment) {
+  let url = process.env.SERVER_URL || (config.server && config.server.url) || 'http://localhost';
+  let root = `${url}:${port - 1}`;
+  build = Object.assign(build, {
+    cdn: root,
+    api: `${url}:${port}`,
+    root,
+  });
+}
 config = assignDeep(config.public || {}, config.server || {});
 const cwd = config.cwd ? path.join(process.cwd(), config.cwd()) : DIRECTORIES
   .map(dir => path.join(process.cwd(), dir))
   .find(dir => fs.existsSync(dir));
-let api = { isDevelopment, name, domain, build, cwd };
+let api = { isDevelopment, name, domain, build, cwd, port };
 config = Object.assign({}, config, api);
 let apiKeys = Object.keys(api);
 let props = location => new Proxy((fallback, devFallback) => {

template/index.js

@@ -2,15 +2,16 @@
 
 let path = require('path');
 let pug = require('pug');
-let rawProperties = require('../properties');
+let properties = require('../properties');
 
 const MODULES = path.join(process.cwd(), 'node_modules');
-const properties = rawProperties();
 
-let compiled = {};
-module.exports = (file, { baseDir = MODULES, globals = { properties } } = {}) => {
-  if (!compiled[file]) {
-    compiled[file] = pug.compileFile(file, { baseDir, globals });
-  }
-  return compiled[file];
+module.exports = (filename, locals = {}) => {
+  let { baseDir = MODULES } = locals;
+  let compiled = pug.compileFile(filename, {
+    baseDir,
+    filename,
+    cache: true,
+  });
+  return compiled(Object.assign({ properties }, locals));
 };