backend-manager 3.0.21 → 3.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.0.21",
+  "version": "3.0.23",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -53,7 +53,7 @@
     "moment": "^2.29.4",
     "nanoid": "^3.3.7",
     "node-fetch": "^2.7.0",
-    "node-powertools": "^1.1.0",
+    "node-powertools": "^1.1.1",
     "npm-api": "^1.0.1",
     "paypal-server-api": "^1.0.3",
     "pushid": "^1.0.0",
@@ -65,7 +65,7 @@
     "ultimate-jekyll-poster": "^0.0.15",
     "universal-analytics": "^0.5.3",
     "uuid": "^9.0.1",
-    "wonderful-fetch": "^1.0.0",
+    "wonderful-fetch": "^1.0.1",
     "wonderful-log": "^1.0.5",
     "yargs": "^17.7.2"
   }

package/src/manager/functions/core/actions/api/general/emails/general:download-app-link.js

@@ -1,57 +1,23 @@
 module.exports = function (payload, config) {
-  const subject = `Free ${config.brand.name} download link for ${payload.name || 'you'}!`;
-  const templateId = 'd-1d730ac8cc544b7cbccc8fa4a4b3f9ce';
-  const groupId = 16223;
-
   return {
     // spamFilter: {
     //   ip: 3,
     //   email: 3,
     // },
     // delay: 1,
-    body: {
-      personalizations: [
-        {
-          to: [
-            {
-              name: payload.name,
-              email: payload.email,
-            },
-          ],
-          dynamic_template_data: {
-            subject: subject,
-            app: {
-              url: config.brand.url,
-              name: config.brand.name,
-              wordmark: config.brand.wordmark,
-              brandmark: config.brand.brandmark,
-              combomark: config.brand.combomark,
-            },
-            footer: {
-              name: 'ITW Creative Works',
-              address: '4001 Inglewood Ave 101-385',
-              city: 'Redondo Beach',
-              state: 'CA',
-              zip: '90278',
-              'unsubscribe-link': `https://itwcreativeworks.com/email-preferences/?email=${encodeURIComponent(payload.email)}&asmId=${encodeURIComponent(groupId)}&templateId=${encodeURIComponent(templateId)}&appName=${encodeURIComponent(config.brand.name)}`,
-            },
-          },                    
-        }
-      ],
-      from: {
-        name: config.brand.name,
-        email: config.brand.email,
-      },        
-      reply_to: {
-        name: config.brand.name,
-        email: config.brand.email,
+    payload: {
+      to: {
+        email: payload.email,
+        name: payload.name,
       },
-      subject: subject,
-      template_id: templateId,
-      asm: {
-        group_id: groupId,
+      categories: ['download'],
+      subject: `Free ${config.brand.name} download link for ${payload.name || 'you'}!`,
+      template: 'd-1d730ac8cc544b7cbccc8fa4a4b3f9ce',
+      group: 24077,
+      options: {
+        copy: false,
       },
-      categories: ['transactional', 'download', config.app.id],
+      data: {},
     }
   }
 }

package/src/manager/functions/core/actions/api/general/send-email.js

@@ -19,12 +19,16 @@ Module.prototype.main = function () {
     payload.data.payload.name = payload.data.payload.name;
 
     const DEFAULT = {
+
       spamFilter: {
         ip: 3,
         email: 3,
       },
       delay: 1,
-      body: {},
+      payload: {
+        backendManagerKey: Manager.config.backend_manager.key,
+        app: Manager.config.app.id,
+      },
     }
 
     if (!payload.data.payload.id) {
@@ -35,7 +39,12 @@ Module.prototype.main = function () {
 
     let emailPayload
     try {
-      emailPayload = merge({}, DEFAULT, require(path.join(__dirname, 'emails', `${payload.data.payload.id}.js`))(payload.data.payload, Manager.config));
+      const script = require(path.join(__dirname, 'emails', `${payload.data.payload.id}.js`))
+      emailPayload = merge(
+        {},
+        DEFAULT,
+        script(payload.data.payload, Manager.config),
+      );
     } catch (e) {
       return reject(assistant.errorManager(`${payload.data.payload.id} is not a valid email ID.`, {code: 400, sentry: false, send: false, log: false}).error)
     }
@@ -65,26 +74,22 @@ Module.prototype.main = function () {
       return resolve({data: {success: true}});
     }
 
+    // Log the email payload
     assistant.log('Email payload:', emailPayload, {environment: 'production'});
 
-    const sendableBody = {
-      backendManagerKey: Manager.config.backend_manager.key,
-      service: 'sendgrid',
-      command: `v3/mail/send`,
-      method: 'post',
-      delay: emailPayload.delay,
-      body: emailPayload.body,
+    if (emailPayload.delay) {
+      emailPayload.body.sendAt = new Date(new Date().getTime() + (emailPayload.delay * 1000)).toISOString();
     }
 
-    fetch('https://us-central1-itw-creative-works.cloudfunctions.net/wrapper', {
+    // Send the email
+    await fetch(`https://us-central1-itw-creative-works.cloudfunctions.net/sendEmail`, {
       method: 'post',
-      timeout: 30000,
-      tries: 1,
       response: 'json',
-      body: sendableBody,
+      log: true,
+      body: emailPayload.body,
     })
-    .then(res => {
-      assistant.log('Response:', res, {environment: 'production'});
+    .then(async (json) => {
+      assistant.log('Response:', json, {environment: 'production'});
 
       return resolve({
         data: {
@@ -94,7 +99,8 @@ Module.prototype.main = function () {
     })
     .catch(e => {
       return reject(assistant.errorManager(`Error sending email: ${e}`, {code: 500, sentry: true, send: false, log: false}).error)
-    })
+    });
+
   });
 
 };

package/src/manager/functions/core/actions/create-post-handler.js

@@ -44,7 +44,7 @@ let Module = {
         // label: '',
       });
 
-      assistant.log('Creating campagin with data', assistant.request.data)      
+      assistant.log('Creating campagin with data', assistant.request.data)
 
       if (!user.roles.admin) {
         response.status = 401;
@@ -102,7 +102,7 @@ let Module = {
         })
         .then(async (campaign) => {
           assistant.log('Created campaign', campaign);
-          await fetch(`https://email.itwcreativeworks.com/general/mailchimp-blog-syndication/?cb=${Math.random()}`)
+          await fetch(`https://email.itwcreativeworks.com/general/mailchimp-blog-syndication?cb=${Math.random()}`)
           .then(async (fetchResponse) => {
             if (fetchResponse.status >= 200 && fetchResponse.status < 300) {
               let html = await fetchResponse.text();