backend-manager 3.2.16 → 3.2.18

package/package.json

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

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

@@ -13,7 +13,7 @@ module.exports = function (payload, config) {
       categories: ['download'],
       subject: `Free ${config.brand.name} download link for ${payload.name || 'you'}!`,
       template: 'd-1d730ac8cc544b7cbccc8fa4a4b3f9ce',
-      group: 24077,
+      group: 25927,
       copy: false,
       data: {},
     }

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

@@ -13,8 +13,8 @@ Module.prototype.main = function () {
 
   return new Promise(async function(resolve, reject) {
     const Manager = self.Manager;
-    const Api = self.Api;
     const assistant = self.assistant;
+    const Api = self.Api;
     const payload = self.payload;
 
     Api.resolveUser({adminRequired: true})
@@ -41,7 +41,7 @@ Module.prototype.main = function () {
         const signups = usage.getUsage('signups');
 
         // Log the signup
-        usage.log(`Validating signups ${signups}/${MAX_SIGNUPS} for ip ${ip}`,);
+        assistant.log(`Validating signups ${signups}/${MAX_SIGNUPS} for ip ${ip}`, user);
 
         // If over limit, reject and delete the user
         if (signups >= MAX_SIGNUPS) {
@@ -50,40 +50,7 @@ Module.prototype.main = function () {
               await lib.main().catch(e => e);
             })
 
-          // 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: Manager.config.brand.email,
-              },
-              categories: [`user/too-many-signups`],
-              subject: `Your ${Manager.config.brand.name} account has been deleted`,
-              template: 'd-57aad40b0c20466aba08feb9892910cf',
-              group: 24077,
-              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>
-                  <br>
-                  If you believe this is a mistake, please contact us at ${Manager.config.brand.email}.
-                `
-              },
-            },
-          })
-          .then(async (json) => {
-            self.assistant.log('sendEmail(): Success', json)
-            return resolve(json);
-          })
-          .catch(e => {
-            self.assistant.error('sendEmail(): Failed', e)
-            return resolve(e);
-          });
+          await self.sendRateEmail(user);
 
           // Reject
           return reject(assistant.errorify(`Too many signups from this IP (${ip}).`, {code: 429, sentry: false, send: false, log: false}));
@@ -132,13 +99,109 @@ Module.prototype.main = function () {
 
 };
 
+Module.prototype.sendRateEmail = 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: 25927,
+        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.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;
 
   return new Promise(async function(resolve, reject) {
     const Manager = self.Manager;
-    const Api = self.Api;
     const assistant = self.assistant;
+    const Api = self.Api;
 
     const result = {
       signedUp: false,
@@ -204,8 +267,8 @@ Module.prototype.updateReferral = function (payload) {
 
   return new Promise(function(resolve, reject) {
     const Manager = self.Manager;
-    const Api = self.Api;
     const assistant = self.assistant;
+    const Api = self.Api;
 
     const result = {
       count: 0,

package/src/manager/libraries/openai.js

@@ -87,6 +87,9 @@ OpenAI.prototype.request = function (options) {
       options.message.settings,
     ).trim();
     const user = options.user?.auth?.uid || assistant.request.geolocation.ip;
+    const responseFormat = options.response === 'json' && !options.model.includes('gpt-3.5')
+      ? { type: 'json_object' }
+      : undefined;
 
     assistant.log('callOpenAI(): Prompt', prompt);
     assistant.log('callOpenAI(): Message', message);
@@ -125,7 +128,7 @@ OpenAI.prototype.request = function (options) {
 
           request.body = {
             model: options.model,
-            response_format: options.response === 'json' ? { type: 'json_object' } : undefined,
+            response_format: responseFormat,
             messages: options.history.messages,
             temperature: options.temperature,
             max_tokens: options.maxTokens,
@@ -193,6 +196,8 @@ OpenAI.prototype.request = function (options) {
           moderation: moderation,
         })
       } catch (e) {
+        assistant.warn('callOpenAI(): Error parsing response', r, e);
+
         return reject(e);
       }
     })