roboto-js 1.1.7 → 1.1.8

package/dist/cjs/rbt_api.cjs

@@ -107,21 +107,22 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               return _context2.abrupt("return", this._handleError(response));
             case 7:
               this.iac_session = response.data;
+              this.currentUser = this.iac_session ? new _rbt_user["default"](this.iac_session.user, this.axios) : null;
               // update axios instance headers with authtoken
               this.axios.defaults.headers.common['authtoken'] = response.data.authToken;
               if (typeof localStorage != 'undefined') {
                 localStorage.setItem('authtoken', response.data.authToken);
               }
               return _context2.abrupt("return", response.data);
-            case 13:
-              _context2.prev = 13;
+            case 14:
+              _context2.prev = 14;
               _context2.t0 = _context2["catch"](0);
               this._handleError(_context2.t0);
-            case 16:
+            case 17:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[0, 13]]);
+        }, _callee2, this, [[0, 14]]);
       }));
       function login(_x) {
         return _login.apply(this, arguments);
@@ -149,6 +150,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
             case 6:
               // Clear the iac_session and remove the auth token from axios headers
               this.iac_session = null;
+              this.currentUser = null;
               if (this.axios.defaults.headers.common['authtoken']) {
                 delete this.axios.defaults.headers.common['authtoken'];
               }
@@ -160,15 +162,15 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
 
               // Return some kind of success response or the response from the server
               return _context3.abrupt("return", response.data);
-            case 12:
-              _context3.prev = 12;
+            case 13:
+              _context3.prev = 13;
               _context3.t0 = _context3["catch"](0);
               this._handleError(_context3.t0);
-            case 15:
+            case 16:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 12]]);
+        }, _callee3, this, [[0, 13]]);
       }));
       function logout() {
         return _logout.apply(this, arguments);
@@ -179,34 +181,42 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
     key: "loadCurrentUser",
     value: function () {
       var _loadCurrentUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var params, _response$data, response, userData, User;
+        var response;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              // TODO - get the actual user from the session
-              params = {
-                id: 'superuser_tom'
-              };
-              _context4.prev = 1;
-              _context4.next = 4;
-              return this.axios.post('/user_service/loadUser', [params]);
-            case 4:
+              _context4.prev = 0;
+              if (!this.currentUser) {
+                _context4.next = 3;
+                break;
+              }
+              return _context4.abrupt("return", this.currentUser);
+            case 3:
+              if (!this.authtoken) {
+                _context4.next = 10;
+                break;
+              }
+              _context4.next = 6;
+              return this.refreshAuthToken(this.authtoken);
+            case 6:
               response = _context4.sent;
-              userData = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.user;
-              User = new _rbt_user["default"]({
-                id: userData.id
+              this.currentUser = new _rbt_user["default"]({
+                id: response.user.id
               }, this.axios);
-              User.setData(userData);
-              return _context4.abrupt("return", User);
-            case 11:
-              _context4.prev = 11;
-              _context4.t0 = _context4["catch"](1);
-              return _context4.abrupt("return", this._handleError(_context4.t0));
+              this.currentUser.setData(response.user);
+              return _context4.abrupt("return", this.currentUser);
+            case 10:
+              this.currentUser = null;
+              return _context4.abrupt("return", null);
             case 14:
+              _context4.prev = 14;
+              _context4.t0 = _context4["catch"](0);
+              return _context4.abrupt("return", this._handleError(_context4.t0));
+            case 17:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[1, 11]]);
+        }, _callee4, this, [[0, 14]]);
       }));
       function loadCurrentUser() {
         return _loadCurrentUser.apply(this, arguments);
@@ -221,26 +231,30 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              debugger;
               params = {
                 emailConfirmCode: confirmCode
               };
-              _context5.prev = 2;
-              _context5.next = 5;
+              _context5.prev = 1;
+              _context5.next = 4;
               return this.axios.post('/user_service/confirmUserEmail', [params]);
-            case 5:
+            case 4:
               response = _context5.sent;
-              debugger;
-              return _context5.abrupt("return", response);
+              if (!(response.data.ok === false)) {
+                _context5.next = 7;
+                break;
+              }
+              return _context5.abrupt("return", this._handleError(response));
+            case 7:
+              return _context5.abrupt("return", response.data);
             case 10:
               _context5.prev = 10;
-              _context5.t0 = _context5["catch"](2);
+              _context5.t0 = _context5["catch"](1);
               return _context5.abrupt("return", this._handleError(_context5.t0));
             case 13:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[2, 10]]);
+        }, _callee5, this, [[1, 10]]);
       }));
       function confirmUserEmail(_x2) {
         return _confirmUserEmail.apply(this, arguments);
@@ -251,7 +265,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
     key: "loadUser",
     value: function () {
       var _loadUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(userId) {
-        var params, _response$data2, response, userData, User;
+        var params, _response$data, response, userData, User;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -263,7 +277,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               return this.axios.post('/user_service/loadUser', [params]);
             case 4:
               response = _context6.sent;
-              userData = response === null || response === void 0 || (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.user;
+              userData = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.user;
               User = new _rbt_user["default"]({
                 id: userData.id
               }, this.axios);
@@ -297,16 +311,17 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               return this.axios.post('/user_service/refreshAuthToken', [authtoken]);
             case 3:
               response = _context7.sent;
+              debugger;
               return _context7.abrupt("return", response.data);
-            case 7:
-              _context7.prev = 7;
+            case 8:
+              _context7.prev = 8;
               _context7.t0 = _context7["catch"](0);
               this._handleError(_context7.t0);
-            case 10:
+            case 11:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[0, 7]]);
+        }, _callee7, this, [[0, 8]]);
       }));
       function refreshAuthToken(_x4) {
         return _refreshAuthToken.apply(this, arguments);
@@ -337,19 +352,18 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               return this.axios.post('/user_service/registerUser', [dataHash]);
             case 4:
               response = _context8.sent;
-              debugger;
               record = response.data;
               return _context8.abrupt("return", new _rbt_user["default"](record, this.axios));
-            case 10:
-              _context8.prev = 10;
+            case 9:
+              _context8.prev = 9;
               _context8.t0 = _context8["catch"](1);
               debugger;
               return _context8.abrupt("return", this._handleError(_context8.t0));
-            case 14:
+            case 13:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[1, 10]]);
+        }, _callee8, this, [[1, 9]]);
       }));
       function registerUser() {
         return _registerUser.apply(this, arguments);

package/dist/esm/rbt_api.js

@@ -107,21 +107,22 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               return _context2.abrupt("return", this._handleError(response));
             case 7:
               this.iac_session = response.data;
+              this.currentUser = this.iac_session ? new _rbt_user["default"](this.iac_session.user, this.axios) : null;
               // update axios instance headers with authtoken
               this.axios.defaults.headers.common['authtoken'] = response.data.authToken;
               if (typeof localStorage != 'undefined') {
                 localStorage.setItem('authtoken', response.data.authToken);
               }
               return _context2.abrupt("return", response.data);
-            case 13:
-              _context2.prev = 13;
+            case 14:
+              _context2.prev = 14;
               _context2.t0 = _context2["catch"](0);
               this._handleError(_context2.t0);
-            case 16:
+            case 17:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[0, 13]]);
+        }, _callee2, this, [[0, 14]]);
       }));
       function login(_x) {
         return _login.apply(this, arguments);
@@ -149,6 +150,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
             case 6:
               // Clear the iac_session and remove the auth token from axios headers
               this.iac_session = null;
+              this.currentUser = null;
               if (this.axios.defaults.headers.common['authtoken']) {
                 delete this.axios.defaults.headers.common['authtoken'];
               }
@@ -160,15 +162,15 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
 
               // Return some kind of success response or the response from the server
               return _context3.abrupt("return", response.data);
-            case 12:
-              _context3.prev = 12;
+            case 13:
+              _context3.prev = 13;
               _context3.t0 = _context3["catch"](0);
               this._handleError(_context3.t0);
-            case 15:
+            case 16:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 12]]);
+        }, _callee3, this, [[0, 13]]);
       }));
       function logout() {
         return _logout.apply(this, arguments);
@@ -179,34 +181,42 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
     key: "loadCurrentUser",
     value: function () {
       var _loadCurrentUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var params, _response$data, response, userData, User;
+        var response;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              // TODO - get the actual user from the session
-              params = {
-                id: 'superuser_tom'
-              };
-              _context4.prev = 1;
-              _context4.next = 4;
-              return this.axios.post('/user_service/loadUser', [params]);
-            case 4:
+              _context4.prev = 0;
+              if (!this.currentUser) {
+                _context4.next = 3;
+                break;
+              }
+              return _context4.abrupt("return", this.currentUser);
+            case 3:
+              if (!this.authtoken) {
+                _context4.next = 10;
+                break;
+              }
+              _context4.next = 6;
+              return this.refreshAuthToken(this.authtoken);
+            case 6:
               response = _context4.sent;
-              userData = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.user;
-              User = new _rbt_user["default"]({
-                id: userData.id
+              this.currentUser = new _rbt_user["default"]({
+                id: response.user.id
               }, this.axios);
-              User.setData(userData);
-              return _context4.abrupt("return", User);
-            case 11:
-              _context4.prev = 11;
-              _context4.t0 = _context4["catch"](1);
-              return _context4.abrupt("return", this._handleError(_context4.t0));
+              this.currentUser.setData(response.user);
+              return _context4.abrupt("return", this.currentUser);
+            case 10:
+              this.currentUser = null;
+              return _context4.abrupt("return", null);
             case 14:
+              _context4.prev = 14;
+              _context4.t0 = _context4["catch"](0);
+              return _context4.abrupt("return", this._handleError(_context4.t0));
+            case 17:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[1, 11]]);
+        }, _callee4, this, [[0, 14]]);
       }));
       function loadCurrentUser() {
         return _loadCurrentUser.apply(this, arguments);
@@ -221,26 +231,30 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              debugger;
               params = {
                 emailConfirmCode: confirmCode
               };
-              _context5.prev = 2;
-              _context5.next = 5;
+              _context5.prev = 1;
+              _context5.next = 4;
               return this.axios.post('/user_service/confirmUserEmail', [params]);
-            case 5:
+            case 4:
               response = _context5.sent;
-              debugger;
-              return _context5.abrupt("return", response);
+              if (!(response.data.ok === false)) {
+                _context5.next = 7;
+                break;
+              }
+              return _context5.abrupt("return", this._handleError(response));
+            case 7:
+              return _context5.abrupt("return", response.data);
             case 10:
               _context5.prev = 10;
-              _context5.t0 = _context5["catch"](2);
+              _context5.t0 = _context5["catch"](1);
               return _context5.abrupt("return", this._handleError(_context5.t0));
             case 13:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[2, 10]]);
+        }, _callee5, this, [[1, 10]]);
       }));
       function confirmUserEmail(_x2) {
         return _confirmUserEmail.apply(this, arguments);
@@ -251,7 +265,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
     key: "loadUser",
     value: function () {
       var _loadUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(userId) {
-        var params, _response$data2, response, userData, User;
+        var params, _response$data, response, userData, User;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -263,7 +277,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               return this.axios.post('/user_service/loadUser', [params]);
             case 4:
               response = _context6.sent;
-              userData = response === null || response === void 0 || (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.user;
+              userData = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.user;
               User = new _rbt_user["default"]({
                 id: userData.id
               }, this.axios);
@@ -297,16 +311,17 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               return this.axios.post('/user_service/refreshAuthToken', [authtoken]);
             case 3:
               response = _context7.sent;
+              debugger;
               return _context7.abrupt("return", response.data);
-            case 7:
-              _context7.prev = 7;
+            case 8:
+              _context7.prev = 8;
               _context7.t0 = _context7["catch"](0);
               this._handleError(_context7.t0);
-            case 10:
+            case 11:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[0, 7]]);
+        }, _callee7, this, [[0, 8]]);
       }));
       function refreshAuthToken(_x4) {
         return _refreshAuthToken.apply(this, arguments);
@@ -337,19 +352,18 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               return this.axios.post('/user_service/registerUser', [dataHash]);
             case 4:
               response = _context8.sent;
-              debugger;
               record = response.data;
               return _context8.abrupt("return", new _rbt_user["default"](record, this.axios));
-            case 10:
-              _context8.prev = 10;
+            case 9:
+              _context8.prev = 9;
               _context8.t0 = _context8["catch"](1);
               debugger;
               return _context8.abrupt("return", this._handleError(_context8.t0));
-            case 14:
+            case 13:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[1, 10]]);
+        }, _callee8, this, [[1, 9]]);
       }));
       function registerUser() {
         return _registerUser.apply(this, arguments);

package/package.json

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

package/src/rbt_api.js

@@ -61,6 +61,7 @@ export default class RbtApi {
       }
 
       this.iac_session = response.data;
+      this.currentUser = (this.iac_session)? new RbtUser(this.iac_session.user, this.axios): null;
       // update axios instance headers with authtoken
       this.axios.defaults.headers.common['authtoken'] = response.data.authToken;
       
@@ -87,6 +88,7 @@ export default class RbtApi {
 
       // Clear the iac_session and remove the auth token from axios headers
       this.iac_session = null;
+      this.currentUser = null;
       if (this.axios.defaults.headers.common['authtoken']) {
         delete this.axios.defaults.headers.common['authtoken'];
       }
@@ -105,19 +107,29 @@ export default class RbtApi {
 
   async loadCurrentUser(){
 
-    // TODO - get the actual user from the session
-    let params = { id: 'superuser_tom' };
-
     try {
-      
-      const response = await this.axios.post('/user_service/loadUser', [params]);
-      let userData = response?.data?.user;
+        
+      if(this.currentUser){
+        return this.currentUser;
+      }
 
-      let User = new RbtUser({ id: userData.id }, this.axios);
-      User.setData(userData);
-      return User;
+      if(this.authtoken){
 
-    } catch (e) {
+        let response = await this.refreshAuthToken(this.authtoken);
+        this.currentUser = new RbtUser({ id: response.user.id }, this.axios);
+        this.currentUser.setData(response.user);
+        return this.currentUser;
+        
+        //this.currentOrg = new RbtObject(response.organization, this.axios);
+        //this.currentOrg.type = '<@iac.organization>';
+
+      }
+
+      this.currentUser = null;
+      return null;
+
+    }
+    catch(e){
       return this._handleError(e);
     }
 
@@ -126,14 +138,17 @@ export default class RbtApi {
 
   async confirmUserEmail(confirmCode){
 
-    debugger;
     let params = { emailConfirmCode: confirmCode };
 
     try {
       
       const response = await this.axios.post('/user_service/confirmUserEmail', [params]);
-      debugger;
-      return response;
+      
+      if (response.data.ok === false) {
+        return this._handleError(response);
+      }
+
+      return response.data;
 
     } catch (e) {
       return this._handleError(e);
@@ -167,6 +182,8 @@ export default class RbtApi {
     try {
 
       const response = await this.axios.post('/user_service/refreshAuthToken', [authtoken]);
+
+      debugger;
       return response.data;
 
     } catch (e) {
@@ -187,7 +204,6 @@ export default class RbtApi {
     try {
       const response = await this.axios.post('/user_service/registerUser', [dataHash]);
 
-      debugger;
       const record = response.data;
       return new RbtUser(record, this.axios);
     } catch (e) {