sr-npm 1.7.457 → 1.7.459

package/backend/consts.js

@@ -73,15 +73,6 @@ const TASKS = {
 }
 
 
-const TEMPLATE_TYPE = {
-  INTERNAL: 'INTERNAL',
-  EXTERNAL: 'PUBLIC',
-}
-
-const TOKEN_NAME = {
-  COMPANY_ID: 'companyId',
-  SMART_TOKEN: 'x-smarttoken',
-}
 
 const TASK_TYPE = {
   SCHEDULED: 'scheduled',
@@ -92,7 +83,5 @@ const TASK_TYPE = {
     TASKS_NAMES,
     TASK_TYPE,
     TASKS,
-    QUERY_MAX_LIMIT,
-    TEMPLATE_TYPE,
-    TOKEN_NAME,
+    QUERY_MAX_LIMIT
 };

package/backend/data.js

@@ -4,7 +4,6 @@ const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend
 const { COLLECTIONS, COLLECTIONS_FIELDS,JOBS_COLLECTION_FIELDS } = require('./collectionConsts');
 const { chunkedBulkOperation, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeCityName} = require('./utils');
 const { getAllPositions } = require('./queries');
-const{TEMPLATE_TYPE,TOKEN_NAME,TASK_TYPE} = require('./consts');
 const { getCompanyId, getSmartToken } = require('./secretsData');
 
 function validatePosition(position) {
@@ -347,18 +346,16 @@ async function clearCollections() {
 }
 
 async function markTemplateAsExternal() {
-  console.log("TEMPLATE_TYPE$#@#$$@#@#$",TEMPLATE_TYPE);
-  console.log("TASK_TYPE$#@#$$@#@#$",TASK_TYPE);
   await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE,null,'singleItem');
   await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
-    templateType: TEMPLATE_TYPE.EXTERNAL
+    templateType: "PUBLIC"
   });
 }
 
 async function markTemplateAsInternal() {
   await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE,null,'singleItem');
   await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
-    templateType: TEMPLATE_TYPE.INTERNAL
+    templateType: "INTERNAL"
   });
 }
 
@@ -367,14 +364,14 @@ async function fillSecretManagerMirror() {
   const companyId = await getCompanyId();
   console.log("companyId is :  ", companyId);
   await wixData.insert(COLLECTIONS.SECRET_MANAGER_MIRROR, {
-    tokenName: TOKEN_NAME.COMPANY_ID,
+    tokenName: "companyId",
     tokenValue: companyId.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,
+      tokenName: "x-smarttoken",
       tokenValue: token.value
     });
     console.log("x-smarttoken inserted into the SecretManagerMirror collection");

package/backend/fetchPositionsFromSRAPI.js

@@ -1,7 +1,6 @@
 const { fetch } = require('wix-fetch');
 const { items: wixData } = require('@wix/data');
 const { COLLECTIONS } = require('./collectionConsts');
-const { TEMPLATE_TYPE,TOKEN_NAME } = require('./consts');
 
 async function makeSmartRecruitersRequest(path,templateType) {
    const baseUrl = 'https://api.smartrecruiters.com';
@@ -15,8 +14,8 @@ async function makeSmartRecruitersRequest(path,templateType) {
       'Cookie': 'AWSALB=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d; AWSALBCORS=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d'
     };
     //here is the only place where we check templateType
-    if (templateType === TEMPLATE_TYPE.INTERNAL) {
-      const smartToken = await getTokenFromCMS(TOKEN_NAME.SMART_TOKEN);
+    if (templateType === 'INTERNAL') {
+      const smartToken = await getSmartTokenFromCMS();
       headers['x-smarttoken'] = smartToken;
     }
     const response = await fetch(fullUrl, {
@@ -106,13 +105,21 @@ async function fetchJobDescription(jobId) {
   return await makeSmartRecruitersRequest(`/v1/companies/${companyId}/postings/${jobId}`,templateType);
 }
 
+async function getCompanyIdFromCMS() {
+  const result = await wixData.query(COLLECTIONS.SECRET_MANAGER_MIRROR).eq('tokenName','companyId').find();
+  if (result.items.length > 0) {
+      return result.items[0].tokenValue; 
+  } else {
+      throw new Error('[getCompanyIdFromCMS], No companyId found');
+  }
+}
 
-async function getTokenFromCMS(tokenName) {
-  const result = await wixData.query(COLLECTIONS.SECRET_MANAGER_MIRROR).eq('tokenName',tokenName).find();
+async function getSmartTokenFromCMS() {
+  const result = await wixData.query(COLLECTIONS.SECRET_MANAGER_MIRROR).eq('tokenName','x-smarttoken').find();
   if (result.items.length > 0) {
       return result.items[0].tokenValue; 
   } else {
-      throw new Error(`[getTokenFromCMS], No ${tokenName} found`);
+      throw new Error('[getSmartTokenFromCMS], No smarttoken found');
   }
 }
 async function getTemplateTypeFromCMS() {
@@ -125,7 +132,7 @@ async function getTemplateTypeFromCMS() {
 }
 
 async function getApiKeys() {
-  const companyId = await getTokenFromCMS(TOKEN_NAME.COMPANY_ID);
+  const companyId = await getCompanyIdFromCMS();
   const templateType = await getTemplateTypeFromCMS();
   return {companyId,templateType};
 }
@@ -133,5 +140,5 @@ async function getApiKeys() {
 module.exports = {
   fetchPositionsFromSRAPI,
   fetchJobDescription,
-  getTokenFromCMS
+  getCompanyIdFromCMS
 };

package/backend/secretsData.js

@@ -11,7 +11,12 @@ function getSmartToken() {
 }
 
   function getCompanyId() {
-    return getSecretValue("companyID")
+    console.log("auth is : ", auth);
+    console.log("secrets is : ", secrets);
+    const getSecretValue2 = auth.elevate(secrets.getSecretValue);
+    console.log("getSecretValue2 is : ", getSecretValue2);
+    console.log("Getting the company ID$#%%$# from the ^$%$^^%secrets");
+    return getSecretValue2("companyID")
       .then((secret) => {
         return secret;
       })

package/package.json

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