sr-npm 1.7.410 → 1.7.412

package/backend/collectionConsts.js

@@ -2,9 +2,8 @@ const COLLECTIONS = {
     AMOUNT_OF_JOBS_PER_DEPARTMENT: 'AmountOfJobsPerDepartment',
     CITIES: 'cities',
     JOBS: 'Jobs',
-    COMPANY_ID: 'CompanyId',
-    API_KEY: 'ApiKey',
     TEMPLATE_TYPE: 'templateType',
+    SECRET_MANAGER_MIRROR: 'SecretManagerMirror',
 }
 const JOBS_COLLECTION_FIELDS = {
   LOCATION: 'location',
@@ -63,15 +62,13 @@ const COLLECTIONS_FIELDS = {
         {key:'city', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CITIES } } },
         { key: 'image', type: 'IMAGE' },
     ],  
-    COMPANY_ID: [
-      {key:'companyId', type: 'TEXT'},
-    ],
-    API_KEY: [
-      {key:'token', type: 'TEXT'},
-    ],
     TEMPLATE_TYPE: [
       {key:'templateType', type: 'TEXT'},
     ],
+    SECRET_MANAGER_MIRROR: [
+      {key:'tokenName', type: 'TEXT'},
+      {key:'tokenValue', type: 'TEXT'},
+    ],
   };
 
 

package/backend/consts.js

@@ -10,7 +10,7 @@ const TASKS_NAMES = {
     AGGREGATE_JOBS_BY_FIELD_TO_CMS: 'aggregateJobsByFieldToCMS',
     REFERENCE_JOBS: 'referenceJobs',
     CREATE_COLLECTIONS: 'createCollections',
-    CREATE_COMPANY_ID_COLLECTION_AND_FILL_IT: 'createCompanyIdCollectionAndFillIt',
+    CREATE_SECRET_MANAGER_MIRROR_AND_FILL_IT: 'createSecretManagerMirrorAndFillIt',
     SYNC_JOBS_FAST: 'syncJobsFast',
 }
 
@@ -65,8 +65,8 @@ const TASKS = {
     },
     [TASKS_NAMES.SYNC_JOBS_FAST]: {
       name: TASKS_NAMES.SYNC_JOBS_FAST,
-      getIdentifier:task=>task.data.templateType,
-      process:templateType=>syncJobsFast(templateType),
+      getIdentifier:()=>"SHOULD_NEVER_SKIP",
+      process:syncJobsFast,
       shouldSkipCheck:()=>false,
       estimatedDurationSec:60
     }

package/backend/data.js

@@ -286,52 +286,7 @@ function fetchJobLocation(jobDetails) {
   return jobLocation;
 }
 
-async function createApiKeyCollectionAndFillIt() {
-  console.log("Creating ApiKey collection and filling it with the smart token");
-  await createCollectionIfMissing(COLLECTIONS.API_KEY, COLLECTIONS_FIELDS.API_KEY,null,'singleItem');
-  console.log("Getting the smart token ");
-  const token = await getSmartToken();
-  console.log("token is :  ", token);
-  console.log("Inserting the smart token into the ApiKey collection");
-  try {
-    await wixData.insert(COLLECTIONS.API_KEY, {
-        token: token.value
-    });
-    console.log("Smart token inserted into the ApiKey collection");
-  } catch (error) {
-    if (error.message.includes("WDE0074: An item with _id [SINGLE_ITEM_ID] already exists")) {
-      console.log("Smart token already exists in the ApiKey collection");
-    }
-    else {
-      throw error;
-    }
-  }
-}
-
 
-async function createCompanyIdCollectionAndFillIt() {
-    console.log("Creating CompanyId collection and filling it with the company ID");
-    await createCollectionIfMissing(COLLECTIONS.COMPANY_ID, COLLECTIONS_FIELDS.COMPANY_ID,null,'singleItem');
-    console.log("Getting the company ID ");
-    const companyId = await getCompanyId();
-    console.log("companyId is :  ", companyId);
-    console.log("Inserting the company ID into the CompanyId collection");
-    try {
-      await wixData.insert(COLLECTIONS.COMPANY_ID, {
-        companyId: companyId.value
-      });
-      console.log("company ID inserted into the CompanyId collection");
-    } catch (error) {
-      if (error.message.includes("WDE0074: An item with _id [SINGLE_ITEM_ID] already exists")) {
-        console.log("company ID already exists in the CompanyId collection");
-      }
-      else {
-        throw error;
-      }
-    }
-
-    
-}
 
 async function createCollections() {
   console.log("Creating collections");
@@ -359,13 +314,11 @@ async function referenceJobs() {
   console.log("finished referencing jobs");
 }
 
-async function syncJobsFast(templateType) {
+async function syncJobsFast() {
   console.log("Syncing jobs fast");
-  await createCompanyIdCollectionAndFillIt();
-  if(templateType==='INTERNAL')
-  {
-  await createApiKeyCollectionAndFillIt();
-  }
+  //database
+
+  await createSecretManagerMirrorAndFillIt();
   await createCollections();
   await clearCollections();
   console.log("saving jobs data to CMS");
@@ -389,14 +342,54 @@ async function clearCollections() {
   console.log("cleared collections successfully");
 }
 
+async function markTemplateAsExternal() {
+  await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE,null,'singleItem');
+  await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
+    templateType: "PUBLIC"
+  });
+}
+
+async function markTemplateAsInternal() {
+  await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE,null,'singleItem');
+  await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
+    templateType: "INTERNAL"
+  });
+}
+
+async function createSecretManagerMirrorAndFillIt() {
+  console.log("Creating SecretManagerMirror collection and filling it");
+  await createCollectionIfMissing(COLLECTIONS.SECRET_MANAGER_MIRROR, COLLECTIONS_FIELDS.SECRET_MANAGER_MIRROR);
+  console.log("Getting the company ID ");
+  const companyId = await getCompanyId();
+  console.log("companyId is :  ", companyId);
+  await wixData.insert(COLLECTIONS.SECRET_MANAGER_MIRROR, {
+    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: "x-smarttoken",
+      tokenValue: token.value
+    });
+    console.log("x-smarttoken inserted into the SecretManagerMirror collection");
+  } catch (error) {
+    console.log("Error creating SecretManagerMirror collection:", error);
+  }
+}
+
+
 module.exports = {
   syncJobsFast,
   referenceJobs,
   aggregateJobs,
   createCollections,
-    saveJobsDataToCMS,
-    saveJobsDescriptionsAndLocationApplyUrlToCMS,
-    aggregateJobsByFieldToCMS,
-    referenceJobsToField,
-    createCompanyIdCollectionAndFillIt,
+  saveJobsDataToCMS,
+  saveJobsDescriptionsAndLocationApplyUrlToCMS,
+  aggregateJobsByFieldToCMS,
+  referenceJobsToField,
+  createSecretManagerMirrorAndFillIt,
+  markTemplateAsExternal,
+  markTemplateAsInternal,
 };

package/backend/fetchPositionsFromSRAPI.js

@@ -2,19 +2,26 @@ const { fetch } = require('wix-fetch');
 const { items: wixData } = require('@wix/data');
 const { COLLECTIONS } = require('./collectionConsts');
 
-async function makeSmartRecruitersRequest(path,smartToken) {
+async function makeSmartRecruitersRequest(path) {
    const baseUrl = 'https://api.smartrecruiters.com';
   const fullUrl = `${baseUrl}${path}`;
   
   try {
+    //if templatetype is internal make headers object with x-smarttoken
+    const headers = {
+      'Accept-Language': 'en',
+      'accept': 'application/json',
+      'Cookie': 'AWSALB=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d; AWSALBCORS=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d'
+    };
+    //here is the only place where we check templateType
+    const templateType = await getTemplateTypeFromCMS();
+    if (templateType === 'INTERNAL') {
+      const smartToken = await getSmartTokenFromCMS();
+      headers['x-smarttoken'] = smartToken;
+    }
     const response = await fetch(fullUrl, {
       method: 'GET',
-      headers: {
-        'Accept-Language': 'en',
-        'accept': 'application/json',
-        'Cookie': 'AWSALB=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d; AWSALBCORS=GYltFw3fLKortMxHR5vIOT1CuUROyhWNIX/qL8ZnPl1/8mhOcnIsBKYslzmNJPEzSy/jvNbO+6tXpH8yqcpQJagYt57MhbKlLqTSzoNq1G/w7TjOxPGR3UTdXW0d',
-        'x-smarttoken': smartToken
-      }
+      headers: headers
     });
 
     if (response.ok) {
@@ -34,7 +41,7 @@ async function fetchPositionsFromSRAPI() {
   let totalFound = 0;
   let page = 0;
   const MAX_PAGES = 30 // Safety limit to prevent infinite loops
-  const {companyId,templateType,smartToken} = await getApiKeys();
+  const {companyId,templateType} = await getApiKeys();
   console.log('Starting to fetch all positions with pagination...');
   let offset=0;
 
@@ -45,7 +52,7 @@ async function fetchPositionsFromSRAPI() {
       const apiPath = `/v1/companies/${companyId}/postings?offset=${offset}&destination=${templateType}`;
       
       console.log(`Fetching page ${page} with path: ${apiPath}`);
-      const response = await makeSmartRecruitersRequest(apiPath,smartToken);
+      const response = await makeSmartRecruitersRequest(apiPath);
       
       // Add positions from this page to our collection
       if (response.content && Array.isArray(response.content)) {
@@ -95,23 +102,23 @@ async function fetchPositionsFromSRAPI() {
 }
 
 async function fetchJobDescription(jobId) {
-  const {companyId,smartToken} = await getApiKeys();
-  return await makeSmartRecruitersRequest(`/v1/companies/${companyId}/postings/${jobId}`,smartToken);
+  const {companyId} = await getApiKeys();
+  return await makeSmartRecruitersRequest(`/v1/companies/${companyId}/postings/${jobId}`);
 }
 
 async function getCompanyIdFromCMS() {
-  const result = await wixData.query(COLLECTIONS.COMPANY_ID).limit(1).find();
+  const result = await wixData.query(COLLECTIONS.SECRET_MANAGER_MIRROR).limit(1).find();
   if (result.items.length > 0) {
-      return result.items[0].companyId; 
+      return result.items[0].tokenValue; 
   } else {
       throw new Error('[getCompanyIdFromCMS], No companyId found');
   }
 }
 
 async function getSmartTokenFromCMS() {
-  const result = await wixData.query(COLLECTIONS.API_KEY).limit(1).find();
+  const result = await wixData.query(COLLECTIONS.SECRET_MANAGER_MIRROR).equalTo('tokenName','x-smarttoken').limit(1).find();
   if (result.items.length > 0) {
-      return result.items[0].token; 
+      return result.items[0].tokenValue; 
   } else {
       throw new Error('[getSmartTokenFromCMS], No smarttoken found');
   }
@@ -129,8 +136,7 @@ async function getTemplateTypeFromCMS() {
 async function getApiKeys() {
   const companyId = await getCompanyIdFromCMS();
   const templateType = await getTemplateTypeFromCMS();
-  const smartToken = templateType==='INTERNAL' ? await getSmartTokenFromCMS():undefined;
-  return {companyId,templateType,smartToken};
+  return {companyId,templateType};
 }
 
 module.exports = {

package/package.json

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