roboto-js 1.1.1 → 1.1.3

package/dist/esm/rbt_object.js

@@ -31,9 +31,9 @@ var RbtObject = exports["default"] = /*#__PURE__*/function () {
       isNew: options.isNew || false
     };
     if (record.data) {
-      this._data = record.data;
+      this._data = this._deepUnpackJson(record.data);
     } else {
-      this._data = record.dataJson ? JSON.parse(record.dataJson) : {};
+      this._data = record.dataJson ? this._deepUnpackJson(record.dataJson) : {};
     }
   }
   _createClass(RbtObject, [{
@@ -195,6 +195,24 @@ var RbtObject = exports["default"] = /*#__PURE__*/function () {
       }
       return _delete;
     }()
+  }, {
+    key: "_deepUnpackJson",
+    value: function _deepUnpackJson(value) {
+      if (typeof value === 'string') {
+        try {
+          var parsed = JSON.parse(value);
+          return this._deepUnpackJson(parsed); // Recursively parse if the result is a string, object, or array
+        } catch (e) {
+          return value; // Return the original string if parsing fails
+        }
+      } else if (value !== null && _typeof(value) === 'object') {
+        // If it's an object (including arrays), recursively parse each value
+        for (var key in value) {
+          value[key] = this._deepUnpackJson(value[key]);
+        }
+      }
+      return value;
+    }
   }]);
   return RbtObject;
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roboto-js",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "type": "module",
   "description": "",
   "main": "dist/cjs/index.cjs",

package/src/index.js

@@ -63,6 +63,9 @@ export default class Roboto{
   async login(params){
     return this.api.login(params);
   }
+  async logout(){
+    return this.api.logout();
+  }
   async refreshAuthToken(){
     return this.api.refreshAuthToken(this.config.authtoken);
   }

package/src/rbt_api.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import CryptoJS from 'crypto-js';
 import RbtObject from './rbt_object.js';
 import RbtUser from './rbt_user.js';
-import RbtFile from './rbt_file.js';
+import RbtFile from './rbt_file.js'; 
 import _ from 'lodash';
 import { openDB } from 'idb';
 
@@ -76,6 +76,34 @@ export default class RbtApi {
     }
   }
 
+  async logout() {
+    try {
+      // Call logout endpoint if necessary. Here, I assume there's a '/user_service/logoutUser' endpoint.
+      // This is optional and depends on how your backend is set up.
+      const response = await this.axios.post('/user_service/logoutUser');
+
+      if (response.data.ok === false) {
+        return this._handleError(response);
+      }
+
+      // Clear the iac_session and remove the auth token from axios headers
+      this.iac_session = null;
+      if (this.axios.defaults.headers.common['authtoken']) {
+        delete this.axios.defaults.headers.common['authtoken'];
+      }
+
+      // Clear localStorage if it's being used
+      if (typeof localStorage !== 'undefined') {
+        localStorage.removeItem('authtoken');
+      }
+
+      // Return some kind of success response or the response from the server
+      return response.data;
+    } catch (e) {
+      this._handleError(e);
+    }
+  }
+
   async loadCurrentUser(){
 
     // TODO - get the actual user from the session
@@ -131,8 +159,9 @@ export default class RbtApi {
       if(dataHash){
         record.data = dataHash;
       }
-      return new RbtObject(record, this.axios);
+      return new RbtUser(record, this.axios);
     } catch (e) {
+      debugger;
       return this._handleError(e);
     }
   }
@@ -458,6 +487,7 @@ export default class RbtApi {
     if (_.isObject(err) && _.get(err, 'response')) {
       const msg = _.get(err, 'response.data.message', 'Error in API response');
       throw new Error(msg);
+
     } else {
       throw new Error(err.message || 'Unknown error');
     }

package/src/rbt_object.js

@@ -11,11 +11,11 @@ export default class RbtObject {
       changes: [], 
       isNew: options.isNew || false 
     };
-
+    
     if(record.data){
-      this._data = record.data;
+      this._data = this._deepUnpackJson(record.data);
     } else {
-      this._data = record.dataJson ? JSON.parse(record.dataJson) : {};
+      this._data = record.dataJson ? this._deepUnpackJson(record.dataJson) : {};
     }
     
   }
@@ -133,4 +133,21 @@ export default class RbtObject {
     }
   }
 
+  _deepUnpackJson(value){
+    if (typeof value === 'string') {
+        try {
+            const parsed = JSON.parse(value);
+            return this._deepUnpackJson(parsed); // Recursively parse if the result is a string, object, or array
+        } catch (e) {
+            return value; // Return the original string if parsing fails
+        }
+    } else if (value !== null && typeof value === 'object') {
+        // If it's an object (including arrays), recursively parse each value
+        for (const key in value) {
+            value[key] = this._deepUnpackJson(value[key]);
+        }
+    }
+    return value;
+  }
+
 }