qiscus-sdk-core 2.11.1 → 2.12.0

package/lib/lib/adapters/http.js

@@ -47,7 +47,12 @@ var HttpAdapter = /*#__PURE__*/function () {
         if (options && options.baseURL) req = _superagent["default"].get("".concat(options.baseURL, "/").concat(path));
         req = _this.setupHeaders(req, headers);
         req.end(function (err, res) {
-          if (err) return reject(err);
+          if (err) {
+            _this._rethrowIfExpiredToken(err);
+
+            return reject(err);
+          }
+
           return resolve(res);
         });
       });
@@ -73,7 +78,12 @@ var HttpAdapter = /*#__PURE__*/function () {
 
         req = _this2.setupHeaders(req, headers);
         req.send(body).set("Content-Type", "application/x-www-form-urlencoded").end(function (err, res) {
-          if (err) return reject(err);
+          if (err) {
+            _this2._rethrowIfExpiredToken(err);
+
+            return reject(err);
+          }
+
           return resolve(res);
         });
       });
@@ -91,7 +101,12 @@ var HttpAdapter = /*#__PURE__*/function () {
 
         req = _this3.setupHeaders(req, headers);
         req.send(body).set("Content-Type", "application/json").end(function (err, res) {
-          if (err) return reject(err);
+          if (err) {
+            _this3._rethrowIfExpiredToken(err);
+
+            return reject(err);
+          }
+
           return resolve(res);
         });
       });
@@ -108,7 +123,12 @@ var HttpAdapter = /*#__PURE__*/function () {
 
         req = _this4.setupHeaders(req, headers);
         req.send(body).set("Content-Type", "application/x-www-form-urlencoded").end(function (err, res) {
-          if (err) return reject(err);
+          if (err) {
+            _this4._rethrowIfExpiredToken(err);
+
+            return reject(err);
+          }
+
           return resolve(res);
         });
       });
@@ -125,7 +145,12 @@ var HttpAdapter = /*#__PURE__*/function () {
 
         req = _this5.setupHeaders(req, headers);
         req.send(body).set("Content-Type", "application/x-www-form-urlencoded").end(function (err, res) {
-          if (err) return reject(err);
+          if (err) {
+            _this5._rethrowIfExpiredToken(err);
+
+            return reject(err);
+          }
+
           return resolve(res);
         });
       });
@@ -142,7 +167,12 @@ var HttpAdapter = /*#__PURE__*/function () {
 
         req = _this6.setupHeaders(req, headers);
         req.send(body).set("Content-Type", "application/json").end(function (err, res) {
-          if (err) return reject(err);
+          if (err) {
+            _this6._rethrowIfExpiredToken(err);
+
+            return reject(err);
+          }
+
           return resolve(res);
         });
       });
@@ -151,14 +181,29 @@ var HttpAdapter = /*#__PURE__*/function () {
     key: "setupHeaders",
     value: function setupHeaders(req, headers) {
       // let's give this default Authorization Header
-      req.set("QISCUS-SDK-APP-ID", "".concat(this.AppId));
-      req.set("QISCUS-SDK-USER-ID", "".concat(this.userId));
-      req.set("QISCUS-SDK-TOKEN", "".concat(this.token));
-      req.set("QISCUS-SDK-VERSION", "".concat(this.version));
+      if (this.AppId != null) {
+        req.set("QISCUS-SDK-APP-ID", "".concat(this.AppId));
+      }
+
+      if (this.userId != null) {
+        req.set("QISCUS-SDK-USER-ID", "".concat(this.userId));
+      }
+
+      console.log('this.token:', this.token);
+
+      if (this.token != null) {
+        req.set("QISCUS-SDK-TOKEN", "".concat(this.token));
+      }
+
+      if (this.version != null) {
+        req.set("QISCUS-SDK-VERSION", "".concat(this.version));
+      }
 
       if (this.getCustomHeader != null) {
         var customHeaders = this.getCustomHeader();
-        Object.keys(customHeaders).forEach(function (key) {
+        Object.keys(customHeaders).filter(function (key) {
+          return customHeaders[key] != null;
+        }).forEach(function (key) {
           req.set(key, customHeaders[key]);
         });
       } // Return the req if no headers attached
@@ -172,6 +217,18 @@ var HttpAdapter = /*#__PURE__*/function () {
 
       return req;
     }
+  }, {
+    key: "_rethrowIfExpiredToken",
+    value: function _rethrowIfExpiredToken(err) {
+      var _err$response, _err$response2, _body$error, _body$error$message;
+
+      var status = (_err$response = err.response) === null || _err$response === void 0 ? void 0 : _err$response.status;
+      var body = (_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.body;
+
+      if (status === 403 && ((_body$error = body.error) === null || _body$error === void 0 ? void 0 : (_body$error$message = _body$error.message) === null || _body$error$message === void 0 ? void 0 : _body$error$message.toLowerCase()) === 'unauthorized. token is expired') {
+        throw new Error('Token expired');
+      }
+    }
   }]);
   return HttpAdapter;
 }();

package/lib/lib/adapters/mqtt.js

@@ -587,7 +587,8 @@ var MqttAdapter = /*#__PURE__*/function () {
   }, {
     key: "disconnect",
     value: function disconnect() {
-      this.publishPresence(this.core.userData.email, false), this.unsubscribe(Object.keys(this.mqtt._resubscribeTopics));
+      this.publishPresence(this.core.userData.email, false);
+      this.unsubscribe(Object.keys(this.mqtt._resubscribeTopics));
     }
   }, {
     key: "subscribeUserPresence",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qiscus-sdk-core",
-  "version": "2.11.1",
+  "version": "2.12.0",
   "description": "Qiscus Web SDK Core",
   "license": "MIT",
   "main": "lib/index.js",
@@ -11,7 +11,7 @@
   ],
   "scripts": {
     "build": "npm-run-all --parallel build:node build:web",
-    "build:dev": "npm-run-all --parallel build:node build:web:dev build:dev:watch",
+    "build:dev": "npm-run-all --parallel build:node build:web:dev",
     "build:dev:watch": "npm-run-all --parallel build:web:watch serve",
     "build:node": "babel -d lib src",
     "build:node:watch": "babel -w -d lib src",
@@ -28,26 +28,25 @@
     "serve": "http-server -p 1234 -c-1 dist"
   },
   "devDependencies": {
-    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.8.6",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.8.3",
-    "@babel/polyfill": "^7.8.3",
-    "@babel/preset-env": "^7.8.6",
-    "@babel/register": "^7.8.6",
+    "@babel/cli": "^7.10.5",
+    "@babel/core": "^7.11.4",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-transform-runtime": "^7.11.0",
+    "@babel/polyfill": "^7.10.4",
+    "@babel/preset-env": "^7.11.0",
+    "@babel/register": "^7.10.5",
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^8.3.4",
-    "babel-eslint": "^8.0.0",
+    "babel-eslint": "^8.2.6",
     "babel-loader": "^8.0.6",
-    "babel-minify-webpack-plugin": "^0.2.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-plugin-date-fns": "^0.1.0",
-    "chai": "^4.1.2",
+    "chai": "^4.2.0",
     "chai-spies": "^1.0.0",
-    "eslint": "^4.19.1",
+    "eslint": "5.0.0",
     "eslint-config-standard": "^12.0.0",
-    "eslint-loader": "^1.9.0",
-    "eslint-plugin-import": "^2.20.1",
+    "eslint-loader": "^2.2.1",
+    "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-node": "^8.0.1",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
@@ -56,11 +55,11 @@
     "npm-run-all": "^4.1.5",
     "rimraf": "^2.7.1",
     "serve": "^12.0.0",
-    "webpack": "^4.41.6",
-    "webpack-cli": "^3.3.11"
+    "webpack": "^4.44.1",
+    "webpack-cli": "^3.3.12"
   },
   "dependencies": {
-    "@babel/runtime": "^7.8.4",
+    "@babel/runtime": "^7.11.2",
     "date-fns": "^1.30.1",
     "is_js": "^0.9.0",
     "lodash.debounce": "^4.0.8",
@@ -68,7 +67,7 @@
     "mitt": "^1.2.0",
     "mqtt": "^4.2.6",
     "store": "^2.0.12",
-    "superagent": "^3.6.3"
+    "superagent": "^3.8.3"
   },
   "babel": {
     "presets": [