backend-manager 3.2.6 → 3.2.8

package/package.json

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

package/src/cli/cli.js

@@ -17,6 +17,7 @@ const { spawn, child, exec, fork } = require('child_process');
 const JSON5 = require('json5');
 const fetch = require('wonderful-fetch');
 const argv = require('yargs').argv;
+const powertools = require('node-powertools');
 
 // function parseArgumentsIntoOptions(rawArgs) {
 //   const args = arg(
@@ -558,6 +559,22 @@ Main.prototype.setup = async function () {
     return true;
   }, NOFIX);
 
+  await self.test('create public .html files', function () {
+    const options = {url: self.bemConfigJSON.brand.url}
+    // index.html
+    const templateIndex = jetpack.read(path.resolve(`${__dirname}/../../templates/public/index.html`));
+    jetpack.write(`${self.firebaseProjectPath}/public/index.html`,
+      powertools.template(templateIndex, options)
+    )
+
+    // 404.html
+    const template404 = jetpack.read(path.resolve(`${__dirname}/../../templates/public/404.html`));
+    jetpack.write(`${self.firebaseProjectPath}/public/404.html`,
+      powertools.template(template404, options)
+    )
+    return true;
+  }, NOFIX);
+
   // await self.test('add roles/datastore.importExportAdmin', function () {
   //   const result = await cmd_iamImportExport(self);
   //   console.log('---result', result);

package/src/manager/functions/core/actions/api/admin/backup.js

@@ -19,7 +19,7 @@ Module.prototype.main = function () {
     payload.data.payload.deletionRegex = payload.data.payload.deletionRegex ? powertools.regexify(payload.data.payload.deletionRegex) : payload.data.payload.deletionRegex;
 
     if (!payload.user.roles.admin && assistant.meta.environment === 'production') {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     }
 
     // https://googleapis.dev/nodejs/firestore/latest/v1.FirestoreAdminClient.html#exportDocuments
@@ -61,7 +61,8 @@ Module.prototype.main = function () {
     })
     .catch(async (e) => {
       await self._setMetaStats(e);
-      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: true}).error)
+
+      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: true}));
     });
 
   });

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

@@ -18,7 +18,7 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
     // Perform checks
     if (!payload.user.roles.admin && !payload.user.roles.blogger) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     }
 
     const repoInfo = assistant.parseRepo(get(self.Manager.config, 'github.repo_website'));
@@ -45,7 +45,7 @@ Module.prototype.main = function () {
     const finalPost = await poster.create(payload.data).catch(e => e);
 
     if (finalPost instanceof Error) {
-      return reject(assistant.errorify(`Failed to post: ${finalPost}`, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Failed to post: ${finalPost}`, {code: 500, sentry: false, send: false, log: false}));
     }
 
     // Request indexing
@@ -68,7 +68,7 @@ Module.prototype.main = function () {
       return resolve({data: finalPost});
     })
     .catch((e) => {
-      return reject(assistant.errorify(`Failed to post: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Failed to post: ${e}`, {code: 500, sentry: false, send: false, log: false}));
     })
 
   });

package/src/manager/functions/core/actions/api/admin/cron.js

@@ -13,12 +13,12 @@ Module.prototype.main = function () {
 
     // Check if the user is an admin
     if (!payload.user.roles.admin && assistant.meta.environment === 'production') {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     }
 
     // Check if the ID is set
     if (!payload.data.payload.id) {
-      return reject(assistant.errorify(`Missing parameter {id}`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Missing parameter {id}`, {code: 400, sentry: false, send: false, log: false}));
     }
 
     // Run the cron job
@@ -27,7 +27,7 @@ Module.prototype.main = function () {
       return resolve({data: res});
     })
     .catch(e => {
-      return reject(assistant.errorify(e, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(e, {code: 400, sentry: false, send: false, log: false}));
     })
   });
 

package/src/manager/functions/core/actions/api/admin/database-read.js

@@ -16,9 +16,9 @@ Module.prototype.main = function () {
 
     // Perform checks
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}));
     }
 
     // Read from Firestore

package/src/manager/functions/core/actions/api/admin/database-write.js

@@ -17,9 +17,9 @@ Module.prototype.main = function () {
 
     // Perform checks
     if (payload.user.roles.admin) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error);
+      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}));
     }
 
     // Write to Firestore
@@ -29,7 +29,7 @@ Module.prototype.main = function () {
       return resolve({data: payload.data.payload.document});
     })
     .catch((e) => {
-      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}));
     });
   });
 

package/src/manager/functions/core/actions/api/admin/firestore-query.js

@@ -15,7 +15,7 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
     // Perform checks
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     }
 
     // Run queries
@@ -35,7 +35,7 @@ Module.prototype.main = function () {
         return resolve({data: self.docs});
       })
       .catch((e) => {
-        return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}));
       })
 
   });

package/src/manager/functions/core/actions/api/admin/firestore-read.js

@@ -16,9 +16,9 @@ Module.prototype.main = function () {
 
     // Perform checks
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}));
     }
 
     // Read from Firestore
@@ -28,7 +28,7 @@ Module.prototype.main = function () {
       return resolve({data: doc.data()});
     })
     .catch(e => {
-      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}));
     })
   });
 

package/src/manager/functions/core/actions/api/admin/firestore-write.js

@@ -19,9 +19,9 @@ Module.prototype.main = function () {
 
     // Perform checks
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorify(`Path parameter required.`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Path parameter required.`, {code: 400, sentry: false, send: false, log: false}));
     }
 
     // Set metadata
@@ -37,7 +37,7 @@ Module.prototype.main = function () {
       return resolve({data: {path: payload.data.payload.path}});
     })
     .catch(e => {
-      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}));
     })
   });
 

package/src/manager/functions/core/actions/api/admin/get-stats.js

@@ -17,7 +17,7 @@ Module.prototype.main = function () {
 
     // Perform checks
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     }
 
     // Get stats
@@ -34,7 +34,7 @@ Module.prototype.main = function () {
         }
 
         if (data instanceof Error) {
-          return reject(assistant.errorify(data, {code: 500, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(data, {code: 500, sentry: false, send: false, log: false}));
         }
 
         // Retrieve the stats again after updating
@@ -47,13 +47,13 @@ Module.prototype.main = function () {
 
 
         if (data instanceof Error) {
-          return reject(assistant.errorify(data, {code: 500, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(data, {code: 500, sentry: false, send: false, log: false}));
         }
 
         return resolve({data: data})
       })
       .catch(function (e) {
-        return reject(assistant.errorify(`Failed to get: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`Failed to get: ${e}`, {code: 500, sentry: false, send: false, log: false}));
       })
   });
 

package/src/manager/functions/core/actions/api/admin/payment-processor.js

@@ -15,12 +15,12 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
 
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     }
 
     const productId = _.get(payload, 'data.payload.payload.details.productIdGlobal');
     if (!productId) {
-      return reject(assistant.errorify(`No productId`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`No productId`, {code: 400, sentry: false, send: false, log: false}));
     }
     const processorPath = `${process.cwd()}/payment-processors/${productId}.js`
     let processor;
@@ -45,7 +45,7 @@ Module.prototype.main = function () {
       return resolve({data: result});
     })
     .catch(e => {
-      return reject(assistant.errorify(`Payment processor @ "${processorPath}" failed: ${e}`, {code: 400, sentry: true, send: false, log: false}).error)
+      return reject(assistant.errorify(`Payment processor @ "${processorPath}" failed: ${e}`, {code: 400, sentry: true, send: false, log: false}));
     })
   });
 

package/src/manager/functions/core/actions/api/admin/send-notification.js

@@ -37,17 +37,17 @@ Module.prototype.main = function () {
       self._notificationPayload.notification.click_action.searchParams.set('cb', new Date().getTime())
       self._notificationPayload.notification.click_action = self._notificationPayload.notification.click_action.toString()
     } catch (e) {
-      assistant.errorify(`Failed to add cb to URL: ${e}`, {code: 500, sentry: false, send: false, log: true})
+      assistant.errorify(`Failed to add cb to URL: ${e}`, {code: 500, sentry: false, send: false, log: true});
     }
 
     assistant.log('Resolved notification payload', self._notificationPayload)
 
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     }
 
     if (!payload.data.payload.title || !payload.data.payload.body) {
-      return reject(assistant.errorify(`Parameters <title> and <body> required`, {code: 400, sentry: true, send: false, log: false}).error)
+      return reject(assistant.errorify(`Parameters <title> and <body> required`, {code: 400, sentry: true, send: false, log: false}));
     }
 
     await self.getTokens({tags: false})
@@ -55,7 +55,7 @@ Module.prototype.main = function () {
       return resolve({data: payload.response.data})
     })
     .catch(e => {
-      return reject(assistant.errorify(`Failed to send notification: ${e}`, {code: 400, sentry: true, send: false, log: false}).error)
+      return reject(assistant.errorify(`Failed to send notification: ${e}`, {code: 400, sentry: true, send: false, log: false}));
     })
   });
 

package/src/manager/functions/core/actions/api/admin/sync-users.js

@@ -15,7 +15,7 @@ Module.prototype.main = function () {
 
     // If the user is not an admin, reject
     if (!payload.user.roles.admin && assistant.meta.environment === 'production') {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     }
 
     // Get lastPageToken from meta/stats
@@ -116,7 +116,7 @@ Module.prototype.main = function () {
         return resolve();
       })
       .catch(e => {
-        return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}));
       })
   });
 

package/src/manager/functions/core/actions/api/firebase/get-providers.js

@@ -44,7 +44,7 @@ Module.prototype.main = function () {
     payload.data.payload.firebaseApiKey = payload.data.payload.firebaseApiKey || _.get(Manager, 'config.firebaseConfig.apiKey') || false;
 
     if (!payload.data.payload.firebaseApiKey) {
-      return reject(assistant.errorify(`The firebaseApiKey parameter is required.`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`The firebaseApiKey parameter is required.`, {code: 400, sentry: false, send: false, log: false}));
     }
 
     // Default
@@ -91,7 +91,7 @@ Module.prototype.main = function () {
 
             payload.response.data[provider.name] = result;
           } catch (e) {
-            assistant.errorify(`Error parsing error: ${e}`, {sentry: true, send: false, log: true})
+            assistant.errorify(`Error parsing error: ${e}`, {sentry: true, send: false, log: true});
             payload.response.data[provider.name] = false;
           }
         })
@@ -144,7 +144,7 @@ Module.prototype.main = function () {
 
     })
     .catch(e => {
-      return reject(assistant.errorify(`Failed to check providers: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Failed to check providers: ${e}`, {code: 500, sentry: false, send: false, log: false}));
     })
 
   });

package/src/manager/functions/core/actions/api/general/generate-uuid.js

@@ -20,14 +20,14 @@ Module.prototype.main = function () {
 
     if (payload.data.payload.version === '5') {
       if (!payload.data.payload.name) {
-        return reject(assistant.errorify(`You must provide a name to hash for uuid v5.`, {code: 400, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`You must provide a name to hash for uuid v5.`, {code: 400, sentry: false, send: false, log: false}));
       } else {
         result = uuid.v5(payload.data.payload.name, payload.data.payload.namespace);
       }
     } else if (payload.data.payload.version === '4') {
       result = uuid.v4();
     } else {
-      return reject(assistant.errorify(`v${payload.data.payload.version} is not a valid version.`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`v${payload.data.payload.version} is not a valid version.`, {code: 400, sentry: false, send: false, log: false}));
     }
 
     assistant.log('UUID Generated', payload.data.payload, result);

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

@@ -32,9 +32,9 @@ Module.prototype.main = function () {
     }
 
     if (!payload.data.payload.id) {
-      return reject(assistant.errorify(`Parameter {id} is required.`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Parameter {id} is required.`, {code: 400, sentry: false, send: false, log: false}));
     } else if (!payload.data.payload.email) {
-      return reject(assistant.errorify(`Parameter {email} is required.`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Parameter {email} is required.`, {code: 400, sentry: false, send: false, log: false}));
     }
 
     let emailPayload
@@ -46,7 +46,7 @@ Module.prototype.main = function () {
         script(payload.data.payload, Manager.config),
       );
     } catch (e) {
-      return reject(assistant.errorify(`${payload.data.payload.id} is not a valid email ID.`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`${payload.data.payload.id} is not a valid email ID.`, {code: 400, sentry: false, send: false, log: false}));
     }
 
     const storage = Manager.storage({temporary: true});
@@ -70,7 +70,8 @@ Module.prototype.main = function () {
     assistant.log('Storage:', storage.getState()['api:general:send-email']);
 
     if (ipData.count >= emailPayload.spamFilter.ip || emailData.count >= emailPayload.spamFilter.email) {
-      self.assistant.errorify(`Spam filter triggered ip=${ipData.count}, email=${emailData.count}`, {code: 429, sentry: false, send: false, log: true})
+      self.assistant.errorify(`Spam filter triggered ip=${ipData.count}, email=${emailData.count}`, {code: 429, sentry: false, send: false, log: true});
+
       return resolve({data: {success: true}});
     }
 
@@ -99,7 +100,7 @@ Module.prototype.main = function () {
       });
     })
     .catch(e => {
-      return reject(assistant.errorify(`Error sending email: ${e}`, {code: 500, sentry: true, send: false, log: false}).error)
+      return reject(assistant.errorify(`Error sending email: ${e}`, {code: 500, sentry: true, send: false, log: false}));
     });
 
   });

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

@@ -15,7 +15,7 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
 
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     }
 
     payload.response.data = {
@@ -83,7 +83,7 @@ Module.prototype.main = function () {
       .catch(e => e);
 
       if (createdInvoice instanceof Error) {
-        return reject(assistant.errorify(createdInvoice, {code: 400, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(createdInvoice, {code: 400, sentry: false, send: false, log: false}));
       }
 
       // Send invoice
@@ -104,7 +104,7 @@ Module.prototype.main = function () {
       .catch(e => e);
 
       if (sentInvoice instanceof Error) {
-        return reject(assistant.errorify(sentInvoice, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(sentInvoice, {code: 500, sentry: false, send: false, log: false}));
       }
 
       payload.response.data.invoice = {

package/src/manager/functions/core/actions/api/special/setup-electron-manager-client.js

@@ -32,11 +32,11 @@ Module.prototype.main = function () {
           signInToken = token;
         })
         .catch(e => {
-          error = assistant.errorify(`Failed to create custom token: ${e}`, {code: 500, sentry: false, send: false, log: false}).error
+          error = assistant.errorify(`Failed to create custom token: ${e}`, {code: 500, sentry: false, send: false, log: false});
         })
       })
       .catch(e => {
-        assistant.errorify(`Failed to resolve user: ${e}`, {code: 500, sentry: false, send: false, log: true})
+        assistant.errorify(`Failed to resolve user: ${e}`, {code: 500, sentry: false, send: false, log: true});
       })
 
       if (error) {
@@ -93,15 +93,11 @@ Module.prototype.main = function () {
       });
     })
     .catch(e => {
-      return reject(assistant.errorify(`Error fetching app details: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Error fetching app details: ${e}`, {code: 500, sentry: false, send: false, log: false}));
     })
 
-
-
-
   });
 
 };
 
-
 module.exports = Module;

package/src/manager/functions/core/actions/api/template.js

@@ -12,7 +12,7 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
 
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     }
 
     // self.Api.resolveUser({adminRequired: false})

package/src/manager/functions/core/actions/api/test/create-test-accounts.js

@@ -12,7 +12,7 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
 
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
     }
 
     assistant.log('User:', payload.user);

package/src/manager/functions/core/actions/api/test/webhook.js

@@ -19,7 +19,7 @@ Module.prototype.main = function () {
     if (payload.data.payload.status >= 200 && payload.data.payload.status <= 299) {
       return resolve({data: payload.data.payload.response, status: payload.data.payload.status});
     } else if (payload.data.payload.status >= 400 && payload.data.payload.status <= 599) {
-      return reject(assistant.errorify(payload.data.payload.response || 'Unknown error message provided', {code: payload.data.payload.status, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(payload.data.payload.response || 'Unknown error message provided', {code: payload.data.payload.status, sentry: false, send: false, log: false}));
     }
 
   });

package/src/manager/functions/core/actions/api/user/create-custom-token.js

@@ -19,7 +19,7 @@ Module.prototype.main = function () {
         return resolve({data: {token: token}});
       })
       .catch(e => {
-        return reject(assistant.errorify(`Failed to create custom token: ${e}`, {code: 400, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`Failed to create custom token: ${e}`, {code: 400, sentry: false, send: false, log: false}));
       })
     })
     .catch(e => {

package/src/manager/functions/core/actions/api/user/delete.js

@@ -22,7 +22,7 @@ Module.prototype.main = function () {
         (user?.plan?.status && user?.plan?.status !== 'cancelled')
         || user?.plan?.payment?.active
       ) {
-        return reject(assistant.errorify(`This account cannot be deleted because it has a paid subscription attached to it. In order to delete the account, you must first cancel the paid subscription.`, {code: 400, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`This account cannot be deleted because it has a paid subscription attached to it. In order to delete the account, you must first cancel the paid subscription.`, {code: 400, sentry: false, send: false, log: false}));
       }
 
       // Signout of all sessions
@@ -54,7 +54,7 @@ Module.prototype.main = function () {
         return resolve({data: {success: true}});
       })
       .catch(e => {
-        return reject(assistant.errorify(`Failed to delete user: ${e}`, {code: 400, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`Failed to delete user: ${e}`, {code: 400, sentry: false, send: false, log: false}));
       })
     })
     .catch(e => {

package/src/manager/functions/core/actions/api/user/get-active-sessions.js

@@ -30,7 +30,7 @@ Module.prototype.main = function () {
         return resolve({data: data});
       })
       .catch(e => {
-        return reject(assistant.errorify(`Session query error: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`Session query error: ${e}`, {code: 500, sentry: false, send: false, log: false}));
       })
 
     })

package/src/manager/functions/core/actions/api/user/regenerate-api-keys.js

@@ -39,7 +39,7 @@ Module.prototype.main = function () {
         return resolve({data: newKeys});
       })
       .catch(e => {
-        return reject(assistant.errorify(`Failed to generate keys: ${e}`, {code: 500, sentry: true, send: false, log: false}).error)
+        return reject(assistant.errorify(`Failed to generate keys: ${e}`, {code: 500, sentry: true, send: false, log: false}));
       })
 
     })

package/src/manager/functions/core/actions/api/user/sign-out-all-sessions.js

@@ -37,10 +37,10 @@ Module.prototype.main = function () {
             return resolve({data: {sessions: count, message: `Successfully signed ${uid} out of all sessions`}});
           })
           .catch(e => {
-            return reject(assistant.errorify(`Failed to sign out of all sessions: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+            return reject(assistant.errorify(`Failed to sign out of all sessions: ${e}`, {code: 500, sentry: false, send: false, log: false}));
           })
       } catch (e) {
-        return reject(assistant.errorify(`Failed to sign out of all sessions: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`Failed to sign out of all sessions: ${e}`, {code: 500, sentry: false, send: false, log: false}));
       }
     })
     .catch(e => {
@@ -108,7 +108,7 @@ Module.prototype.signOutOfSession = function (uid, session) {
 
       })
       .catch(e => {
-        assistant.errorify(`Session query error for session ${session}: ${e}`, {code: 500, sentry: true, send: false, log: true})
+        assistant.errorify(`Session query error for session ${session}: ${e}`, {code: 500, sentry: true, send: false, log: true});
 
         return reject(e);
       })

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

@@ -26,7 +26,7 @@ Module.prototype.main = function () {
         const usage = await Manager.Usage().init(assistant, {log: true, key: ip});
 
         if (authUser instanceof Error) {
-          return reject(assistant.errorify(`Failed to get auth user: ${authUser}`, {code: 500, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(`Failed to get auth user: ${authUser}`, {code: 500, sentry: false, send: false, log: false}));
         }
 
         // Age in seconds
@@ -34,7 +34,7 @@ Module.prototype.main = function () {
 
         // If the user is not new, reject
         if (ageInSeconds >= MAX_AGE) {
-          return reject(assistant.errorify(`User is not new.`, {code: 400, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(`User is not new.`, {code: 400, sentry: false, send: false, log: false}));
         }
 
         // Check if IP has signed up too many times
@@ -86,7 +86,7 @@ Module.prototype.main = function () {
           });
 
           // Reject
-          return reject(assistant.errorify(`Too many signups from this IP (${ip}).`, {code: 429, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(`Too many signups from this IP (${ip}).`, {code: 429, sentry: false, send: false, log: false}));
         }
 
         // Increment signups
@@ -121,7 +121,7 @@ Module.prototype.main = function () {
           return resolve({data: result});
         })
         .catch(function (e) {
-          return reject(assistant.errorify(`Failed to sign up: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(`Failed to sign up: ${e}`, {code: 500, sentry: false, send: false, log: false}));
         })
     })
     .catch(e => {

package/src/manager/functions/core/actions/api/user/submit-feedback.js

@@ -77,11 +77,11 @@ Module.prototype.main = function () {
           });
         })
         .catch((e) => {
-          return reject(assistant.errorify(`Failed to save feedback: ${e.message}`, {code: 500, sentry: true, send: false, log: true}).error)
+          return reject(assistant.errorify(`Failed to save feedback: ${e.message}`, {code: 500, sentry: true, send: false, log: true}));
         })
       })
       .catch((e) => {
-        return reject(assistant.errorify(`Failed to get app: ${e.message}`, {code: 500, sentry: true, send: false, log: true}).error)
+        return reject(assistant.errorify(`Failed to get app: ${e.message}`, {code: 500, sentry: true, send: false, log: true}));
       })
 
     })

package/src/manager/functions/core/actions/api/user/validate-settings.js

@@ -28,7 +28,7 @@ Module.prototype.main = function () {
 
       // Check if the file exists
       if (!jetpack.exists(resolvedPath)) {
-        return reject(assistant.errorify(`Defaults file at ${resolvedPath} does not exist, please add it manually.`, {code: 500, sentry: true, send: false, log: true}).error);
+        return reject(assistant.errorify(`Defaults file at ${resolvedPath} does not exist, please add it manually.`, {code: 500, sentry: true, send: false, log: true}));
       }
 
       // Load the file
@@ -40,7 +40,7 @@ Module.prototype.main = function () {
 
         return resolve({data: powertools.defaults(settings, combined)});
       } catch (e) {
-        return reject(assistant.errorify(`Unable to load file at ${resolvedPath}: ${e}`, {code: 500, sentry: true, send: false, log: true}).error);
+        return reject(assistant.errorify(`Unable to load file at ${resolvedPath}: ${e}`, {code: 500, sentry: true, send: false, log: true}));
       }
 
     })

package/src/manager/functions/core/actions/api.js

@@ -273,7 +273,7 @@ Module.prototype.resolveUser = function (options) {
 
     if (options.uid) {
       if (options.adminRequired && !options.admin) {
-        user = self.assistant.errorify('Admin required', {code: 401, sentry: false, send: false, log: false}).error;
+        user = self.assistant.errorify('Admin required', {code: 401, sentry: false, send: false, log: false});
       } else {
         await self.libraries.admin.firestore().doc(`users/${options.uid}`)
         .get()
@@ -282,11 +282,11 @@ Module.prototype.resolveUser = function (options) {
           if (data) {
             user = data;
           } else {
-            user = self.assistant.errorify(`User does not exist: ${options.uid}`, {code: 400, sentry: false, send: false, log: false}).error;
+            user = self.assistant.errorify(`User does not exist: ${options.uid}`, {code: 400, sentry: false, send: false, log: false});
           }
         })
         .catch(function (e) {
-          user = self.assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error;
+          user = self.assistant.errorify(e, {code: 500, sentry: false, send: false, log: false});
         })
       }
     } else if (self.payload.user.authenticated) {
@@ -298,7 +298,7 @@ Module.prototype.resolveUser = function (options) {
     if (user instanceof Error) {
       return reject(user);
     } else if (!user) {
-      return reject(self.assistant.errorify('Unable to resolve user', {code: 500, sentry: false, send: false, log: false}).error);
+      return reject(self.assistant.errorify('Unable to resolve user', {code: 500, sentry: false, send: false, log: false}));
     } else {
       return resolve(user);
     }

package/src/manager/functions/core/cron/daily/reset-usage.js

@@ -105,7 +105,7 @@ Module.prototype.clearFirestore = function() {
     assistant.log(`cron/daily/reset-usage() [firestore]: Resetting metrics`, metrics);
 
     if (metrics instanceof Error) {
-      return reject(assistant.errorify(`Failed to check providers: ${metrics}`, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Failed to check providers: ${metrics}`, {code: 500, sentry: false, send: false, log: false}));
     }
 
     // Reset all metrics with for loop of metrics
@@ -140,7 +140,7 @@ Module.prototype.clearFirestore = function() {
               assistant.log(`cron/daily/reset-usage() [firestore]: Reset ${metric} for ${doc.id} (${original} -> 0)`);
             })
             .catch(e => {
-              assistant.errorify(`Error resetting ${metric} for ${doc.id}: ${e}`, {sentry: false, send: false, log: true})
+              assistant.errorify(`Error resetting ${metric} for ${doc.id}: ${e}`, {sentry: false, send: false, log: true});
             })
           }
 
@@ -159,7 +159,7 @@ Module.prototype.clearFirestore = function() {
         assistant.log(`cron/daily/reset-usage() [firestore]: Reset ${metric} for all users complete!`);
       })
       .catch(e => {
-        assistant.errorify(`Error resetting ${metric} for all users: ${e}`, {sentry: false, send: false, log: true})
+        assistant.errorify(`Error resetting ${metric} for all users: ${e}`, {sentry: false, send: false, log: true});
       })
     }
 
@@ -169,7 +169,7 @@ Module.prototype.clearFirestore = function() {
       assistant.log(`cron/daily/reset-usage() [firestore]: Deleted temporary/usage`);
     })
     .catch(e => {
-      assistant.errorify(`Error deleting temporary/usage: ${e}`, {sentry: false, send: false, log: true})
+      assistant.errorify(`Error deleting temporary/usage: ${e}`, {sentry: false, send: false, log: true});
     })
 
     return resolve();

package/src/manager/helpers/assistant.js

@@ -395,9 +395,10 @@ BackendAssistant.prototype.errorify = function (e, options) {
       .send(sendable);
   }
 
-  return {
-    error: newError,
-  }
+  // return {
+  //   error: newError,
+  // }
+  return newError;
 }
 
 BackendAssistant.prototype.errorManager = BackendAssistant.prototype.errorify;

package/src/manager/helpers/middleware.js

@@ -34,7 +34,7 @@ Middleware.prototype.run = function (library, options) {
     options.setupAnalytics = typeof options.setupAnalytics === 'boolean' ? options.setupAnalytics : true;
     options.setupUsage = typeof options.setupUsage === 'boolean' ? options.setupUsage : true;
     options.setupSettings = typeof options.setupSettings === 'undefined' ? true : options.setupSettings;
-    options.schema = typeof options.schema === 'undefined' ? '' : options.schema;
+    options.schema = typeof options.schema === 'undefined' ? undefined : options.schema;
 
     // Log
     assistant.log(`Middleware.process(): Request (${geolocation.ip} @ ${geolocation.country}, ${geolocation.region}, ${geolocation.city})`, JSON.stringify(data));
@@ -73,11 +73,15 @@ Middleware.prototype.run = function (library, options) {
 
     // Resolve settings
     if (options.setupSettings) {
+      // assistant.log(`Middleware.process(): Resolving settings with schema ${options.schema}...`);
+
       try {
-        assistant.settings = Manager.Settings().resolve(assistant, options.schema, assistant.request.data);
+        assistant.settings = Manager.Settings().resolve(assistant, options.schema, data);
       } catch (e) {
-        return assistant.errorify(`Unable to resolve schema @ (${options.schema}): ${e.message}`, {sentry: true, send: true, log: true});
+        return assistant.errorify(`Unable to resolve schema ${options.schema}: ${e.message}`, {code: e.code, sentry: true, send: true, log: true});
       }
+
+      assistant.log(`Middleware.process(): Resolved settings with schema ${options.schema}`, JSON.stringify(assistant.settings));
     }
 
     // Process

package/src/manager/helpers/settings.js

@@ -21,22 +21,46 @@ Settings.prototype.resolve = function (assistant, schema, settings) {
   const Manager = self.Manager;
 
   // Set settings
-  schema = schema || {};
-  settings = settings || {};
+  schema = schema;
+  settings = typeof settings === 'undefined' ? {} : settings;
+
+  // Throw error if there is no schema
+  if (typeof schema === 'undefined') {
+    throw assistant.errorify(`Schema is undefined`, {code: 500, sentry: false, send: false, log: false});
+  }
 
   // Reset settings
   self.settings = null;
 
-  assistant.log('Resolving settings for', schema, settings);
-
+  // Load schema
   if (typeof schema === 'string') {
     const schemaPath = path.resolve(process.cwd(), `schemas/${schema.replace('.js', '')}.js`);
 
     schema = loadSchema(assistant, schemaPath, settings);
   }
 
+  // Resolve settings
   self.settings = powertools.defaults(settings, schema);
 
+  // Check for missing required keys
+  powertools.getKeys(schema).forEach((key) => {
+    const isRequired = key.endsWith('.required') ? _.get(schema, key, false) : false;
+
+    // Skip if not required
+    if (!isRequired) {
+      return;
+    }
+
+    // Use regex to replace '.required' only if it's at the end of the string
+    const settingsKey = key.replace(/\.required$/, '');
+
+    // Check if the required key is missing
+    if (typeof _.get(settings, settingsKey, undefined) === 'undefined') {
+      // Handle the missing required key as needed
+      throw assistant.errorify(`Required key '${settingsKey}' is missing in settings`, {code: 400, sentry: false, send: false, log: false});
+    }
+  });
+
   // Resolve
   return self.settings;
 };

package/src/manager/helpers/usage.js

@@ -171,14 +171,14 @@ Usage.prototype.validate = function (path, options) {
       // If the captcha is valid, resolve
       if (!captchaResult || captchaResult instanceof Error || !captchaResult.success) {
         return reject(
-          assistant.errorify(`Captcha verification failed.`, {code: 400, sentry: false, send: false, log: false}).error
+          assistant.errorify(`Captcha verification failed.`, {code: 400, sentry: false, send: false, log: false})
         );
       }
     }
 
     // Otherwise, they are over the limit, reject
     return reject(
-      assistant.errorify(`You have exceeded your ${path} usage limit of ${period}/${allowed}.`, {code: 429, sentry: false, send: false, log: false}).error
+      assistant.errorify(`You have exceeded your ${path} usage limit of ${period}/${allowed}.`, {code: 429, sentry: false, send: false, log: false})
     );
   });
 };

package/templates/public/404.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>404 Error Page</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet">
+  </head>
+
+  <body>
+    <div class="d-flex align-items-center justify-content-center vh-100">
+      <div class="text-center">
+        <h1 class="display-1 fw-bold">404</h1>
+
+        <p class="fs-3"> <span class="text-danger">Opps!</span> Page not found.</p>
+
+        <p class="lead">
+          The page you're looking for doesn't exist.
+        </p>
+
+        <a href="{url}" class="btn btn-primary">Go Home</a>
+      </div>
+    </div>
+  </body>
+</html>

package/templates/public/index.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Simple Index Page</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet">
+  </head>
+
+  <body>
+    <div class="container py-5">
+      <div class="row">
+        <div class="col text-center">
+          <h1>Welcome</h1>
+
+          <p class="lead">This is an internal page, please return to our main website</p>
+
+          <a href="{url}" class="btn btn-primary">Go Home</a>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>