backend-manager 3.2.30 → 3.2.32

package/CHANGELOG.md

@@ -15,7 +15,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - `Security` in case of vulnerabilities.
 
 ---
-## [3.2.0] - 2023-12-19
+## [3.2.32] - 2023-01-30
+### Added
+- Modified `.assistant().errorify()` to have defaults of `log`, `sentry`, and `send` to `false` if not specified to prevent accidental logging and premature sending of errors.
+
+## [3.2.30] - 2023-01-30
+### Added
+- Modified `.assistant()` token/key check to use `options.apiKey || data.apiKey`
+
+## [3.2.0] - 2023-01-19
 ### Added
 - Added `.settings()` API. Put your settings in `./schema/*.js` and access them with `assistant.settings.*`.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.2.30",
+  "version": "3.2.32",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -70,4 +70,4 @@
     "wonderful-log": "^1.0.5",
     "yargs": "^17.7.2"
   }
-}
+}

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.isProduction()) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
     // https://googleapis.dev/nodejs/firestore/latest/v1.FirestoreAdminClient.html#exportDocuments
@@ -62,7 +62,7 @@ Module.prototype.main = function () {
     .catch(async (e) => {
       await self._setMetaStats(e);
 
-      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: true}));
+      return reject(assistant.errorify(e, {code: 500}));
     });
 
   });
@@ -97,7 +97,7 @@ Module.prototype._setMetaStats = function (error, meta) {
       metadata: Manager.Metadata().set({tag: 'admin:backup'}),
     }, {merge: true})
     .catch(e => {
-      assistant.errorify(e, {code: 500, sentry: false, send: false, log: true});
+      assistant.errorify(e, {code: 500, log: true});
     })
 
     return resolve();

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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
     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}));
+      return reject(assistant.errorify(`Failed to post: ${finalPost}`, {code: 500}));
     }
 
     // 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}));
+      return reject(assistant.errorify(`Failed to post: ${e}`, {code: 500}));
     })
 
   });

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.isProduction()) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
     // 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}));
+      return reject(assistant.errorify(`Missing parameter {id}`, {code: 400}));
     }
 
     // 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}));
+      return reject(assistant.errorify(e, {code: 400}));
     })
   });
 

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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}));
+      return reject(assistant.errorify(`<path> parameter required`, {code: 400}));
     }
 
     // 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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}));
+      return reject(assistant.errorify(`<path> parameter required`, {code: 400}));
     }
 
     // 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}));
+      return reject(assistant.errorify(e, {code: 500}));
     });
   });
 

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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
     // 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}));
+        return reject(assistant.errorify(e, {code: 500}));
       })
 
   });

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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}));
+      return reject(assistant.errorify(`<path> parameter required`, {code: 400}));
     }
 
     // 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}));
+      return reject(assistant.errorify(e, {code: 500}));
     })
   });
 

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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorify(`Path parameter required.`, {code: 400, sentry: false, send: false, log: false}));
+      return reject(assistant.errorify(`Path parameter required.`, {code: 400}));
     }
 
     // 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}));
+      return reject(assistant.errorify(e, {code: 500}));
     })
   });
 

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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
     // 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}));
+          return reject(assistant.errorify(data, {code: 500}));
         }
 
         // 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}));
+          return reject(assistant.errorify(data, {code: 500}));
         }
 
         return resolve({data: data})
       })
       .catch(function (e) {
-        return reject(assistant.errorify(`Failed to get: ${e}`, {code: 500, sentry: false, send: false, log: false}));
+        return reject(assistant.errorify(`Failed to get: ${e}`, {code: 500}));
       })
   });
 

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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
     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}));
+      return reject(assistant.errorify(`No productId`, {code: 400}));
     }
     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}));
+      return reject(assistant.errorify(`Payment processor @ "${processorPath}" failed: ${e}`, {code: 400, sentry: true}));
     })
   });
 

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, 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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
     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}));
+      return reject(assistant.errorify(`Parameters <title> and <body> required`, {code: 400, sentry: true}));
     }
 
     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}));
+      return reject(assistant.errorify(`Failed to send notification: ${e}`, {code: 400, sentry: true}));
     })
   });
 

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.isProduction()) {
-      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
     // 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}));
+        return reject(assistant.errorify(e, {code: 500}));
       })
   });
 

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}));
+      return reject(assistant.errorify(`The firebaseApiKey parameter is required.`, {code: 400}));
     }
 
     // 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}`, {code: 500, sentry: true});
             payload.response.data[provider.name] = false;
           }
         })
@@ -136,7 +136,7 @@ Module.prototype.main = function () {
 
       })
       .catch(e => {
-        assistant.errorify(`Error getting app data: ${e}`, {sentry: false, send: false, log: true})
+        assistant.errorify(`Error getting app data: ${e}`, {code: 500, log: true})
       })
       .finally(r => {
         return resolve({data: payload.response.data});
@@ -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}));
+      return reject(assistant.errorify(`Failed to check providers: ${e}`, {code: 500}));
     })
 
   });

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}));
+        return reject(assistant.errorify(`You must provide a name to hash for uuid v5.`, {code: 400}));
       } 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}));
+      return reject(assistant.errorify(`v${payload.data.payload.version} is not a valid version.`, {code: 400}));
     }
 
     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}));
+      return reject(assistant.errorify(`Parameter {id} is required.`, {code: 400}));
     } else if (!payload.data.payload.email) {
-      return reject(assistant.errorify(`Parameter {email} is required.`, {code: 400, sentry: false, send: false, log: false}));
+      return reject(assistant.errorify(`Parameter {email} is required.`, {code: 400}));
     }
 
     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}));
+      return reject(assistant.errorify(`${payload.data.payload.id} is not a valid email ID.`, {code: 400}));
     }
 
     const storage = Manager.storage({temporary: true});
@@ -70,7 +70,7 @@ 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, log: true});
 
       return resolve({data: {success: true}});
     }
@@ -100,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}));
+      return reject(assistant.errorify(`Error sending email: ${e}`, {code: 500, sentry: true}));
     });
 
   });

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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
     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}));
+        return reject(assistant.errorify(createdInvoice, {code: 400}));
       }
 
       // 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}));
+        return reject(assistant.errorify(sentInvoice, {code: 500}));
       }
 
       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 = assistant.errorify(`Failed to create custom token: ${e}`, {code: 500});
         })
       })
       .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, log: true});
       })
 
       if (error) {
@@ -93,7 +93,7 @@ Module.prototype.main = function () {
       });
     })
     .catch(e => {
-      return reject(assistant.errorify(`Error fetching app details: ${e}`, {code: 500, sentry: false, send: false, log: false}));
+      return reject(assistant.errorify(`Error fetching app details: ${e}`, {code: 500}));
     })
 
   });

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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
     // 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}));
+      return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
     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}));
+      return reject(assistant.errorify(payload.data.payload.response || 'Unknown error message provided', {code: payload.data.payload.status}));
     }
 
   });

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}));
+        return reject(assistant.errorify(`Failed to create custom token: ${e}`, {code: 400}));
       })
     })
     .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}));
+        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}));
       }
 
       // 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}));
+        return reject(assistant.errorify(`Failed to delete user: ${e}`, {code: 400}));
       })
     })
     .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}));
+        return reject(assistant.errorify(`Session query error: ${e}`, {code: 500}));
       })
 
     })

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}));
+        return reject(assistant.errorify(`Failed to generate keys: ${e}`, {code: 500, sentry: true}));
       })
 
     })

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}));
+            return reject(assistant.errorify(`Failed to sign out of all sessions: ${e}`, {code: 500}));
           })
       } catch (e) {
-        return reject(assistant.errorify(`Failed to sign out of all sessions: ${e}`, {code: 500, sentry: false, send: false, log: false}));
+        return reject(assistant.errorify(`Failed to sign out of all sessions: ${e}`, {code: 500}));
       }
     })
     .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});
 
         return reject(e);
       })

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

@@ -27,7 +27,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}));
+          return reject(assistant.errorify(`Failed to get auth user: ${authUser}`, {code: 500}));
         }
 
         // Age in seconds
@@ -35,7 +35,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}));
+          return reject(assistant.errorify(`User is not new.`, {code: 400}));
         }
 
         // Check if IP has signed up too many times
@@ -54,7 +54,7 @@ Module.prototype.main = function () {
           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}));
+          return reject(assistant.errorify(`Too many signups from this IP (${ip}).`, {code: 429}));
         }
 
         // Increment signups
@@ -96,7 +96,7 @@ Module.prototype.main = function () {
           return resolve({data: result});
         })
         .catch((e) => {
-          return reject(assistant.errorify(`Failed to sign up: ${e}`, {code: 500, sentry: false, send: false, log: false}));
+          return reject(assistant.errorify(`Failed to sign up: ${e}`, {code: 500}));
         })
     })
     .catch((e) => {
@@ -340,7 +340,7 @@ Module.prototype.sendRateEmail = function (user) {
           email: user.auth.email,
         },
         categories: [`account/too-many-signups`],
-        subject: `Your ${Manager.config.brand.name} account has been deleted`,
+        subject: `Your ${Manager.config.brand.name} account has been deleted [${user.auth.uid}]`,
         template: 'd-b7f8da3c98ad49a2ad1e187f3a67b546',
         group: 25927,
         copy: true,
@@ -349,7 +349,7 @@ Module.prototype.sendRateEmail = function (user) {
             preview: `You have signed up for too many accounts at ${Manager.config.brand.name}! Your account has been deleted.`,
           },
           body: {
-            title: `Account deleted`,
+            title: `${Manager.config.brand.name} 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>
@@ -357,9 +357,12 @@ Module.prototype.sendRateEmail = function (user) {
               If you believe this is a mistake, please contact us at ${Manager.config.brand.email}.
               <br>
               <br>
-              <strong>User Record</strong>:
+              <strong>User Details</strong>:
+              <br>
+              <strong>UID</strong>: ${user.auth.uid}
+              <br>
+              <strong>Email</strong>: ${user.auth.email}
               <br>
-              <pre><code>${JSON.stringify(user, null, 2)}</code></pre>
             `,
           },
         },

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}));
+          return reject(assistant.errorify(`Failed to save feedback: ${e.message}`, {code: 500, sentry: true}));
         })
       })
       .catch((e) => {
-        return reject(assistant.errorify(`Failed to get app: ${e.message}`, {code: 500, sentry: true, send: false, log: true}));
+        return reject(assistant.errorify(`Failed to get app: ${e.message}`, {code: 500, sentry: 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}));
+        return reject(assistant.errorify(`Defaults file at ${resolvedPath} does not exist, please add it manually.`, {code: 500, sentry: 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}));
+        return reject(assistant.errorify(`Unable to load file at ${resolvedPath}: ${e}`, {code: 500, sentry: 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});
+        user = self.assistant.errorify('Admin required', {code: 401});
       } 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});
+            user = self.assistant.errorify(`User does not exist: ${options.uid}`, {code: 400});
           }
         })
         .catch(function (e) {
-          user = self.assistant.errorify(e, {code: 500, sentry: false, send: false, log: false});
+          user = self.assistant.errorify(e, {code: 500});
         })
       }
     } 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}));
+      return reject(self.assistant.errorify('Unable to resolve user', {code: 500}));
     } 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}));
+      return reject(assistant.errorify(`Failed to check providers: ${metrics}`, {code: 500}));
     }
 
     // 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}`, {code: 500, log: true});
             })
           }
 
@@ -159,18 +159,42 @@ 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}`, {code: 500, log: true});
       })
     }
 
     // Clear temporary/usage in firestore by deleting the doc
-    await libraries.admin.firestore().doc(`temporary/usage`).delete()
-    .then(r => {
-      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});
+    admin.firestore().collection('temporary').listDocuments()
+    .then((snap) => {
+      const chunks = []
+      for (let i = 0; i < snap.length; i += 500) {
+        chunks.push(snap.slice(i, i + 500))
+      }
+
+      // Delete in chunks
+      for (const chunk of chunks) {
+        // Get a new write batch
+        const batch = admin.firestore().batch()
+
+        chunk.map((doc) => {
+          assistant.log('Deleting', doc.id);
+
+          batch.delete(doc);
+        });
+
+        batch.commit()
+        .catch((e) => {
+          assistant.error('Error committing batch', e);
+        });
+      }
     })
+    // await libraries.admin.firestore().doc(`temporary/usage`).delete()
+    // .then(r => {
+    //   assistant.log(`cron/daily/reset-usage() [firestore]: Deleted temporary/usage`);
+    // })
+    // .catch(e => {
+    //   assistant.errorify(`Error deleting temporary/usage: ${e}`, {code: 500, log: true});
+    // })
 
     return resolve();
   });

package/src/manager/functions/core/cron/daily.js

@@ -50,7 +50,7 @@ Module.prototype.main = function() {
         assistant.log(`cron/daily(): Job ${jobName} completed...`);
       })
       .catch(e => {
-        assistant.errorify(`Error executing ${jobName}: ${e}`, {sentry: true, send: false, log: true});
+        assistant.errorify(`Error executing ${jobName}: ${e}`, {code: 500, sentry: true});
         caught = e;
       })
     }

package/src/manager/functions/core/events/auth/on-create.js

@@ -30,8 +30,16 @@ Module.prototype.main = function () {
 
     assistant.log(`Request: ${user.uid}`, user, context);
 
+    // Calculate user age before the poll
     const ageInSeconds = (Date.now() - new Date(user.metadata.creationTime)) / 1000;
 
+    // If user is not new, skip auth-on-create handler
+    if (ageInSeconds >= MAX_AGE) {
+      assistant.log(`Skipping because ${user.uid} is NOT NEW (age=${ageInSeconds}):`, existingUser);
+
+      return resolve(self);
+    }
+
     // Check if exists already
     let existingUser;
     await powertools.poll(async () => {
@@ -42,25 +50,19 @@ Module.prototype.main = function () {
 
       assistant.log(`Polling for existing user ${user.uid}...`, existingUser);
 
-      return existingUser && !(existingUser instanceof Error);
+      if (existingUser instanceof Error) {
+        return false;
+      }
+
+      return existingUser;
     }, {interval: 1000, timeout: 30000})
     .catch(e => {
       assistant.error(`Timeout for existing user expired`, e);
     });
 
+    // Log existing user
     assistant.log(`Existing user ${user.uid} found (age=${ageInSeconds}):`, existingUser);
 
-    if (ageInSeconds >= MAX_AGE) {
-      existingUser = new Error(`User is not new (age=${ageInSeconds}).`);
-    }
-
-    // If user already exists, skip auth-on-create handler
-    if (existingUser instanceof Error) {
-      assistant.error(`Failed to get existing user ${user.uid}:`, existingUser);
-
-      return reject(existingUser);
-    }
-
     // Build user object
     let newUser = self.Manager.User().properties;
 

package/src/manager/helpers/assistant.js

@@ -353,18 +353,28 @@ BackendAssistant.prototype.errorify = function (e, options) {
 
   // Set options
   options = options || {};
+
+  // Code: default to 500, or else use the user's option
   options.code = typeof options.code === 'undefined'
     ? 500
     : options.code;
-  options.log = typeof options.log === 'undefined'
-    ? true
-    : options.log;
+
+  // Sentry: default to false, or else use the user's option
   options.sentry = typeof options.sentry === 'undefined'
-    ? true
+    ? false
     : options.sentry;
+
+  // Log: default to sentry, or else use the user's option
+  options.log = typeof options.log === 'undefined'
+    ? options.sentry
+    : options.log;
+
+  // Send: default to false, or else use the user's option
   options.send = typeof options.send === 'undefined'
-    ? true
+    ? false
     : options.send;
+
+  // Stack: default to false, or else use the user's option
   options.stack = typeof options.stack === 'undefined'
     ? false
     : options.stack;
@@ -392,7 +402,7 @@ BackendAssistant.prototype.errorify = function (e, options) {
   }
 
   // Quit and respond to the request
-  if (options.send && res && res.status) {
+  if (options.send && res?.status) {
     let sendable = newError?.stack && options.stack
       ? newError?.stack
       : newError?.message;
@@ -452,7 +462,9 @@ BackendAssistant.prototype.respond = function(response, options) {
     response instanceof Error
     || isErrorCode
   ) {
-    options.code = !isErrorCode ? undefined : options.code;
+    options.code = isErrorCode ? options.code : undefined;
+    options.send = true;
+
     return self.errorify(response, options);
   }
 
@@ -596,7 +608,7 @@ BackendAssistant.prototype.authenticate = async function (options) {
       return _resolve(self.request.user);
     }
   } else if (options.apiKey || data.apiKey) {
-    const apiKey = apiKey || data.apiKey;
+    const apiKey = options.apiKey || data.apiKey;
     self.log('Found "options.apiKey"', apiKey, logOptions);
 
     if (apiKey.includes('test')) {

package/src/manager/helpers/middleware.js

@@ -14,7 +14,7 @@ function Middleware(m, req, res) {
   self.res = res;
 }
 
-Middleware.prototype.run = function (library, options) {
+Middleware.prototype.run = function (libPath, options) {
   const self = this;
   const Manager = self.Manager;
   const req = self.req;
@@ -39,14 +39,15 @@ Middleware.prototype.run = function (library, options) {
     // Log
     assistant.log(`Middleware.process(): Request (${geolocation.ip} @ ${geolocation.country}, ${geolocation.region}, ${geolocation.city})`, JSON.stringify(data));
 
-    const basePath = path.resolve(process.cwd(), `methods/${library.replace('.js', '')}`);
+    const basePath = path.resolve(process.cwd(), `methods/${libPath.replace('.js', '')}`);
+    let library;
 
     // Load library
     try {
-      library = path.resolve(basePath, `index.js`);
-      library = new (require(library))();
+      libPath = path.resolve(basePath, `index.js`);
+      library = new (require(libPath))();
     } catch (e) {
-      return assistant.errorify(`Unable to load library @ (${library}): ${e.message}`, {sentry: true, send: true, log: true});
+      return assistant.respond(new Error(`Unable to load library @ (${libPath}): ${e.message}`), {code: 500, sentry: true});
     }
 
     // Setup user
@@ -82,7 +83,7 @@ Middleware.prototype.run = function (library, options) {
       try {
         assistant.settings = Manager.Settings().resolve(assistant, options.schema, data);
       } catch (e) {
-        return assistant.errorify(`Unable to resolve schema ${options.schema}: ${e.message}`, {code: e.code, sentry: true, send: true, log: true});
+        return assistant.respond(new Error(`Unable to resolve schema ${options.schema}: ${e.message}`), {code: 500, sentry: true});
       }
 
       assistant.log(`Middleware.process(): Resolved settings with schema ${options.schema}`, JSON.stringify(assistant.settings));
@@ -96,14 +97,11 @@ Middleware.prototype.run = function (library, options) {
 
       // Run library
       library.main(assistant, req, res)
-      // .then(result => {
-      //   return res.status(200).json(result);
-      // })
       .catch(e => {
-        return assistant.errorify(e, {sentry: true, send: true, log: true});
+        return assistant.respond(e, {code: e.code, sentry: true});
       });
     } catch (e) {
-      return assistant.errorify(e, {sentry: true, send: true, log: true});
+      return assistant.respond(e, {code: e.code, sentry: true});
     }
   });
 };

package/src/manager/helpers/settings.js

@@ -26,7 +26,7 @@ Settings.prototype.resolve = function (assistant, schema, 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});
+    throw assistant.errorify(`Schema is undefined`, {code: 500});
   }
 
   // Reset settings
@@ -57,7 +57,7 @@ Settings.prototype.resolve = function (assistant, schema, settings) {
     // 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});
+      throw assistant.errorify(`Required key '${settingsKey}' is missing in settings`, {code: 400});
     }
   });
 

package/src/manager/helpers/usage.js

@@ -82,11 +82,11 @@ Usage.prototype.init = function (assistant, options) {
 
       if (options.unauthenticatedMode === 'firestore') {
         // TODO: Make it request using .where() query so it doesnt use a read if it doesnt have to
-        foundUsage = await Manager.libraries.admin.firestore().doc(`temporary/usage`)
+        foundUsage = await Manager.libraries.admin.firestore().doc(`temporary/${self.key}`)
           .get()
           .then((r) => _.get(r.data(), self.key))
           .catch((e) => {
-            assistant.errorify(`Usage.init(): Error fetching usage data: ${e}`, {sentry: true, send: false, log: true});
+            assistant.errorify(`Usage.init(): Error fetching usage data: ${e}`, {code: 500, sentry: true});
           });
       } else {
         foundUsage = self.storage.get(`${self.paths.user}.usage`, {}).value();
@@ -113,7 +113,7 @@ Usage.prototype.init = function (assistant, options) {
         self.storage.set(`${self.paths.app}.lastFetched`, new Date().toISOString()).write();
       })
       .catch(e => {
-        assistant.errorify(`Usage.init(): Error fetching app data: ${e}`, {sentry: true, send: false, log: true});
+        assistant.errorify(`Usage.init(): Error fetching app data: ${e}`, {code: 500, sentry: true});
       })
     }
 
@@ -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})
+          assistant.errorify(`Captcha verification failed.`, {code: 400})
         );
       }
     }
 
     // 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})
+      assistant.errorify(`You have exceeded your ${path} usage limit of ${period}/${allowed}.`, {code: 429})
     );
   });
 };
@@ -274,7 +274,7 @@ Usage.prototype.update = function () {
     // Write self.user to firestore or local if no user or if key is set
     if (self.useUnauthenticatedStorage) {
       if (self.options.unauthenticatedMode === 'firestore') {
-        Manager.libraries.admin.firestore().doc(`temporary/usage`)
+        Manager.libraries.admin.firestore().doc(`temporary/${self.key}`)
           .set({
             [`${self.key}`]: self.user.usage,
           }, {merge: true})
@@ -284,7 +284,7 @@ Usage.prototype.update = function () {
             return resolve(self.user.usage);
           })
           .catch(e => {
-            return reject(assistant.errorify(e, {sentry: true, send: false, log: false}));
+            return reject(assistant.errorify(e, {code: 500, sentry: true}));
           });
       } else {
         self.storage.set(`${self.paths.user}.usage`, self.user.usage).write();
@@ -304,7 +304,7 @@ Usage.prototype.update = function () {
           return resolve(self.user.usage);
         })
         .catch(e => {
-          return reject(assistant.errorify(e, {sentry: true, send: false, log: false}));
+          return reject(assistant.errorify(e, {code: 500, sentry: true}));
         });
     }
   });

package/src/manager/index.js

@@ -465,7 +465,7 @@ Manager.prototype._process = function (mod, options) {
     function _reject(e, log) {
       if (log) {
         // self.assistant.error(e);
-        mod.assistant.errorify(e, {code: 500, sentry: true, send: false, log: true});
+        mod.assistant.respond(e, {code: 500, sentry: true});
       }
       // res.status(500).send(e.message);
       return resolve()

package/src/manager/libraries/openai.js

@@ -60,6 +60,7 @@ OpenAI.prototype.request = function (options) {
     options.model = typeof options.model === 'undefined' ? 'gpt-3.5-turbo' : options.model;
     options.timeout = typeof options.timeout === 'undefined' ? 120000 : options.timeout;
     options.moderate = typeof options.moderate === 'undefined' ? true : options.moderate;
+    options.log = typeof options.log === 'undefined' ? false : options.log;
     options.user = options.user || assistant.getUser();
 
     options.prompt = options.prompt || {};
@@ -80,17 +81,28 @@ OpenAI.prototype.request = function (options) {
     options.temperature = typeof options.temperature === 'undefined' ? 0.7 : options.temperature;
     options.maxTokens = typeof options.maxTokens === 'undefined' ? 512 : options.maxTokens;
 
-    assistant.log('callOpenAI(): Starting', self.key);
-    assistant.log('callOpenAI(): Starting', options);
+    function _log() {
+      if (!options.log)  {
+        return;
+      }
+
+      _log('callOpenAI():', ...arguments);
+    }
 
     function _load(input) {
+      // console.log('*** input!!!', input.content.slice(0, 50), input.path);
+      // console.log('*** input.content', input.content.slice(0, 50));
+      // console.log('*** input.path', input.path);
       return powertools.template(
-        input.content || jetpack.read(input.path),
+        input.path ? jetpack.read(input.path) : input.content,
         input.settings,
       )
       .trim();
     }
 
+    _log('Starting', self.key);
+    _log('Starting', options);
+
     // Load prompt
     const prompt = _load(options.prompt);
     const message = _load(options.message);
@@ -99,9 +111,9 @@ OpenAI.prototype.request = function (options) {
       ? { type: 'json_object' }
       : undefined;
 
-    assistant.log('callOpenAI(): Prompt', prompt);
-    assistant.log('callOpenAI(): Message', message);
-    assistant.log('callOpenAI(): User', user);
+    _log('Prompt', prompt);
+    _log('Message', message);
+    _log('User', user);
 
     function _request(mode, options) {
       return new Promise(async function(resolve, reject) {
@@ -132,7 +144,7 @@ OpenAI.prototype.request = function (options) {
           });
 
           // Log message
-          assistant.log('callOpenAI(): Messages', options.history.messages);
+          _log('Messages', options.history.messages);
 
           request.body = {
             model: options.model,
@@ -178,17 +190,14 @@ OpenAI.prototype.request = function (options) {
     if (options.moderate) {
       moderation = await _request('moderation', options)
       .then(async (r) => {
-        assistant.log('callOpenAI(): Moderated', r);
-
-        // Save moderation
-        self.moderation = r;
+        _log('Moderated', r);
 
         return r;
       })
       .catch((e) => e);
 
       if (moderation.flagged) {
-        return reject(assistant.errorify(`This request is inappropriate`, {code: 400, sentry: false, send: false, log: false}));
+        return reject(assistant.errorify(`This request is inappropriate`, {code: 400}));
       }
     }
 
@@ -204,7 +213,7 @@ OpenAI.prototype.request = function (options) {
           moderation: moderation,
         })
       } catch (e) {
-        assistant.warn('callOpenAI(): Error parsing response', r, e);
+        assistant.warn('Error parsing response', r, e);
 
         return reject(e);
       }