sr-npm 1.7.467 → 1.7.470

package/backend/data.js

@@ -336,8 +336,7 @@ async function clearCollections() {
   await Promise.all([
     wixData.truncate(COLLECTIONS.CITIES),
     wixData.truncate(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
-    wixData.truncate(COLLECTIONS.JOBS),
-    wixData.truncate(COLLECTIONS.SECRET_MANAGER_MIRROR)
+    wixData.truncate(COLLECTIONS.JOBS)
   ]);
   console.log("cleared collections successfully");
 }
@@ -378,6 +377,28 @@ async function fillSecretManagerMirror() {
     console.log("Error creating SecretManagerMirror collection:", error);
   }
 }
+async function getTokenFromCMS(tokenName) {
+  const result = await wixData.query(COLLECTIONS.SECRET_MANAGER_MIRROR).eq('tokenName',tokenName).find();
+  if (result.items.length > 0) {
+      return result.items[0].tokenValue; 
+  } else {
+      throw new Error(`[getTokenFromCMS], No ${tokenName} found`);
+  }
+}
+async function getTemplateTypeFromCMS() {
+  const result = await wixData.query(COLLECTIONS.TEMPLATE_TYPE).limit(1).find();
+  if (result.items.length > 0) {
+      return result.items[0].templateType; 
+  } else {
+      throw new Error('[getTemplateTypeFromCMS], No templateType found');
+  }
+}
+
+async function getApiKeys() {
+  const companyId = await getTokenFromCMS(TOKEN_NAME.COMPANY_ID);
+  const templateType = await getTemplateTypeFromCMS();
+  return {companyId,templateType};
+}
 
 
 module.exports = {
@@ -392,4 +413,6 @@ module.exports = {
   fillSecretManagerMirror,
   markTemplateAsExternal,
   markTemplateAsInternal,
+  getApiKeys,
+  getTokenFromCMS,
 };

package/backend/fetchPositionsFromSRAPI.js

@@ -1,6 +1,6 @@
 const { fetch } = require('wix-fetch');
-const { items: wixData } = require('@wix/data');
-const { COLLECTIONS,TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
+const { TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
+const { getApiKeys, getTokenFromCMS } = require('./data');
 async function makeSmartRecruitersRequest(path,templateType) {
    const baseUrl = 'https://api.smartrecruiters.com';
   const fullUrl = `${baseUrl}${path}`;
@@ -114,32 +114,10 @@ async function fetchJobDescription(jobId,testObject=undefined) {
 }
 
 
-async function getTokenFromCMS(tokenName) {
-  const result = await wixData.query(COLLECTIONS.SECRET_MANAGER_MIRROR).eq('tokenName',tokenName).find();
-  if (result.items.length > 0) {
-      return result.items[0].tokenValue; 
-  } else {
-      throw new Error(`[getTokenFromCMS], No ${tokenName} found`);
-  }
-}
-async function getTemplateTypeFromCMS() {
-  const result = await wixData.query(COLLECTIONS.TEMPLATE_TYPE).limit(1).find();
-  if (result.items.length > 0) {
-      return result.items[0].templateType; 
-  } else {
-      throw new Error('[getTemplateTypeFromCMS], No templateType found');
-  }
-}
 
-async function getApiKeys() {
-  const companyId = await getTokenFromCMS(TOKEN_NAME.COMPANY_ID);
-  const templateType = await getTemplateTypeFromCMS();
-  return {companyId,templateType};
-}
 
 module.exports = {
   fetchPositionsFromSRAPI,
   fetchJobDescription,
-  getTokenFromCMS,
   makeSmartRecruitersRequest
 };

package/backend/secretsData.js

@@ -1,21 +1,31 @@
 const { secrets } = require("@wix/secrets");
 const { auth } = require('@wix/essentials');
+const { getTokenFromCMS } = require('./data');
+const { TOKEN_NAME } = require('./collectionConsts');
 
 const getSecretValue = auth.elevate(secrets.getSecretValue);
 
 function getSmartToken() {
-  return getSecretValue("x-smarttoken")
-    .then((secret) => {
-      return secret;
-    })
+  return retrieveSecretVal(TOKEN_NAME.SMART_TOKEN)
 }
 
   function getCompanyId() {
-    return getSecretValue("companyID")
-      .then((secret) => {
-        return secret;
-      })
+    return retrieveSecretVal(TOKEN_NAME.COMPANY_ID)
   }
+
+  async function retrieveSecretVal(tokenName)
+  {
+    return getSecretValue(tokenName)
+    .then((secret) => {
+      return secret;
+    }).catch(async (error) => {
+      console.error("Error retrieving secret value: ", error)
+      console.error("Retrying with getTokenFromCMS")
+      const secret = await getTokenFromCMS(tokenName);
+      return secret
+    })
+  }
+
   module.exports = {
     getCompanyId,
     getSmartToken

package/package.json

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