abmp-npm 1.1.3 → 1.1.4

package/backend/consts.js

@@ -1,7 +1,3 @@
-const ELEVATED_QUERY_OPTIONS = {
-  suppressAuth: true,
-};
-
 /**
  * Valid configuration keys for getSiteConfigs function
  * @readonly
@@ -13,6 +9,5 @@ const CONFIG_KEYS = {
 };
 
 module.exports = {
-  ELEVATED_QUERY_OPTIONS,
   CONFIG_KEYS,
 };

package/backend/elevated-modules.js

@@ -0,0 +1,16 @@
+const { items } = require('@wix/data');
+const { auth } = require('@wix/essentials');
+
+// @wix/data does not support suppressAuth currently, so we need to elevate it
+const wixData = {
+  insert: auth.elevate(items.insert),
+  update: auth.elevate(items.update),
+  bulkInsert: auth.elevate(items.bulkInsert),
+  query: auth.elevate(items.query),
+  save: auth.elevate(items.save),
+  remove: auth.elevate(items.remove),
+  get: auth.elevate(items.get),
+  //TODO: add other methods here as needed
+};
+
+module.exports = { wixData };

package/backend/forms-methods.web.js

@@ -1,10 +1,10 @@
-const { items: wixData } = require('@wix/data');
 const { webMethod, Permissions } = require('@wix/web-methods');
 
 const { COLLECTIONS } = require('../public');
 
 const { triggerAutomation } = require('./automations-methods');
-const { CONFIG_KEYS, ELEVATED_QUERY_OPTIONS } = require('./consts');
+const { CONFIG_KEYS } = require('./consts');
+const { wixData } = require('./elevated-modules');
 const { findMemberByWixDataId, createContactAndMemberIfNew } = require('./members-data-methods');
 const { getSiteConfigs } = require('./utils');
 
@@ -45,7 +45,7 @@ const contactSubmission = webMethod(Permissions.Anyone, async (data, memberDataI
     memberContactId: memberContactId,
     memberEmail: memberData.contactFormEmail,
   };
-  await wixData.insert(COLLECTIONS.CONTACT_US_SUBMISSIONS, data, ELEVATED_QUERY_OPTIONS);
+  await wixData.insert(COLLECTIONS.CONTACT_US_SUBMISSIONS, data);
   return emailTriggered;
 });
 

package/backend/members-data-methods.js

@@ -1,8 +1,6 @@
-const { items: wixData } = require('@wix/data');
-
 const { COLLECTIONS } = require('../public');
 
-const { ELEVATED_QUERY_OPTIONS } = require('./consts');
+const { wixData } = require('./elevated-modules');
 const { createSiteMember } = require('./members-area-methods');
 
 /**
@@ -15,7 +13,7 @@ async function findMemberByWixDataId(memberId) {
     throw new Error('Member ID is required');
   }
   try {
-    const member = await wixData.get(COLLECTIONS.MEMBERS_DATA, memberId, ELEVATED_QUERY_OPTIONS);
+    const member = await wixData.get(COLLECTIONS.MEMBERS_DATA, memberId);
     return member;
   } catch (error) {
     throw new Error(`Failed to retrieve member data: ${error.message}`);
@@ -39,11 +37,7 @@ async function createContactAndMemberIfNew(memberData) {
       ...memberData,
       contactId,
     };
-    const updatedResult = await wixData.update(
-      COLLECTIONS.MEMBERS_DATA,
-      memberDataWithContactId,
-      ELEVATED_QUERY_OPTIONS
-    );
+    const updatedResult = await wixData.update(COLLECTIONS.MEMBERS_DATA, memberDataWithContactId);
     memberDataWithContactId = {
       ...memberDataWithContactId,
       ...updatedResult,

package/backend/utils.js

@@ -1,8 +1,7 @@
-const { items: wixData } = require('@wix/data');
-
 const { COLLECTIONS } = require('../public/consts');
 
-const { ELEVATED_QUERY_OPTIONS, CONFIG_KEYS } = require('./consts');
+const { CONFIG_KEYS } = require('./consts');
+const { wixData } = require('./elevated-modules');
 
 /**
  * Retrieves site configuration values from the database
@@ -23,11 +22,7 @@ const getSiteConfigs = async configKey => {
       `Invalid configKey: ${configKey}. Must be one of: ${Object.values(CONFIG_KEYS).join(', ')}`
     );
   }
-  const siteConfigs = await wixData.get(
-    COLLECTIONS.SITE_CONFIGS,
-    'SINGLE_ITEM_ID',
-    ELEVATED_QUERY_OPTIONS
-  );
+  const siteConfigs = await wixData.get(COLLECTIONS.SITE_CONFIGS, 'SINGLE_ITEM_ID');
   if (configKey) {
     return siteConfigs[configKey];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/pages/ContactUs.js

@@ -1,10 +1,10 @@
 const { lightbox } = require('@wix/site-window');
 const { phone } = require('phone');
 
-// const { contactSubmission } = require('../backend/forms-methods.web.js');
+const { contactSubmission } = require('../backend/forms-methods.web.js');
 const { VALIDATION_MESSAGES, REGEX } = require('../public');
 
-async function contactUsOnReady({ $w: _$w, contactSubmission }) {
+async function contactUsOnReady(_$w) {
   _$w('#submitButton').disable();
   const receivedData = await lightbox.getContext();
   const formFieldsSelectors = ['#firstName', '#lastName', '#email', '#phone', '#message'];
@@ -114,8 +114,6 @@ async function contactUsOnReady({ $w: _$w, contactSubmission }) {
         phone: _$w('#phone').value,
         message: _$w('#message').value,
       };
-      console.log('contactSubmission', contactSubmission);
-      console.log('typeof contactSubmission', typeof contactSubmission);
       await contactSubmission(formData, receivedData._id);
       await resetForm();