botframework-webchat-core - npm Package Compare versions

Comparing version 4.0.0-preview.0b132c8 to 4.0.0-preview.17b9195

lib/actions/connect.js

@@ -23,4 +23,3 @@ "use strict";
   var directLine = _ref.directLine,
-      userID = _ref.userID,
-      username = _ref.username;
+      userID = _ref.userID;
   return {
@@ -30,7 +29,6 @@ type: CONNECT,
       directLine: directLine,
-      userID: userID,
-      username: username
+      userID: userID
     }
   };
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2Nvbm5lY3QuanMiXSwibmFtZXMiOlsiQ09OTkVDVCIsIkNPTk5FQ1RfUEVORElORyIsIkNPTk5FQ1RfUkVKRUNURUQiLCJDT05ORUNUX0ZVTEZJTExFRCIsImRpcmVjdExpbmUiLCJ1c2VySUQiLCJ1c2VybmFtZSIsInR5cGUiLCJwYXlsb2FkIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQSxJQUFNQSxVQUFVLHFCQUFoQjs7QUFDQSxJQUFNQyw0QkFBc0JELE9BQXRCLGFBQU47O0FBQ0EsSUFBTUUsNkJBQXVCRixPQUF2QixjQUFOOztBQUNBLElBQU1HLDhCQUF3QkgsT0FBeEIsZUFBTjs7O0FBRWUsd0JBQTRDO0FBQUEsTUFBaENJLFVBQWdDLFFBQWhDQSxVQUFnQztBQUFBLE1BQXBCQyxNQUFvQixRQUFwQkEsTUFBb0I7QUFBQSxNQUFaQyxRQUFZLFFBQVpBLFFBQVk7QUFDekQsU0FBTztBQUNMQyxVQUFNUCxPQUREO0FBRUxRLGFBQVM7QUFBRUosNEJBQUY7QUFBY0Msb0JBQWQ7QUFBc0JDO0FBQXRCO0FBRkosR0FBUDtBQUlEIiwic291cmNlc0NvbnRlbnQiOlsiLy8gVE9ETzogW1A0XSBNYXJrIGFjdGlvbnMgd2l0aCBjb3JyZWN0IGZhbWlseVxuLy8gICAgICAgRS5nLiBQT1NUX0FDVElWSVRZIGJlbG9uZ3MgdG8gRElSRUNUX0xJTkVcbi8vICAgICAgIEUuZy4gU0VORF9NRVNTQUdFIGJlbG9uZ3MgdG8gV0VCX0NIQVRcbi8vICAgICAgIFdlIGFyZSB0cnlpbmcgdG8gY3VyYiBkb3duIHRoZSBudW1iZXIgb2YgRElSRUNUX0xJTkUvKiB0byBtYWtlIGJhY2tlbmQgZWFzaWVyIHRvIHJlYnVpbGRcbmNvbnN0IENPTk5FQ1QgPSAnRElSRUNUX0xJTkUvQ09OTkVDVCc7XG5jb25zdCBDT05ORUNUX1BFTkRJTkcgPSBgJHsgQ09OTkVDVCB9X1BFTkRJTkdgO1xuY29uc3QgQ09OTkVDVF9SRUpFQ1RFRCA9IGAkeyBDT05ORUNUIH1fUkVKRUNURURgO1xuY29uc3QgQ09OTkVDVF9GVUxGSUxMRUQgPSBgJHsgQ09OTkVDVCB9X0ZVTEZJTExFRGA7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uICh7IGRpcmVjdExpbmUsIHVzZXJJRCwgdXNlcm5hbWUgfSkge1xuICByZXR1cm4ge1xuICAgIHR5cGU6IENPTk5FQ1QsXG4gICAgcGF5bG9hZDogeyBkaXJlY3RMaW5lLCB1c2VySUQsIHVzZXJuYW1lIH1cbiAgfTtcbn1cblxuZXhwb3J0IHtcbiAgQ09OTkVDVCxcbiAgQ09OTkVDVF9QRU5ESU5HLFxuICBDT05ORUNUX1JFSkVDVEVELFxuICBDT05ORUNUX0ZVTEZJTExFRFxufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2Nvbm5lY3QuanMiXSwibmFtZXMiOlsiQ09OTkVDVCIsIkNPTk5FQ1RfUEVORElORyIsIkNPTk5FQ1RfUkVKRUNURUQiLCJDT05ORUNUX0ZVTEZJTExFRCIsImRpcmVjdExpbmUiLCJ1c2VySUQiLCJ0eXBlIiwicGF5bG9hZCJdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsSUFBTUEsVUFBVSxxQkFBaEI7O0FBQ0EsSUFBTUMsNEJBQXNCRCxPQUF0QixhQUFOOztBQUNBLElBQU1FLDZCQUF1QkYsT0FBdkIsY0FBTjs7QUFDQSxJQUFNRyw4QkFBd0JILE9BQXhCLGVBQU47OztBQUVlLHdCQUFrQztBQUFBLE1BQXRCSSxVQUFzQixRQUF0QkEsVUFBc0I7QUFBQSxNQUFWQyxNQUFVLFFBQVZBLE1BQVU7QUFDL0MsU0FBTztBQUNMQyxVQUFNTixPQUREO0FBRUxPLGFBQVM7QUFBRUgsNEJBQUY7QUFBY0M7QUFBZDtBQUZKLEdBQVA7QUFJRCIsInNvdXJjZXNDb250ZW50IjpbIi8vIFRPRE86IFtQNF0gTWFyayBhY3Rpb25zIHdpdGggY29ycmVjdCBmYW1pbHlcbi8vICAgICAgIEUuZy4gUE9TVF9BQ1RJVklUWSBiZWxvbmdzIHRvIERJUkVDVF9MSU5FXG4vLyAgICAgICBFLmcuIFNFTkRfTUVTU0FHRSBiZWxvbmdzIHRvIFdFQl9DSEFUXG4vLyAgICAgICBXZSBhcmUgdHJ5aW5nIHRvIGN1cmIgZG93biB0aGUgbnVtYmVyIG9mIERJUkVDVF9MSU5FLyogdG8gbWFrZSBiYWNrZW5kIGVhc2llciB0byByZWJ1aWxkXG5jb25zdCBDT05ORUNUID0gJ0RJUkVDVF9MSU5FL0NPTk5FQ1QnO1xuY29uc3QgQ09OTkVDVF9QRU5ESU5HID0gYCR7IENPTk5FQ1QgfV9QRU5ESU5HYDtcbmNvbnN0IENPTk5FQ1RfUkVKRUNURUQgPSBgJHsgQ09OTkVDVCB9X1JFSkVDVEVEYDtcbmNvbnN0IENPTk5FQ1RfRlVMRklMTEVEID0gYCR7IENPTk5FQ1QgfV9GVUxGSUxMRURgO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiAoeyBkaXJlY3RMaW5lLCB1c2VySUQgfSkge1xuICByZXR1cm4ge1xuICAgIHR5cGU6IENPTk5FQ1QsXG4gICAgcGF5bG9hZDogeyBkaXJlY3RMaW5lLCB1c2VySUQgfVxuICB9O1xufVxuXG5leHBvcnQge1xuICBDT05ORUNULFxuICBDT05ORUNUX1BFTkRJTkcsXG4gIENPTk5FQ1RfUkVKRUNURUQsXG4gIENPTk5FQ1RfRlVMRklMTEVEXG59XG4iXX0=

lib/sagas/connectSaga.js

@@ -14,2 +14,4 @@ "use strict";
 
+var _jsonwebtoken = require("jsonwebtoken");
+
 var _callUntil = _interopRequireDefault(require("./effects/callUntil"));
@@ -41,5 +43,6 @@
 var ENDED = 5;
+var DEFAULT_USER_ID = 'default-user';
 
 function _callee() {
-  var _ref, _ref$payload, directLine, userID, username, connectTask;
+  var _ref, _ref$payload, directLine, userID, token, _ref2, userIDFromToken, connectTask;
 
@@ -58,20 +61,33 @@ return _regenerator.default.wrap(function _callee$(_context) {
           userID = _ref$payload.userID;
-          username = _ref$payload.username;
-          _context.next = 9;
-          return (0, _effects.fork)(connectSaga, directLine, userID, username);
+          token = directLine.token;
+          _ref2 = (0, _jsonwebtoken.decode)(token) || {}, userIDFromToken = _ref2.user;
 
-        case 9:
+          if (userIDFromToken) {
+            if (userID && userID !== userIDFromToken) {
+              console.warn('Web Chat: user ID is both specified in the Direct Line token and passed in, will use the user ID from the token.');
+            }
+
+            userID = userIDFromToken;
+          } else if (!userID) {
+            // Only specify "default-user" if not found from token and not passed in
+            userID = DEFAULT_USER_ID;
+          }
+
+          _context.next = 11;
+          return (0, _effects.fork)(connectSaga, directLine, userID);
+
+        case 11:
           connectTask = _context.sent;
-          _context.next = 12;
+          _context.next = 14;
           return (0, _effects.take)(_disconnect.DISCONNECT);
 
-        case 12:
-          _context.next = 14;
+        case 14:
+          _context.next = 16;
           return (0, _effects.call)(disconnectSaga, connectTask, directLine);
 
-        case 14:
+        case 16:
           _context.next = 0;
           break;
 
-        case 16:
+        case 18:
         case "end":
@@ -84,3 +100,3 @@ return _context.stop();
 
-function connectSaga(directLine, userID, username) {
+function connectSaga(directLine, userID) {
   var meta, connectionStatusQueue, connectionStatusSubscription, activitySubscription;
@@ -92,4 +108,3 @@ return _regenerator.default.wrap(function connectSaga$(_context2) {
           meta = {
-            userID: userID,
-            username: username
+            userID: userID
           };
@@ -266,2 +281,2 @@ _context2.next = 3;
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/sagas/connectSaga.js"],"names":["connectSaga","disconnectSaga","ONLINE","ENDED","CONNECT","payload","directLine","userID","username","connectTask","DISCONNECT","meta","type","CONNECT_PENDING","connectionStatusQueue","connectionStatusSubscription","connectionStatus$","subscribe","next","push","activitySubscription","activity$","shift","connectionStatus","CONNECT_FULFILLED","CONNECT_REJECTED","error","Error","end","unsubscribe","DISCONNECT_PENDING","DISCONNECT_FULFILLED","DISCONNECT_REJECTED"],"mappings":"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","sourcesContent":["import {\n  call,\n  cancel,\n  cancelled,\n  fork,\n  put,\n  take,\n} from 'redux-saga/effects';\n\nimport callUntil from './effects/callUntil';\nimport forever from './effects/forever';\n\nimport createPromiseQueue from '../createPromiseQueue';\n\nimport {\n  CONNECT,\n  CONNECT_PENDING,\n  CONNECT_REJECTED,\n  CONNECT_FULFILLED\n} from '../actions/connect';\n\nimport {\n  DISCONNECT,\n  DISCONNECT_PENDING,\n  DISCONNECT_REJECTED,\n  DISCONNECT_FULFILLED\n} from '../actions/disconnect';\n\n// const UNINITIALIZED = 0;\n// const CONNECTING = 1;\nconst ONLINE = 2;\n// const EXPIRED_TOKEN = 3;\n// const FAILED_TO_CONNECT = 4;\nconst ENDED = 5;\n\nexport default function* () {\n  for (;;) {\n    const { payload: { directLine, userID, username } } = yield take(CONNECT);\n    const connectTask = yield fork(connectSaga, directLine, userID, username);\n\n    yield take(DISCONNECT);\n    yield call(disconnectSaga, connectTask, directLine);\n  }\n}\n\nfunction* connectSaga(directLine, userID, username) {\n  const meta = { userID, username };\n\n  yield put({ type: CONNECT_PENDING, meta });\n\n  const connectionStatusQueue = createPromiseQueue();\n  const connectionStatusSubscription = directLine.connectionStatus$.subscribe({ next: connectionStatusQueue.push });\n\n  // DirectLineJS start the connection only after the first subscriber for activity$, but not connectionStatus$\n  const activitySubscription = directLine.activity$.subscribe({ next: () => 0 });\n\n  try {\n    try {\n      yield callUntil(connectionStatusQueue.shift, [], connectionStatus => connectionStatus === ONLINE);\n      yield put({ type: CONNECT_FULFILLED, meta, payload: { directLine } });\n    } catch (err) {\n      yield put({ type: CONNECT_REJECTED, error: true, meta, payload: err });\n    } finally {\n      if (yield cancelled()) {\n        yield put({ type: CONNECT_REJECTED, error: true, meta, payload: new Error('cancelled') });\n      }\n    }\n\n    yield forever();\n  } finally {\n    // TODO: [P2] DirectLineJS should kill the connection when we unsubscribe\n    //       But currently in v3, DirectLineJS does not have this functionality\n    //       Thus, we need to call \"end()\" explicitly\n    directLine.end();\n    activitySubscription.unsubscribe();\n    connectionStatusSubscription.unsubscribe();\n  }\n}\n\nfunction* disconnectSaga(connectTask, directLine) {\n  yield put({ type: DISCONNECT_PENDING });\n\n  const connectionStatusQueue = createPromiseQueue();\n  const unsubscribe = directLine.connectionStatus$.subscribe({ next: connectionStatusQueue.push });\n\n  // DirectLineJS should cancel underlying REST/WS when we cancel\n  // the connect task, which subsequently unsubscribe connectionStatus$\n  yield cancel(connectTask);\n\n  try {\n    yield callUntil(connectionStatusQueue.shift, [], connectionStatus => connectionStatus === ENDED);\n    yield put({ type: DISCONNECT_FULFILLED });\n  } catch (err) {\n    yield put({ type: DISCONNECT_REJECTED, error: true, payload: err });\n  } finally {\n    if (yield cancelled()) {\n      yield put({ type: DISCONNECT_REJECTED, error: true, payload: new Error('cancelled') });\n    }\n\n    unsubscribe();\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/sagas/connectSaga.js"],"names":["connectSaga","disconnectSaga","ONLINE","ENDED","DEFAULT_USER_ID","CONNECT","payload","directLine","userID","token","userIDFromToken","user","console","warn","connectTask","DISCONNECT","meta","type","CONNECT_PENDING","connectionStatusQueue","connectionStatusSubscription","connectionStatus$","subscribe","next","push","activitySubscription","activity$","shift","connectionStatus","CONNECT_FULFILLED","CONNECT_REJECTED","error","Error","end","unsubscribe","DISCONNECT_PENDING","DISCONNECT_FULFILLED","DISCONNECT_REJECTED"],"mappings":"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","sourcesContent":["import {\n  call,\n  cancel,\n  cancelled,\n  fork,\n  put,\n  take,\n} from 'redux-saga/effects';\n\nimport { decode } from 'jsonwebtoken';\n\nimport callUntil from './effects/callUntil';\nimport forever from './effects/forever';\n\nimport createPromiseQueue from '../createPromiseQueue';\n\nimport {\n  CONNECT,\n  CONNECT_PENDING,\n  CONNECT_REJECTED,\n  CONNECT_FULFILLED\n} from '../actions/connect';\n\nimport {\n  DISCONNECT,\n  DISCONNECT_PENDING,\n  DISCONNECT_REJECTED,\n  DISCONNECT_FULFILLED\n} from '../actions/disconnect';\n\n// const UNINITIALIZED = 0;\n// const CONNECTING = 1;\nconst ONLINE = 2;\n// const EXPIRED_TOKEN = 3;\n// const FAILED_TO_CONNECT = 4;\nconst ENDED = 5;\n\nconst DEFAULT_USER_ID = 'default-user';\n\nexport default function* () {\n  for (;;) {\n    const { payload: { directLine, userID } } = yield take(CONNECT);\n    const { token } = directLine;\n    const { user: userIDFromToken } = decode(token) || {};\n\n    if (userIDFromToken) {\n      if (userID && userID !== userIDFromToken) {\n        console.warn('Web Chat: user ID is both specified in the Direct Line token and passed in, will use the user ID from the token.');\n      }\n\n      userID = userIDFromToken;\n    } else if (!userID) {\n      // Only specify \"default-user\" if not found from token and not passed in\n      userID = DEFAULT_USER_ID;\n    }\n\n    const connectTask = yield fork(connectSaga, directLine, userID);\n\n    yield take(DISCONNECT);\n    yield call(disconnectSaga, connectTask, directLine);\n  }\n}\n\nfunction* connectSaga(directLine, userID) {\n  const meta = { userID };\n\n  yield put({ type: CONNECT_PENDING, meta });\n\n  const connectionStatusQueue = createPromiseQueue();\n  const connectionStatusSubscription = directLine.connectionStatus$.subscribe({ next: connectionStatusQueue.push });\n\n  // DirectLineJS start the connection only after the first subscriber for activity$, but not connectionStatus$\n  const activitySubscription = directLine.activity$.subscribe({ next: () => 0 });\n\n  try {\n    try {\n      yield callUntil(connectionStatusQueue.shift, [], connectionStatus => connectionStatus === ONLINE);\n      yield put({ type: CONNECT_FULFILLED, meta, payload: { directLine } });\n    } catch (err) {\n      yield put({ type: CONNECT_REJECTED, error: true, meta, payload: err });\n    } finally {\n      if (yield cancelled()) {\n        yield put({ type: CONNECT_REJECTED, error: true, meta, payload: new Error('cancelled') });\n      }\n    }\n\n    yield forever();\n  } finally {\n    // TODO: [P2] DirectLineJS should kill the connection when we unsubscribe\n    //       But currently in v3, DirectLineJS does not have this functionality\n    //       Thus, we need to call \"end()\" explicitly\n    directLine.end();\n    activitySubscription.unsubscribe();\n    connectionStatusSubscription.unsubscribe();\n  }\n}\n\nfunction* disconnectSaga(connectTask, directLine) {\n  yield put({ type: DISCONNECT_PENDING });\n\n  const connectionStatusQueue = createPromiseQueue();\n  const unsubscribe = directLine.connectionStatus$.subscribe({ next: connectionStatusQueue.push });\n\n  // DirectLineJS should cancel underlying REST/WS when we cancel\n  // the connect task, which subsequently unsubscribe connectionStatus$\n  yield cancel(connectTask);\n\n  try {\n    yield callUntil(connectionStatusQueue.shift, [], connectionStatus => connectionStatus === ENDED);\n    yield put({ type: DISCONNECT_FULFILLED });\n  } catch (err) {\n    yield put({ type: DISCONNECT_REJECTED, error: true, payload: err });\n  } finally {\n    if (yield cancelled()) {\n      yield put({ type: DISCONNECT_REJECTED, error: true, payload: new Error('cancelled') });\n    }\n\n    unsubscribe();\n  }\n}\n"]}

lib/sagas/effects/whileConnected.js

@@ -22,3 +22,3 @@ "use strict";
   _regenerator.default.mark(function _callee() {
-    var _ref, _ref$meta, userID, username, directLine, task;
+    var _ref, userID, directLine, task;
 
@@ -34,23 +34,21 @@ return _regenerator.default.wrap(function _callee$(_context) {
             _ref = _context.sent;
-            _ref$meta = _ref.meta;
-            userID = _ref$meta.userID;
-            username = _ref$meta.username;
+            userID = _ref.meta.userID;
             directLine = _ref.payload.directLine;
-            _context.next = 9;
-            return (0, _effects.fork)(fn, directLine, userID, username);
+            _context.next = 7;
+            return (0, _effects.fork)(fn, directLine, userID);
 
-          case 9:
+          case 7:
             task = _context.sent;
-            _context.next = 12;
+            _context.next = 10;
             return (0, _effects.take)(_disconnect.DISCONNECT_FULFILLED);
 
-          case 12:
-            _context.next = 14;
+          case 10:
+            _context.next = 12;
             return (0, _effects.cancel)(task);
 
-          case 14:
+          case 12:
             _context.next = 0;
             break;
 
-          case 16:
+          case 14:
           case "end":
@@ -63,2 +61,2 @@ return _context.stop();
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zYWdhcy9lZmZlY3RzL3doaWxlQ29ubmVjdGVkLmpzIl0sIm5hbWVzIjpbImZuIiwiQ09OTkVDVF9GVUxGSUxMRUQiLCJtZXRhIiwidXNlcklEIiwidXNlcm5hbWUiLCJkaXJlY3RMaW5lIiwicGF5bG9hZCIsInRhc2siLCJESVNDT05ORUNUX0ZVTEZJTExFRCJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQTs7QUFPQTs7QUFDQTs7QUFFZSxrQkFBVUEsRUFBVixFQUFjO0FBQzNCLFNBQU87QUFBQTtBQUFBLDRCQUFLO0FBQUE7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUV3RCxtQkFBTSxtQkFBS0MsMEJBQUwsQ0FBTjs7QUFGeEQ7QUFBQTtBQUFBLDZCQUVBQyxJQUZBO0FBRVFDLGtCQUZSLGFBRVFBLE1BRlI7QUFFZ0JDLG9CQUZoQixhQUVnQkEsUUFGaEI7QUFFdUNDLHNCQUZ2QyxRQUU0QkMsT0FGNUIsQ0FFdUNELFVBRnZDO0FBQUE7QUFHSyxtQkFBTSxtQkFBS0wsRUFBTCxFQUFTSyxVQUFULEVBQXFCRixNQUFyQixFQUE2QkMsUUFBN0IsQ0FBTjs7QUFITDtBQUdGRyxnQkFIRTtBQUFBO0FBS1IsbUJBQU0sbUJBQUtDLGdDQUFMLENBQU47O0FBTFE7QUFBQTtBQU1SLG1CQUFNLHFCQUFPRCxJQUFQLENBQU47O0FBTlE7QUFBQTtBQUFBOztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLEdBQUwsRUFBUDtBQVNEIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgY2FsbCxcbiAgY2FuY2VsLFxuICBmb3JrLFxuICB0YWtlXG59IGZyb20gJ3JlZHV4LXNhZ2EvZWZmZWN0cyc7XG5cbmltcG9ydCB7IENPTk5FQ1RfRlVMRklMTEVEIH0gZnJvbSAnLi4vLi4vYWN0aW9ucy9jb25uZWN0JztcbmltcG9ydCB7IERJU0NPTk5FQ1RfRlVMRklMTEVEIH0gZnJvbSAnLi4vLi4vYWN0aW9ucy9kaXNjb25uZWN0JztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gKGZuKSB7XG4gIHJldHVybiBjYWxsKGZ1bmN0aW9uKiAoKSB7XG4gICAgZm9yICg7Oykge1xuICAgICAgY29uc3QgeyBtZXRhOiB7IHVzZXJJRCwgdXNlcm5hbWUgfSwgcGF5bG9hZDogeyBkaXJlY3RMaW5lIH0gfSA9IHlpZWxkIHRha2UoQ09OTkVDVF9GVUxGSUxMRUQpO1xuICAgICAgY29uc3QgdGFzayA9IHlpZWxkIGZvcmsoZm4sIGRpcmVjdExpbmUsIHVzZXJJRCwgdXNlcm5hbWUpO1xuXG4gICAgICB5aWVsZCB0YWtlKERJU0NPTk5FQ1RfRlVMRklMTEVEKTtcbiAgICAgIHlpZWxkIGNhbmNlbCh0YXNrKTtcbiAgICB9XG4gIH0pO1xufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zYWdhcy9lZmZlY3RzL3doaWxlQ29ubmVjdGVkLmpzIl0sIm5hbWVzIjpbImZuIiwiQ09OTkVDVF9GVUxGSUxMRUQiLCJ1c2VySUQiLCJtZXRhIiwiZGlyZWN0TGluZSIsInBheWxvYWQiLCJ0YXNrIiwiRElTQ09OTkVDVF9GVUxGSUxMRUQiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBT0E7O0FBQ0E7O0FBRWUsa0JBQVVBLEVBQVYsRUFBYztBQUMzQixTQUFPO0FBQUE7QUFBQSw0QkFBSztBQUFBOztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFOEMsbUJBQU0sbUJBQUtDLDBCQUFMLENBQU47O0FBRjlDO0FBQUE7QUFFUUMsa0JBRlIsUUFFQUMsSUFGQSxDQUVRRCxNQUZSO0FBRTZCRSxzQkFGN0IsUUFFa0JDLE9BRmxCLENBRTZCRCxVQUY3QjtBQUFBO0FBR0ssbUJBQU0sbUJBQUtKLEVBQUwsRUFBU0ksVUFBVCxFQUFxQkYsTUFBckIsQ0FBTjs7QUFITDtBQUdGSSxnQkFIRTtBQUFBO0FBS1IsbUJBQU0sbUJBQUtDLGdDQUFMLENBQU47O0FBTFE7QUFBQTtBQU1SLG1CQUFNLHFCQUFPRCxJQUFQLENBQU47O0FBTlE7QUFBQTtBQUFBOztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLEdBQUwsRUFBUDtBQVNEIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgY2FsbCxcbiAgY2FuY2VsLFxuICBmb3JrLFxuICB0YWtlXG59IGZyb20gJ3JlZHV4LXNhZ2EvZWZmZWN0cyc7XG5cbmltcG9ydCB7IENPTk5FQ1RfRlVMRklMTEVEIH0gZnJvbSAnLi4vLi4vYWN0aW9ucy9jb25uZWN0JztcbmltcG9ydCB7IERJU0NPTk5FQ1RfRlVMRklMTEVEIH0gZnJvbSAnLi4vLi4vYWN0aW9ucy9kaXNjb25uZWN0JztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gKGZuKSB7XG4gIHJldHVybiBjYWxsKGZ1bmN0aW9uKiAoKSB7XG4gICAgZm9yICg7Oykge1xuICAgICAgY29uc3QgeyBtZXRhOiB7IHVzZXJJRCB9LCBwYXlsb2FkOiB7IGRpcmVjdExpbmUgfSB9ID0geWllbGQgdGFrZShDT05ORUNUX0ZVTEZJTExFRCk7XG4gICAgICBjb25zdCB0YXNrID0geWllbGQgZm9yayhmbiwgZGlyZWN0TGluZSwgdXNlcklEKTtcblxuICAgICAgeWllbGQgdGFrZShESVNDT05ORUNUX0ZVTEZJTExFRCk7XG4gICAgICB5aWVsZCBjYW5jZWwodGFzayk7XG4gICAgfVxuICB9KTtcbn1cbiJdfQ==

package.json

 {
   "name": "botframework-webchat-core",
-  "version": "4.0.0-preview.0b132c8",
+  "version": "4.0.0-preview.17b9195",
   "description": "Core of botframework-webchat",
@@ -60,2 +60,3 @@ "main": "lib/index.js",
     "event-as-promise": "^1.0.3",
+    "jsonwebtoken": "^8.3.0",
     "redux": "^4.0.0",
@@ -62,0 +63,0 @@ "redux-promise-middleware": "^5.1.1",

src/actions/connect.js

@@ -10,6 +10,6 @@ // TODO: [P4] Mark actions with correct family
 
-export default function ({ directLine, userID, username }) {
+export default function ({ directLine, userID }) {
   return {
     type: CONNECT,
-    payload: { directLine, userID, username }
+    payload: { directLine, userID }
   };
@@ -16,0 +16,0 @@ }

src/sagas/connectSaga.js

@@ -10,2 +10,4 @@ import {
 
+import { decode } from 'jsonwebtoken';
+
 import callUntil from './effects/callUntil';
@@ -37,7 +39,23 @@ import forever from './effects/forever';
 
+const DEFAULT_USER_ID = 'default-user';
+
 export default function* () {
   for (;;) {
-    const { payload: { directLine, userID, username } } = yield take(CONNECT);
-    const connectTask = yield fork(connectSaga, directLine, userID, username);
+    const { payload: { directLine, userID } } = yield take(CONNECT);
+    const { token } = directLine;
+    const { user: userIDFromToken } = decode(token) || {};
 
+    if (userIDFromToken) {
+      if (userID && userID !== userIDFromToken) {
+        console.warn('Web Chat: user ID is both specified in the Direct Line token and passed in, will use the user ID from the token.');
+      }
+
+      userID = userIDFromToken;
+    } else if (!userID) {
+      // Only specify "default-user" if not found from token and not passed in
+      userID = DEFAULT_USER_ID;
+    }
+
+    const connectTask = yield fork(connectSaga, directLine, userID);
+
     yield take(DISCONNECT);
@@ -48,4 +66,4 @@ yield call(disconnectSaga, connectTask, directLine);
 
-function* connectSaga(directLine, userID, username) {
-  const meta = { userID, username };
+function* connectSaga(directLine, userID) {
+  const meta = { userID };
 
@@ -52,0 +70,0 @@ yield put({ type: CONNECT_PENDING, meta });

src/sagas/effects/whileConnected.js

@@ -14,4 +14,4 @@ import {
     for (;;) {
-      const { meta: { userID, username }, payload: { directLine } } = yield take(CONNECT_FULFILLED);
-      const task = yield fork(fn, directLine, userID, username);
+      const { meta: { userID }, payload: { directLine } } = yield take(CONNECT_FULFILLED);
+      const task = yield fork(fn, directLine, userID);
 
@@ -18,0 +18,0 @@ yield take(DISCONNECT_FULFILLED);

tests/connectionStatus.test.js

@@ -14,4 +14,3 @@ import createFacility from './createFacility';
       directLine,
-      userID: 'default-user',
-      username: 'WC'
+      userID: 'default-user'
     }
@@ -18,0 +17,0 @@ });

tests/createFacility.js

@@ -7,3 +7,2 @@ import mockDirectLine from './mockDirectLine';
 const DEFAULT_USER_ID = 'default-user';
-const DEFAULT_USERNAME = 'John Doe';
 
@@ -52,4 +51,3 @@ jest.mock('../src/util/getTimestamp', () => {
         directLine,
-        userID: DEFAULT_USER_ID,
-        username: DEFAULT_USERNAME
+        userID: DEFAULT_USER_ID
       }
@@ -56,0 +54,0 @@ });

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

272557

increased by0.66%

Lines of code

4187

increased by0.41%

Worsened metrics

Dependency count

7

increased by16.67%

Dependency changes

• + Addedjsonwebtoken@^8.3.0

• + Addedbuffer-equal-constant-time@1.0.1(transitive)

• + Addedecdsa-sig-formatter@1.0.11(transitive)

• + Addedjsonwebtoken@8.5.1(transitive)

• + Addedjwa@1.4.1(transitive)

• + Addedjws@3.2.2(transitive)

• + Addedlodash.includes@4.3.0(transitive)

• + Addedlodash.isboolean@3.0.3(transitive)

• + Addedlodash.isinteger@4.0.4(transitive)

• + Addedlodash.isnumber@3.0.3(transitive)

• + Addedlodash.isplainobject@4.0.6(transitive)

• + Addedlodash.isstring@4.0.1(transitive)

• + Addedlodash.once@4.1.1(transitive)

• + Addedms@2.1.3(transitive)

• + Addedsafe-buffer@5.2.1(transitive)

• + Addedsemver@5.7.2(transitive)