sr-npm 1.7.490 → 1.7.492

package/backend/collectionConsts.js

@@ -91,8 +91,8 @@ const COLLECTIONS_FIELDS = {
 
   const TOKEN_NAME = {
     COMPANY_ID: 'companyId',
-    COMPANY_ID_SM: 'companyID',
     SMART_TOKEN: 'x-smarttoken',
+    DESIRED_BRAND: 'desiredBrand',
   }
   
 

package/backend/data.js

@@ -4,7 +4,7 @@ const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend
 const { COLLECTIONS, COLLECTIONS_FIELDS,JOBS_COLLECTION_FIELDS,TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
 const { chunkedBulkOperation, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeString} = require('./utils');
 const { getAllPositions } = require('./queries');
-const { getCompanyId, getSmartToken } = require('./secretsData');
+const { retrieveSecretVal } = require('./secretsData');
 
 function getBrand(customField) {
   return customField.find(field => field.fieldLabel === 'Brands')?.valueLabel;
@@ -366,24 +366,22 @@ async function markTemplateAsInternal() {
 }
 
 async function fillSecretManagerMirror() {
-  console.log("Getting the company ID ");
-  const companyId = await getCompanyId();
-  console.log("companyId is :  ", companyId);
+  for(const tokenName of Object.values(TOKEN_NAME)){
+    try{
+      await insertSecretValToCMS(tokenName);
+      console.log("inserted ", tokenName, "into the SecretManagerMirror collection successfully");
+    } catch (error) {
+      console.warn("Error with inserting ", tokenName, "into the SecretManagerMirror collection:", error);
+    }
+  }
+}
+
+async function insertSecretValToCMS(tokenName) {
+  const token = await retrieveSecretVal(tokenName);
   await wixData.insert(COLLECTIONS.SECRET_MANAGER_MIRROR, {
-    tokenName: TOKEN_NAME.COMPANY_ID,
-    tokenValue: companyId.value
+    tokenName: tokenName,
+    tokenValue: token.value
   });
-  console.log("companyId inserted into the SecretManagerMirror collection");
-  try{
-    const token = await getSmartToken();
-    await wixData.insert(COLLECTIONS.SECRET_MANAGER_MIRROR, {
-      tokenName: TOKEN_NAME.SMART_TOKEN,
-      tokenValue: token.value
-    });
-    console.log("x-smarttoken inserted into the SecretManagerMirror collection");
-  } catch (error) {
-    console.warn("Error with inserting x-smarttoken into the SecretManagerMirror collection:", error);
-  }
 }
 
 

package/backend/secretsData.js

@@ -5,13 +5,6 @@ const { COLLECTIONS,TOKEN_NAME } = require('./collectionConsts');
 
 const getSecretValue = auth.elevate(secrets.getSecretValue);
 
-function getSmartToken() {
-  return retrieveSecretVal(TOKEN_NAME.SMART_TOKEN)
-}
-
-  function getCompanyId() {
-    return retrieveSecretVal(TOKEN_NAME.COMPANY_ID_SM)
-  }
 
   async function retrieveSecretVal(tokenName)
   {
@@ -50,8 +43,7 @@ function getSmartToken() {
   }
 
   module.exports = {
-    getCompanyId,
-    getSmartToken,
     getTokenFromCMS,
-    getApiKeys
+    getApiKeys,
+    retrieveSecretVal
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.7.490",
+  "version": "1.7.492",
   "description": "",
   "main": "index.js",
   "scripts": {

package/pages/careersPage.js

@@ -37,8 +37,9 @@ allJobs=await getAllPositions();
 await activateAutoLoad(_$w);
 await bind(_$w);
 await init(_$w);
-await handleUrlParams(_$w);
 await handleBrandDropdown(_$w);
+await handleUrlParams(_$w);
+
 
 }
 
@@ -106,7 +107,6 @@ async function handleUrlParams(_$w) {
     if (queryJobTypeVar) {
         await handleJobTypeParam(_$w,queryJobTypeVar);
     }
-    console.log("_$w('#dropdownBrand'): ", _$w('#dropdownBrand'));
     if (queryBrandVar && _$w('#dropdownBrand').isVisible) { //if it is not visible, ignore it
         await handleBrandParam(_$w,queryBrandVar);
     }