Handlebars replaced by lodash.template(#128) SES region option moved to .env(#124)

Author: YuriGor

book/4-end/.gitignore

@@ -11,4 +11,5 @@ npm-debug.log
 node_modules/
 .coverage
 .env
-.next
+.next
+package-lock.json

book/4-end/server/aws.js

@@ -2,7 +2,7 @@ import aws from 'aws-sdk';
 
 export default function sendEmail(options) {
   aws.config.update({
-    region: 'us-east-1',
+    region: process.env.Amazon_region,
     accessKeyId: process.env.Amazon_accessKeyId,
     secretAccessKey: process.env.Amazon_secretAccessKey,
   });

book/4-end/server/models/EmailTemplate.js

@@ -1,6 +1,5 @@
 import mongoose from 'mongoose';
-import Handlebars from 'handlebars';
-
+import _ from 'lodash';
 import logger from '../logs';
 
 const { Schema } = mongoose;
@@ -28,14 +27,14 @@ function insertTemplates() {
     {
       name: 'welcome',
       subject: 'Welcome to builderbook.org',
-      message: `{{userName}},
+      message: `<%= userName %>,
         <p>
           Thanks for signing up for Builder Book!
         </p>
         <p>
           In our books, we teach you how to build complete, production-ready web apps from scratch.
         </p>
-        
+
         Kelly & Timur, Team Builder Book
       `,
     },
@@ -59,11 +58,13 @@ insertTemplates();
 export default async function getEmailTemplate(name, params) {
   const source = await EmailTemplate.findOne({ name });
   if (!source) {
-    throw new Error('No EmailTemplates found. Please check that at least one is generated at server startup, restart your server and try again.');
+    throw new Error(`No EmailTemplates found.
+      Please check that at least one is generated at server startup,
+      restart your server and try again.`);
   }
 
   return {
-    message: Handlebars.compile(source.message)(params),
-    subject: Handlebars.compile(source.subject)(params),
+    message: _.template(source.message)(params),
+    subject: _.template(source.subject)(params),
   };
 }

book/5-end/server/aws.js

@@ -2,7 +2,7 @@ import aws from 'aws-sdk';
 
 export default function sendEmail(options) {
   aws.config.update({
-    region: 'us-east-1',
+    region: process.env.Amazon_region,
     accessKeyId: process.env.Amazon_accessKeyId,
     secretAccessKey: process.env.Amazon_secretAccessKey,
   });

book/5-end/server/models/EmailTemplate.js

@@ -1,6 +1,5 @@
 import mongoose from 'mongoose';
-import Handlebars from 'handlebars';
-
+import _ from 'lodash';
 import logger from '../logs';
 
 const { Schema } = mongoose;
@@ -28,14 +27,14 @@ function insertTemplates() {
     {
       name: 'welcome',
       subject: 'Welcome to builderbook.org',
-      message: `{{userName}},
+      message: `<%= userName %>,
         <p>
           At Builder Book, we are excited to help you build useful, production-ready web apps from scratch.
         </p>
-        <p> 
-          See list of available books here.   
+        <p>
+          See list of available books here.
         </p>
-        
+
         Kelly & Timur,
         Team BB
       `,
@@ -60,12 +59,13 @@ insertTemplates();
 export default async function getEmailTemplate(name, params) {
   const source = await EmailTemplate.findOne({ name });
   if (!source) {
-    throw new Error('No EmailTemplates found. Please check that at least one is generated at server startup, restart your server and try again.');
+    throw new Error(`No EmailTemplates found.
+      Please check that at least one is generated at server startup,
+      restart your server and try again.`);
   }
 
   return {
-    message: Handlebars.compile(source.message)(params),
-    subject: Handlebars.compile(source.subject)(params),
+    message: _.template.compile(source.message)(params),
+    subject: _.template.compile(source.subject)(params),
   };
 }
-

book/5-start/server/aws.js

@@ -2,7 +2,7 @@ import aws from 'aws-sdk';
 
 export default function sendEmail(options) {
   aws.config.update({
-    region: 'us-east-1',
+    region: process.env.Amazon_region,
     accessKeyId: process.env.Amazon_accessKeyId,
     secretAccessKey: process.env.Amazon_secretAccessKey,
   });

book/5-start/server/models/EmailTemplate.js

@@ -1,6 +1,5 @@
 import mongoose from 'mongoose';
-import Handlebars from 'handlebars';
-
+import _ from 'lodash';
 import logger from '../logs';
 
 const { Schema } = mongoose;
@@ -28,14 +27,14 @@ function insertTemplates() {
     {
       name: 'welcome',
       subject: 'Welcome to builderbook.org',
-      message: `{{userName}},
+      message: `<%= userName %>,
         <p>
           At Builder Book, we are excited to help you build useful, production-ready web apps from scratch.
         </p>
-        <p> 
-          See list of available books here.   
+        <p>
+          See list of available books here.
         </p>
-        
+
         Kelly & Timur,
         Team BB
       `,
@@ -60,12 +59,13 @@ insertTemplates();
 export default async function getEmailTemplate(name, params) {
   const source = await EmailTemplate.findOne({ name });
   if (!source) {
-    throw new Error('No EmailTemplates found. Please check that at least one is generated at server startup, restart your server and try again.');
+    throw new Error(`No EmailTemplates found.
+      Please check that at least one is generated at server startup,
+      restart your server and try again.`);
   }
 
   return {
-    message: Handlebars.compile(source.message)(params),
-    subject: Handlebars.compile(source.subject)(params),
+    message: _.template.compile(source.message)(params),
+    subject: _.template.compile(source.subject)(params),
   };
 }
-

book/6-end/server/aws.js

@@ -2,7 +2,7 @@ import aws from 'aws-sdk';
 
 export default function sendEmail(options) {
   aws.config.update({
-    region: 'us-east-1',
+    region: process.env.Amazon_region,
     accessKeyId: process.env.Amazon_accessKeyId,
     secretAccessKey: process.env.Amazon_secretAccessKey,
   });

book/6-end/server/models/EmailTemplate.js

@@ -1,6 +1,5 @@
 import mongoose from 'mongoose';
-import Handlebars from 'handlebars';
-
+import _ from 'lodash';
 import logger from '../logs';
 
 const { Schema } = mongoose;
@@ -28,14 +27,14 @@ function insertTemplates() {
     {
       name: 'welcome',
       subject: 'Welcome to builderbook.org',
-      message: `{{userName}},
+      message: `<%= userName %>,
         <p>
           At Builder Book, we are excited to help you build useful, production-ready web apps from scratch.
         </p>
-        <p> 
-          See list of available books here.   
+        <p>
+          See list of available books here.
         </p>
-        
+
         Kelly & Timur,
         Team BB
       `,
@@ -60,12 +59,13 @@ insertTemplates();
 export default async function getEmailTemplate(name, params) {
   const source = await EmailTemplate.findOne({ name });
   if (!source) {
-    throw new Error('No EmailTemplates found. Please check that at least one is generated at server startup, restart your server and try again.');
+    throw new Error(`No EmailTemplates found.
+      Please check that at least one is generated at server startup,
+      restart your server and try again.`);
   }
 
   return {
-    message: Handlebars.compile(source.message)(params),
-    subject: Handlebars.compile(source.subject)(params),
+    message: _.template.compile(source.message)(params),
+    subject: _.template.compile(source.subject)(params),
   };
 }
-

book/6-start/server/aws.js

@@ -2,7 +2,7 @@ import aws from 'aws-sdk';
 
 export default function sendEmail(options) {
   aws.config.update({
-    region: 'us-east-1',
+    region: process.env.Amazon_region,
     accessKeyId: process.env.Amazon_accessKeyId,
     secretAccessKey: process.env.Amazon_secretAccessKey,
   });