roboto-js 1.4.42 → 1.4.44

package/dist/cjs/rbt_api.cjs

@@ -335,7 +335,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
     key: "loadCurrentUser",
     value: function () {
       var _loadCurrentUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        var _response$user, response;
+        var response, _response$user;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -347,7 +347,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               return _context7.abrupt("return", this.currentUser);
             case 3:
               if (!this.authtoken) {
-                _context7.next = 12;
+                _context7.next = 13;
                 break;
               }
               _context7.next = 6;
@@ -360,23 +360,26 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               }
               return _context7.abrupt("return", null);
             case 9:
-              this.currentUser = new _rbt_user["default"]({
-                id: response === null || response === void 0 || (_response$user = response.user) === null || _response$user === void 0 ? void 0 : _response$user.id
-              }, this.axios);
-              this.currentUser.setData(response.user);
+              if (response !== null && response !== void 0 && response.user) {
+                this.currentUser = new _rbt_user["default"]({
+                  id: response === null || response === void 0 || (_response$user = response.user) === null || _response$user === void 0 ? void 0 : _response$user.id
+                }, this.axios);
+                this.currentUser.setData(response.user);
+              }
               return _context7.abrupt("return", this.currentUser);
-            case 12:
+            case 13:
               this.currentUser = null;
+            case 14:
               return _context7.abrupt("return", null);
-            case 16:
-              _context7.prev = 16;
+            case 17:
+              _context7.prev = 17;
               _context7.t0 = _context7["catch"](0);
               return _context7.abrupt("return", this._handleError(_context7.t0));
-            case 19:
+            case 20:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[0, 16]]);
+        }, _callee7, this, [[0, 17]]);
       }));
       function loadCurrentUser() {
         return _loadCurrentUser.apply(this, arguments);
@@ -1117,11 +1120,11 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
     value: (function () {
       var _pollTaskProgress = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(jobId, callbacks) {
         var _this3 = this;
-        var onProgress, onError, onStopped, onDone, checkProgress;
+        var onProgress, onError, onStopped, onWaiting, onDone, checkProgress;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              onProgress = callbacks.onProgress, onError = callbacks.onError, onStopped = callbacks.onStopped, onDone = callbacks.onDone;
+              onProgress = callbacks.onProgress, onError = callbacks.onError, onStopped = callbacks.onStopped, onWaiting = callbacks.onWaiting, onDone = callbacks.onDone;
               _context21.prev = 1;
               checkProgress = /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
@@ -1149,6 +1152,10 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
                           // Provide the current progress to the callback function
                           onStopped(response);
                         }
+                        if (response.status === 'WAITING' && onWaiting) {
+                          // Provide the current progress to the callback function
+                          onWaiting(response);
+                        }
 
                         // Provide the current progress to the callback function
                         if (response.status == 'RUNNING') {
@@ -1159,7 +1166,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
                         if (['RUNNING', 'STOPPING'].includes(response.status)) {
                           setTimeout(checkProgress, 2000); // Poll every 2 seconds
                         }
-                      case 8:
+                      case 9:
                       case "end":
                         return _context20.stop();
                     }

package/dist/esm/rbt_api.js

@@ -167,16 +167,18 @@ export default class RbtApi {
       if (this.authtoken) {
         let response = await this.refreshAuthToken(this.authtoken);
         if (!response) return null;
-        this.currentUser = new RbtUser({
-          id: response?.user?.id
-        }, this.axios);
-        this.currentUser.setData(response.user);
+        if (response?.user) {
+          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>';
+      } else {
+        this.currentUser = null;
       }
-      this.currentUser = null;
       return null;
     } catch (e) {
       return this._handleError(e);
@@ -644,6 +646,7 @@ export default class RbtApi {
       onProgress,
       onError,
       onStopped,
+      onWaiting,
       onDone
     } = callbacks;
     try {
@@ -666,6 +669,10 @@ export default class RbtApi {
           // Provide the current progress to the callback function
           onStopped(response);
         }
+        if (response.status === 'WAITING' && onWaiting) {
+          // Provide the current progress to the callback function
+          onWaiting(response);
+        }
 
         // Provide the current progress to the callback function
         if (response.status == 'RUNNING') {

package/package.json

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

package/src/rbt_api.js

@@ -208,16 +208,21 @@ export default class RbtApi {
         let response = await this.refreshAuthToken(this.authtoken);
         if(!response) return null;
 
-        this.currentUser = new RbtUser({ id: response?.user?.id }, this.axios);
-        this.currentUser.setData(response.user);
-        return this.currentUser;
+        if(response?.user){
+
+          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;
+      else{
+        this.currentUser = null;
+      }
       return null;
 
     }
@@ -689,7 +694,7 @@ export default class RbtApi {
    * the task is completed or an error occurs.
    */
    async pollTaskProgress(jobId, callbacks) {
-    const { onProgress, onError, onStopped, onDone } = callbacks;
+    const { onProgress, onError, onStopped, onWaiting, onDone } = callbacks;
     try {
       const checkProgress = async () => {
         const response = await this.get(`/task_service/pollChainProgress`, { jobId: jobId });
@@ -708,6 +713,10 @@ export default class RbtApi {
           // Provide the current progress to the callback function
           onStopped(response);
         }
+        if (response.status === 'WAITING' && onWaiting){
+          // Provide the current progress to the callback function
+          onWaiting(response);
+        }
 
         // Provide the current progress to the callback function
         if(response.status == 'RUNNING'){