backend-manager 3.2.18 → 3.2.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.2.18",
+  "version": "3.2.20",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {

package/src/manager/functions/core/actions/api/user/sign-up.js

@@ -50,7 +50,7 @@ Module.prototype.main = function () {
               await lib.main().catch(e => e);
             })
 
-          await self.sendRateEmail(user);
+          await self.sendRateEmail(user).catch(e => e);
 
           // Reject
           return reject(assistant.errorify(`Too many signups from this IP (${ip}).`, {code: 429, sentry: false, send: false, log: false}));
@@ -62,36 +62,41 @@ Module.prototype.main = function () {
         // Update signups
         await usage.update();
 
+        // Send welcome email
+        await self.sendWelcomeEmail(user).catch(e => e);
+
         await self.signUp({
           auth: {
-            uid: _.get(user, 'auth.uid', null),
-            email: _.get(user, 'auth.email', null),
+            uid: user?.auth?.uid,
+            email: user?.auth?.email,
           },
           affiliate: {
-            referrer: _.get(payload.data.payload, 'affiliateCode', null),
+            referrer: payload?.data?.payload?.affiliateCode || null,
           },
         })
         .then(async function (result) {
-          if (_.get(payload.data.payload, 'newsletterSignUp', false)) {
-            await addToMCList(
-              _.get(Manager.config, 'mailchimp.key'),
-              _.get(Manager.config, 'mailchimp.list_id'),
-              _.get(user, 'auth.email', null),
-            )
-            .then(function (res) {
-              assistant.log('Sucessfully added user to MC list.')
-            })
-            .catch(function (e) {
-              assistant.log('Failed to add user to MC list.', e)
-            })
+          // Skip if not a newsletter sign up
+          if (!payload?.data?.payload?.newsletterSignUp) {
+            return resolve({data: result});
           }
+
+          // Add to SendGrid list
+          await self.addToSendGridList(user)
+          .then((r) => {
+            assistant.log('addToSendGridList(): Success', r)
+          })
+          .catch((e) => {
+            assistant.log('Failed to add user to MC list.', e)
+          })
+
+          // Resolve
           return resolve({data: result});
         })
-        .catch(function (e) {
+        .catch((e) => {
           return reject(assistant.errorify(`Failed to sign up: ${e}`, {code: 500, sentry: false, send: false, log: false}));
         })
     })
-    .catch(e => {
+    .catch((e) => {
       return reject(e);
     })
 
@@ -121,6 +126,61 @@ Module.prototype.sendRateEmail = function (user) {
         subject: `Your ${Manager.config.brand.name} account has been deleted`,
         template: 'd-b7f8da3c98ad49a2ad1e187f3a67b546',
         group: 25927,
+        data: {
+          body: {
+            title: 'Account deleted',
+            message: `
+              Your account at <strong>${Manager.config.brand.name}</strong> has been <strong>deleted</strong> because you have signed up for too many accounts.
+              <br>
+              <br>
+              If you believe this is a mistake, please contact us at ${Manager.config.brand.email}.
+              <br>
+              <br>
+              <strong>User Record</strong>:
+              <br>
+              <pre>
+                <code>
+                  ${JSON.stringify(user, null, 2)}
+                </code>
+              </pre>
+            `,
+          },
+        },
+      },
+    })
+    .then(async (json) => {
+      assistant.log('sendEmail(): Success', json)
+      return resolve(json);
+    })
+    .catch(e => {
+      assistant.error('sendEmail(): Failed', e)
+      return resolve(e);
+    });
+  });
+}
+
+Module.prototype.sendWelcomeEmail = function (user) {
+  const self = this;
+
+  return new Promise(async function(resolve, reject) {
+    const Manager = self.Manager;
+    const assistant = self.assistant;
+
+    // Send email
+    fetch(`https://us-central1-itw-creative-works.cloudfunctions.net/sendEmail`, {
+      method: 'post',
+      response: 'json',
+      log: true,
+      body: {
+        backendManagerKey: Manager.config.backend_manager.key,
+        app: Manager.config.app.id,
+        to: {
+          email: user.auth.email,
+        },
+        categories: [`account/welcome-1`],
+        subject: `Your ${Manager.config.brand.name} account has been deleted`,
+        template: 'd-b7f8da3c98ad49a2ad1e187f3a67b546',
+        group: 25928,
         data: {
           title: 'Account deleted',
           message: `
@@ -147,54 +207,6 @@ Module.prototype.sendRateEmail = function (user) {
   });
 }
 
-// Module.prototype.sendWelcomeEmail = function (user) {
-//   const self = this;
-
-//   return new Promise(async function(resolve, reject) {
-//     const Manager = self.Manager;
-//     const assistant = self.assistant;
-
-//     // Send email
-//     fetch(`https://us-central1-itw-creative-works.cloudfunctions.net/sendEmail`, {
-//       method: 'post',
-//       response: 'json',
-//       log: true,
-//       body: {
-//         backendManagerKey: Manager.config.backend_manager.key,
-//         app: Manager.config.app.id,
-//         to: {
-//           email: user.auth.email,
-//         },
-//         categories: [`account/too-many-signups`],
-//         subject: `Your ${Manager.config.brand.name} account has been deleted`,
-//         template: 'd-b7f8da3c98ad49a2ad1e187f3a67b546',
-//         group: 25928,
-//         data: {
-//           title: 'Account deleted',
-//           message: `
-//             Your account at ${Manager.config.brand.name} has been deleted because you have signed up for too many accounts.
-//             <br>
-//             If you believe this is a mistake, please contact us at ${Manager.config.brand.email}.
-//             <br>
-//             <br>
-//             <strong>User Record</strong>:
-//             <br>
-//             ${JSON.stringify(user, null, 2)}
-//           `
-//         },
-//       },
-//     })
-//     .then(async (json) => {
-//       assistant.log('sendEmail(): Success', json)
-//       return resolve(json);
-//     })
-//     .catch(e => {
-//       assistant.error('sendEmail(): Failed', e)
-//       return resolve(e);
-//     });
-//   });
-// }
-
 Module.prototype.signUp = function (payload) {
   const self = this;
 
@@ -214,7 +226,7 @@ Module.prototype.signUp = function (payload) {
     assistant.log(`signUp(): payload`, payload)
 
     // Check if the user has a UID and email
-    if (!_.get(payload, 'auth.uid', null) || !_.get(payload, 'auth.email', null)) {
+    if (!payload?.auth?.uid || !payload?.email?.uid) {
       return reject(new Error('Cannot create user without UID and email.'))
     }
 
@@ -334,6 +346,78 @@ Module.prototype.updateReferral = function (payload) {
   });
 }
 
+// addToSendGridList
+Module.prototype.addToSendGridList = function (user) {
+  const self = this;
+
+  return new Promise(async function(resolve, reject) {
+    const Manager = self.Manager;
+    const assistant = self.assistant;
+    const Api = self.Api;
+
+    if (!user?.auth?.email) {
+      return reject(new Error('Cannot add user to SendGrid list without email.'))
+    }
+
+    // Add to SendGrid list
+    fetch('https://api.itwcreativeworks.com/wrapper', {
+      method: 'post',
+      response: 'json',
+      body: {
+        backendManagerKey: Manager.config.backend_manager.key,
+        service: 'sendgrid',
+        command: `/v3/marketing/contacts`,
+        method: `put`,
+        body: {
+          contacts: [
+            {
+              email: user?.auth?.email,
+              address_line_1: undefined,
+              address_line_2: undefined,
+              // alternate_emails: [],
+              city: user?.activity?.geolocation?.city,
+              country: user?.activity?.geolocation?.country,
+              first_name: undefined,
+              last_name: undefined,
+              postal_code: undefined,
+              state_province_region: user?.activity?.geolocation?.region,
+
+              custom_fields: {
+                app: Manager.config.app.id,
+                user: user?.auth?.uid,
+              },
+            },
+          ],
+        },
+      },
+    })
+    .then(function (res) {
+      assistant.log('Sucessfully added user to SendGrid list.')
+      return resolve(res);
+    })
+    .catch(function (e) {
+      assistant.log('Failed to add user to SendGrid list.', e)
+      return resolve(e);
+    })
+
+    // await self.libraries.sendgrid.request({
+    //   method: 'post',
+    //   url: `/v3/contactdb/recipients`,
+    //   body: [{
+    //     email: email,
+    //   }],
+    // })
+    // .then(function (res) {
+    //   assistant.log('Sucessfully added user to SendGrid list.')
+    //   return resolve(res);
+    // })
+    // .catch(function (e) {
+    //   assistant.log('Failed to add user to SendGrid list.', e)
+    //   return resolve(e);
+    // })
+  });
+}
+
 function addToMCList(key, listId, email) {
   return new Promise((resolve, reject) => {
     let datacenter = key.split('-')[1];