qiscus-sdk-core 2.11.1 → 2.12.0

package/lib/index.js

@@ -173,7 +173,8 @@ var QiscusSDK = /*#__PURE__*/function () {
      */
     value: function () {
       var _init = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(config) {
-        var _this2 = this;
+        var _this2 = this,
+            _config$withConfig;
 
         var isDifferentBaseUrl, isDifferentMqttUrl, isDifferentBrokerLbUrl, setterHelper, mqttWssCheck;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
@@ -284,7 +285,14 @@ var QiscusSDK = /*#__PURE__*/function () {
                   }
                 };
 
-                _context3.next = 28;
+                this.withConfig = (_config$withConfig = config.withConfig) !== null && _config$withConfig !== void 0 ? _config$withConfig : true;
+
+                if (!(this.withConfig === true)) {
+                  _context3.next = 32;
+                  break;
+                }
+
+                _context3.next = 30;
                 return this.HTTPAdapter.get_request('api/v2/sdk/config').then(function (resp) {
                   resp.status == 200 ? _this2.isConfigLoaded = true : _this2.isConfigLoaded = false;
                   return resp.body.results;
@@ -323,7 +331,14 @@ var QiscusSDK = /*#__PURE__*/function () {
                   _this2.isConfigLoaded = true;
                 });
 
-              case 28:
+              case 30:
+                _context3.next = 33;
+                break;
+
+              case 32:
+                this.isConfigLoaded = true;
+
+              case 33:
                 // set Event Listeners
                 this._getMqttClientId = function () {
                   return "".concat(_this2.AppId, "_").concat(_this2.user_id, "_").concat(Date.now());
@@ -499,7 +514,7 @@ var QiscusSDK = /*#__PURE__*/function () {
                 this.customEventAdapter = (0, _customEvent["default"])(this.realtimeAdapter, this.user_id);
                 this.setEventListeners();
 
-              case 49:
+              case 54:
               case "end":
                 return _context3.stop();
             }
@@ -573,6 +588,12 @@ var QiscusSDK = /*#__PURE__*/function () {
       var _this3 = this;
 
       var self = this;
+      this.authAdapter = new _auth["default"](self.HTTPAdapter);
+
+      if (this.userData.email != null) {
+        this.authAdapter.userId = this.userData.email;
+      }
+
       self.events.on('start-init', function () {
         self.HTTPAdapter = new _http["default"]({
           baseURL: self.baseURL,
@@ -584,7 +605,6 @@ var QiscusSDK = /*#__PURE__*/function () {
           }
         });
         self.HTTPAdapter.setToken(self.userData.token);
-        self.authAdapter = new _auth["default"](self.HTTPAdapter);
       });
       self.events.on('room-changed', function (room) {
         _this3.logging('room changed', room);
@@ -709,6 +729,9 @@ var QiscusSDK = /*#__PURE__*/function () {
         if (_this3.options.loginSuccessCallback) {
           _this3.options.loginSuccessCallback(response);
         }
+
+        _this3.authAdapter.userId = _this3.userData.email;
+        _this3.authAdapter.refreshToken = _this3.userData.refresh_token;
       });
       /**
        * Called when there's something wrong when connecting to qiscus SDK
@@ -952,6 +975,8 @@ var QiscusSDK = /*#__PURE__*/function () {
             self.events.emit('start-init');
             return self.authAdapter.loginOrRegister(params).then(function (response) {
               self.isInit = true;
+              console.log('response', response);
+              self.refresh_token = response.user.refresh_token;
               self.events.emit('login-success', response);
 
               _this4.realtimeAdapter.connect();
@@ -991,20 +1016,37 @@ var QiscusSDK = /*#__PURE__*/function () {
         }
       }, 300);
     }
+  }, {
+    key: "refreshAuthToken",
+    value: function refreshAuthToken() {
+      var _this6 = this;
+
+      return this.authAdapter.refreshAuthToken().then(function (r) {
+        console.log('resp:', r);
+        _this6.token = r.token;
+        _this6.HTTPAdapter.token = r.token;
+        return r;
+      });
+    }
+  }, {
+    key: "expiredAuthToken",
+    value: function expiredAuthToken() {
+      return this.authAdapter.expiredAuthToken();
+    }
   }, {
     key: "publishOnlinePresence",
     value: function publishOnlinePresence(val) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (val === true) {
         setBackToOnline = setInterval(function () {
-          _this6.realtimeAdapter.publishPresence(_this6.user_id, true);
+          _this7.realtimeAdapter.publishPresence(_this7.user_id, true);
         }, 3500);
       } else {
         clearInterval(this.presensePublisherId);
         clearInterval(setBackToOnline);
         setTimeout(function () {
-          _this6.realtimeAdapter.publishPresence(_this6.user_id, false);
+          _this7.realtimeAdapter.publishPresence(_this7.user_id, false);
         }, 3500);
       }
     }
@@ -1037,7 +1079,7 @@ var QiscusSDK = /*#__PURE__*/function () {
   }, {
     key: "setActiveRoom",
     value: function setActiveRoom(room) {
-      var _this7 = this;
+      var _this8 = this;
 
       // when we activate a room
       // we need to unsubscribe from typing event
@@ -1047,7 +1089,7 @@ var QiscusSDK = /*#__PURE__*/function () {
 
         if (this.selected.room_type === 'single') {
           var unsubscribedUserId = this.selected.participants.filter(function (p) {
-            return p.email !== _this7.user_id;
+            return p.email !== _this8.user_id;
           });
 
           if (unsubscribedUserId.length > 0) {
@@ -1058,7 +1100,7 @@ var QiscusSDK = /*#__PURE__*/function () {
 
       if (room.participants == null) room.participants = [];
       var targetUserId = room.participants.find(function (p) {
-        return p.email !== _this7.user_id;
+        return p.email !== _this8.user_id;
       });
       this.chatmateStatus = null;
       this.isTypingStatus = null;
@@ -1067,35 +1109,35 @@ var QiscusSDK = /*#__PURE__*/function () {
 
       var initialSubscribe = setInterval(function () {
         // Clear Interval when realtimeAdapter has been Populated
-        if (_this7.debugMode) {
-          _this7.logger('Trying Initial Subscribe');
+        if (_this8.debugMode) {
+          _this8.logger('Trying Initial Subscribe');
         }
 
-        if (_this7.realtimeAdapter != null) {
-          if (_this7.debugMode) {
-            _this7.logger('MQTT Connected');
+        if (_this8.realtimeAdapter != null) {
+          if (_this8.debugMode) {
+            _this8.logger('MQTT Connected');
           }
 
           clearInterval(initialSubscribe); // before we unsubscribe, we need to get the userId first
           // and only unsubscribe if the previous room is having a type of 'single'
 
           if (room.room_type === 'single' && targetUserId != null) {
-            _this7.realtimeAdapter.subscribeRoomPresence(targetUserId.email);
+            _this8.realtimeAdapter.subscribeRoomPresence(targetUserId.email);
           } // we need to subscribe to new room typing event now
 
 
-          if (_this7.selected != null && !_this7.selected.isChannel) {
-            _this7.realtimeAdapter.subscribeTyping(room.id);
+          if (_this8.selected != null && !_this8.selected.isChannel) {
+            _this8.realtimeAdapter.subscribeTyping(room.id);
 
-            _this7.events.emit('room-changed', _this7.selected);
+            _this8.events.emit('room-changed', _this8.selected);
           }
 
-          if (_this7.debugMode && _this7.realtimeAdapter == null) {
-            _this7.logger('Retry');
+          if (_this8.debugMode && _this8.realtimeAdapter == null) {
+            _this8.logger('Retry');
           }
         } else {
-          if (_this7.debugMode) {
-            _this7.logger('MQTT Not Connected, yet');
+          if (_this8.debugMode) {
+            _this8.logger('MQTT Not Connected, yet');
           }
         }
       }, 3000);
@@ -1110,7 +1152,7 @@ var QiscusSDK = /*#__PURE__*/function () {
   }, {
     key: "chatTarget",
     value: function chatTarget(userId) {
-      var _this8 = this;
+      var _this9 = this;
 
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       // make sure data already loaded first (user already logged in)
@@ -1129,9 +1171,9 @@ var QiscusSDK = /*#__PURE__*/function () {
                 case 0:
                   room = new _Room["default"](resp);
 
-                  _this8.updateLastReceivedComment(room.last_comment_id);
+                  _this9.updateLastReceivedComment(room.last_comment_id);
 
-                  _this8.isLoading = false;
+                  _this9.isLoading = false;
 
                   mapIntercept = /*#__PURE__*/function () {
                     var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(it) {
@@ -1140,7 +1182,7 @@ var QiscusSDK = /*#__PURE__*/function () {
                           switch (_context4.prev = _context4.next) {
                             case 0:
                               _context4.next = 2;
-                              return _this8._hookAdapter.trigger(_hook.Hooks.MESSAGE_BEFORE_RECEIVED, it);
+                              return _this9._hookAdapter.trigger(_hook.Hooks.MESSAGE_BEFORE_RECEIVED, it);
 
                             case 2:
                               return _context4.abrupt("return", _context4.sent);
@@ -1166,13 +1208,13 @@ var QiscusSDK = /*#__PURE__*/function () {
                 case 6:
                   room.comments = _context5.sent;
 
-                  _this8.setActiveRoom(room); // id of last comment on this room
+                  _this9.setActiveRoom(room); // id of last comment on this room
 
 
                   lastComment = room.comments[room.comments.length - 1];
-                  if (lastComment) _this8.readComment(room.id, lastComment.id);
+                  if (lastComment) _this9.readComment(room.id, lastComment.id);
 
-                  _this8.events.emit('chat-room-created', {
+                  _this9.events.emit('chat-room-created', {
                     room: room
                   });
 
@@ -1185,7 +1227,7 @@ var QiscusSDK = /*#__PURE__*/function () {
 
                 case 13:
                   topicId = room.id;
-                  return _context5.abrupt("return", _this8.sendComment(topicId, initialMessage).then(function () {
+                  return _context5.abrupt("return", _this9.sendComment(topicId, initialMessage).then(function () {
                     return Promise.resolve(room);
                   })["catch"](function (err) {
                     console.error('Error when submit comment', err);
@@ -1204,7 +1246,7 @@ var QiscusSDK = /*#__PURE__*/function () {
         };
       }())["catch"](function (err) {
         console.error('Error when creating room', err);
-        _this8.isLoading = false;
+        _this9.isLoading = false;
         return Promise.reject(err);
       });
     }
@@ -1236,7 +1278,7 @@ var QiscusSDK = /*#__PURE__*/function () {
   }, {
     key: "getRoomById",
     value: function getRoomById(id) {
-      var _this9 = this;
+      var _this10 = this;
 
       if (!this.isInit) return;
       var self = this;
@@ -1265,7 +1307,7 @@ var QiscusSDK = /*#__PURE__*/function () {
 
                   comment = _step.value;
                   _context6.next = 9;
-                  return _this9._hookAdapter.trigger(_hook.Hooks.MESSAGE_BEFORE_RECEIVED, comment);
+                  return _this10._hookAdapter.trigger(_hook.Hooks.MESSAGE_BEFORE_RECEIVED, comment);
 
                 case 9:
                   c = _context6.sent;
@@ -1308,7 +1350,7 @@ var QiscusSDK = /*#__PURE__*/function () {
                   if (lastComment) self.readComment(room.id, lastComment.id);
 
                   if (room.isChannel) {
-                    _this9.realtimeAdapter.subscribeChannel(_this9.AppId, room.unique_id);
+                    _this10.realtimeAdapter.subscribeChannel(_this10.AppId, room.unique_id);
                   }
 
                   return _context6.abrupt("return", room);
@@ -1339,7 +1381,7 @@ var QiscusSDK = /*#__PURE__*/function () {
   }, {
     key: "getOrCreateRoomByUniqueId",
     value: function getOrCreateRoomByUniqueId(id, roomName, avatarURL) {
-      var _this10 = this;
+      var _this11 = this;
 
       var self = this;
       self.isLoading = true;
@@ -1362,7 +1404,7 @@ var QiscusSDK = /*#__PURE__*/function () {
                           switch (_context7.prev = _context7.next) {
                             case 0:
                               _context7.next = 2;
-                              return _this10._hookAdapter.trigger(_hook.Hooks.MESSAGE_BEFORE_RECEIVED, item);
+                              return _this11._hookAdapter.trigger(_hook.Hooks.MESSAGE_BEFORE_RECEIVED, item);
 
                             case 2:
                               return _context7.abrupt("return", _context7.sent);
@@ -1392,7 +1434,7 @@ var QiscusSDK = /*#__PURE__*/function () {
                   lastComment = room.comments[room.comments.length - 1];
                   if (lastComment) self.readComment(room.id, lastComment.id);
 
-                  _this10.realtimeAdapter.subscribeChannel(_this10.AppId, room.unique_id);
+                  _this11.realtimeAdapter.subscribeChannel(_this11.AppId, room.unique_id);
 
                   return _context8.abrupt("return", Promise.resolve(room));
 
@@ -1467,7 +1509,7 @@ var QiscusSDK = /*#__PURE__*/function () {
   }, {
     key: "loadComments",
     value: function loadComments(roomId) {
-      var _this11 = this;
+      var _this12 = this;
 
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       return this.userAdapter.loadComments(roomId, options).then( /*#__PURE__*/function () {
@@ -1493,7 +1535,7 @@ var QiscusSDK = /*#__PURE__*/function () {
                   comment = _step2.value;
                   _context10.t0 = comments;
                   _context10.next = 9;
-                  return _this11._hookAdapter.trigger(_hook.Hooks.MESSAGE_BEFORE_RECEIVED, comment);
+                  return _this12._hookAdapter.trigger(_hook.Hooks.MESSAGE_BEFORE_RECEIVED, comment);
 
                 case 9:
                   _context10.t1 = _context10.sent;
@@ -1522,10 +1564,10 @@ var QiscusSDK = /*#__PURE__*/function () {
                   return _context10.finish(18);
 
                 case 21:
-                  if (_this11.selected != null) {
-                    _this11.selected.receiveComments(comments.reverse());
+                  if (_this12.selected != null) {
+                    _this12.selected.receiveComments(comments.reverse());
 
-                    _this11.sortComments();
+                    _this12.sortComments();
                   }
 
                   return _context10.abrupt("return", comments);
@@ -1673,15 +1715,15 @@ var QiscusSDK = /*#__PURE__*/function () {
   }, {
     key: "updateProfile",
     value: function updateProfile(user) {
-      var _this12 = this;
+      var _this13 = this;
 
       return this.userAdapter.updateProfile(user).then(function (res) {
-        _this12.events.emit('profile-updated', user);
+        _this13.events.emit('profile-updated', user);
 
-        _this12.userData = res;
+        _this13.userData = res;
         return Promise.resolve(res);
       }, function (err) {
-        return _this12.logger(err);
+        return _this13.logger(err);
       });
     }
   }, {
@@ -1724,7 +1766,7 @@ var QiscusSDK = /*#__PURE__*/function () {
     key: "sendComment",
     value: function () {
       var _sendComment = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(topicId, commentMessage, uniqueId) {
-        var _this13 = this;
+        var _this14 = this;
 
         var type,
             payload,
@@ -1768,14 +1810,14 @@ var QiscusSDK = /*#__PURE__*/function () {
                   username_real: this.user_id,
                   user_avatar_url: this.userData.avatar_url,
                   user_extras: this.userData.user_extras,
-                  id: Math.round(Math.random() * 10e6),
+                  id: Math.round(Date.now() * 1e6 + Date.now()),
                   type: type || 'text',
                   timestamp: (0, _format["default"])(new Date()),
                   unique_id: uniqueId ? String(uniqueId) : null,
                   payload: (0, _util.tryCatch)(function () {
                     return JSON.parse(payload);
                   }, payload, function (error) {
-                    return _this13.logger('Error when parsing payload', error.message);
+                    return _this14.logger('Error when parsing payload', error.message);
                   })
                 };
                 pendingComment = self.prepareCommentToBeSubmitted(commentData); // push this comment unto active room
@@ -1809,7 +1851,7 @@ var QiscusSDK = /*#__PURE__*/function () {
                         switch (_context14.prev = _context14.next) {
                           case 0:
                             _context14.next = 2;
-                            return _this13._hookAdapter.trigger(_hook.Hooks.MESSAGE_BEFORE_RECEIVED, res);
+                            return _this14._hookAdapter.trigger(_hook.Hooks.MESSAGE_BEFORE_RECEIVED, res);
 
                           case 2:
                             res = _context14.sent;
@@ -2051,14 +2093,14 @@ var QiscusSDK = /*#__PURE__*/function () {
   }, {
     key: "removeParticipantsFromGroup",
     value: function removeParticipantsFromGroup(roomId, emails) {
-      var _this14 = this;
+      var _this15 = this;
 
       if (_is_js["default"].not.array(emails)) {
         return Promise.reject(new Error('`emails` must have type of array'));
       }
 
       return this.roomAdapter.removeParticipantsFromGroup(roomId, emails).then(function (res) {
-        _this14.events.emit('participants-removed', emails);
+        _this15.events.emit('participants-removed', emails);
 
         return Promise.resolve(res);
       });
@@ -2224,14 +2266,14 @@ var QiscusSDK = /*#__PURE__*/function () {
   }, {
     key: "deleteComment",
     value: function deleteComment(roomId, commentUniqueIds, isForEveryone, isHard) {
-      var _this15 = this;
+      var _this16 = this;
 
       if (!Array.isArray(commentUniqueIds)) {
         throw new Error("unique ids' must be type of Array");
       }
 
       return this.userAdapter.deleteComment(roomId, commentUniqueIds, isForEveryone, isHard).then(function (res) {
-        _this15.events.emit('comment-deleted', {
+        _this16.events.emit('comment-deleted', {
           roomId: roomId,
           commentUniqueIds: commentUniqueIds,
           isForEveryone: isForEveryone,
@@ -2246,7 +2288,7 @@ var QiscusSDK = /*#__PURE__*/function () {
   }, {
     key: "clearRoomsCache",
     value: function clearRoomsCache() {
-      var _this16 = this;
+      var _this17 = this;
 
       // remove all room except currently selected
       if (this.selected) {
@@ -2255,7 +2297,7 @@ var QiscusSDK = /*#__PURE__*/function () {
 
         var roomLength = this.rooms.length;
         var curIndex = this.rooms.findIndex(function (room) {
-          return room.id === _this16.selected.id;
+          return room.id === _this17.selected.id;
         });
 
         if (!(curIndex + 1 === roomLength)) {
@@ -2264,7 +2306,7 @@ var QiscusSDK = /*#__PURE__*/function () {
 
 
         curIndex = this.rooms.findIndex(function (room) {
-          return room.id === _this16.selected.id;
+          return room.id === _this17.selected.id;
         });
 
         if (curIndex > 0 && this.rooms.length > 1) {
@@ -2275,19 +2317,19 @@ var QiscusSDK = /*#__PURE__*/function () {
   }, {
     key: "exitChatRoom",
     value: function exitChatRoom() {
-      var _this17 = this;
+      var _this18 = this;
 
       // remove all subscriber
       this.realtimeAdapter.unsubscribeTyping();
       (0, _util.tryCatch)(function () {
-        return _this17.selected.participants.filter(function (it) {
-          return it.email !== _this17.user_id;
+        return _this18.selected.participants.filter(function (it) {
+          return it.email !== _this18.user_id;
         }).map(function (it) {
           return it.email;
         });
       }, null, this.noop, function (userIds) {
         return userIds.forEach(function (userId) {
-          return _this17.realtimeAdapter.unsubscribeRoomPresence(userId);
+          return _this18.realtimeAdapter.unsubscribeRoomPresence(userId);
         });
       });
       this.selected = null;
@@ -2779,11 +2821,11 @@ var QiscusSDK = /*#__PURE__*/function () {
   }, {
     key: "onMessageUpdated",
     value: function onMessageUpdated(handler) {
-      var _this18 = this;
+      var _this19 = this;
 
       this.realtimeAdapter.on('message:updated', handler);
       return function () {
-        return _this18.realtimeAdapter.off('message:updated', handler);
+        return _this19.realtimeAdapter.off('message:updated', handler);
       };
     }
     /**

package/lib/lib/adapters/auth.js

@@ -21,6 +21,8 @@ var AuthAdapter = /*#__PURE__*/function () {
   function AuthAdapter(HTTPAdapter) {
     (0, _classCallCheck2["default"])(this, AuthAdapter);
     this.HTTPAdapter = HTTPAdapter;
+    this.refreshToken = null;
+    this.userId = null;
   }
 
   (0, _createClass2["default"])(AuthAdapter, [{
@@ -33,18 +35,52 @@ var AuthAdapter = /*#__PURE__*/function () {
   }, {
     key: "loginOrRegister",
     value: function loginOrRegister(params) {
+      var _this = this;
+
       return this.HTTPAdapter.post('api/v2/sdk/login_or_register', params).then(function (resp) {
         if (resp.body.status !== 200) return Promise.reject(resp);
-        return resp.body.results;
+        var result = resp.body.results;
+        _this.userId = result.user.email;
+        _this.refreshToken = result.user.refresh_token;
+        return result;
       });
     }
   }, {
     key: "verifyIdentityToken",
     value: function verifyIdentityToken(token) {
+      var _this2 = this;
+
       return this.HTTPAdapter.post('api/v2/sdk/auth/verify_identity_token', {
         identity_token: token
       }).then(function (resp) {
-        return resp.body.results;
+        var result = resp.body.results;
+        _this2.userId = result.user.email;
+        _this2.refreshToken = result.user.refresh_token;
+        return result;
+      });
+    }
+  }, {
+    key: "refreshAuthToken",
+    value: function refreshAuthToken() {
+      var _this3 = this;
+
+      return this.HTTPAdapter.post('api/v2/sdk/refresh_user_token', {
+        user_id: this.userId,
+        refresh_token: this.refreshToken
+      }).then(function (r) {
+        var res = r.body.results;
+        _this3.refreshToken = res.refresh_token;
+        _this3.HTTPAdapter.token = res.token;
+        return res;
+      });
+    }
+  }, {
+    key: "expiredAuthToken",
+    value: function expiredAuthToken() {
+      return this.HTTPAdapter.post("api/v2/sdk/expire_user_token", {
+        user_id: this.userId
+      }).then(function (r) {
+        return r.body.results;
       });
     }
   }]);