vtb-appit 0.1.26 → 0.1.28

package/appit-base-transformer.js

@@ -12,7 +12,7 @@ class AppitBaseTransformer {
         this.vtbMessages = [];
         
         try {
-            this.token = fs.readFileSync(pth.join(__dirname, '../../assets/token.jwt'), {encoding: 'utf8' });
+            this.token = fs.readFileSync(pth.join(__dirname, '../../assets/token.jwt'), {encoding: 'utf8' }).trim();
         } catch(e) {
             this.token = false;
         }
@@ -186,11 +186,10 @@ class AppitBaseTransformer {
 
     async tsGetDocuments()
     {
-        const jwt = await this.fetchTSJWT();
-        const tokenDecodablePart = jwt.split('.')[1];
+        const tokenDecodablePart = this.token.split('.')[1];
         const decoded = JSON.parse(Buffer.from(tokenDecodablePart, 'base64').toString());
         const endPath = '/documentdata/';
-        let documents = await this.tsFetchDocuments(jwt, decoded, endPath);
+        let documents = await this.tsFetchDocuments(this.token, decoded, endPath);
 
         let baseUrl = (decoded.hasOwnProperty('https://visualtourbuilder.com/app_metadata')) ? 
           decoded['https://visualtourbuilder.com/app_metadata'].baseUrl : 
@@ -201,7 +200,7 @@ class AppitBaseTransformer {
             promises.push(new Promise(resolve => {
                 const req = https.request({
                     headers: {
-                        'Authorization': jwt
+                        'Authorization': this.token
                     },
                     hostname: baseUrl.replace('https://', '').replace(/.com\/.*/, '.com').replace(/.app\/.*/, '.app'),
                     path: baseUrl.replace(/.*?.app/, '').replace(/.*?.com/, '') + endPath + document.id,
@@ -264,14 +263,7 @@ class AppitBaseTransformer {
     async tsGetData()
     {
       return new Promise(async (resolve, reject) => {
-        let jwt = null
-        try {
-          jwt = await this.fetchTSJWT()
-        } catch(e) {
-          return reject(e);
-        }
-
-        const tokenDecodablePart = jwt.split('.')[1];
+        const tokenDecodablePart = this.token.split('.')[1];
         const decoded = JSON.parse(Buffer.from(tokenDecodablePart, 'base64').toString());
         const endPath = '/dynamicdata/';
 
@@ -281,7 +273,7 @@ class AppitBaseTransformer {
 
         let req = https.request({
           headers: {
-            'Authorization': jwt
+            'Authorization': this.token
           },
           hostname: baseUrl.replace('https://', '').replace(/.com\/.*/, '.com').replace(/.app\/.*/, '.app'),
           path: baseUrl.replace(/.*?.app/, '').replace(/.*?.com/, '') + endPath,
@@ -304,51 +296,6 @@ class AppitBaseTransformer {
       })
     }
 
-    fetchTSJWT()
-    {
-      return new Promise((resolve, reject) => {
-        const data = JSON.stringify({
-          query: `{
-            tsJWT {
-              jwt
-            }
-          }`,
-        });
-
-        const options = {
-          hostname: 'vtb-gateway-legacy.visualtourbuilder.com',
-          path: '/graphql',
-          port: 443,
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'Content-Length': data.length,
-            'Authorization': `Bearer ${this.token}`,
-            'User-Agent': 'Node',
-          },
-        };
-  
-        const req = https.request(options, (res) => {
-          let data = '';
-        
-          res.on('data', (d) => {
-            data += d;
-          });
-
-          res.on('error', (e) => {
-            reject(e);
-          });
-
-          res.on('end', () => {
-            resolve(JSON.parse(data).data.tsJWT.jwt);
-          });
-        });
-
-        req.write(data);
-        req.end();
-      })
-    }
-
     async mediaToBase64(media)
     {
         let promises = [];

package/appit.js

@@ -398,7 +398,7 @@ class Appit {
           delete place.images;
 
           if(place.category_id && typeof place.category_id === 'string') {
-              place.category_id = await this.findOrCreateCategory(place.category_id);
+              place.category_id = await this.findOrCreateCategory(place.category_id, 'places');
           }
 
           const placeData = {...place, ...images, excursion_id: this.history.excursionId};
@@ -455,7 +455,7 @@ class Appit {
       }
     }
 
-    async findOrCreateCategory(title)
+    async findOrCreateCategory(title, type)
     {
       let category_id = null;
 
@@ -474,7 +474,7 @@ class Appit {
         })
 
         if(!category_id) {
-          let result = await this.request('POST', `categories`, {title: title});
+          let result = await this.request('POST', `categories`, {title: title, workspace_id: this.transformer.workspace_id, type: type});
           if(result && result.success) {
             category_id = result.data.id;
             let categories = await this.request('GET', `categories?per_page=50000`);
@@ -849,7 +849,7 @@ class Appit {
           let info = this.clean(JSON.parse(JSON.stringify(travelInfo[i])));
           
           if(info.category_id && typeof info.category_id === 'string') {
-            info.category_id = await this.findOrCreateCategory(info.category_id);
+            info.category_id = await this.findOrCreateCategory(info.category_id, 'travel');
           }
 
           const travelData = {...info, excursion_id: this.history.excursionId};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vtb-appit",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "",
   "main": "index.js",
   "scripts": {},