@kineticdata/react 6.1.0 → 6.1.1

package/lib/components/common/authentication/AuthenticationContainer.js

@@ -17,6 +17,7 @@ var _lodashEs = require("lodash-es");
 var _moment = _interopRequireDefault(require("moment"));
 var _store = require("../../../store");
 var _apis = require("../../../apis");
+var _PreferencesProvider = require("../preferences/PreferencesProvider");
 var defaultLoginProps = {
   error: null,
   password: '',
@@ -42,6 +43,7 @@ var defaultLoginProps = {
   SET_AUTHENTICATED: function SET_AUTHENTICATED(state, action) {
     return state.mergeIn(['session'], {
       loggedIn: true,
+      timedOut: false,
       token: action.payload.token
     }).set('login', defaultLoginProps);
   },
@@ -50,6 +52,7 @@ var defaultLoginProps = {
       csrfToken: action.payload.csrfToken,
       initialized: true,
       loggedIn: !!action.payload.token,
+      timedOut: false,
       securityStrategies: action.payload.securityStrategies,
       spaceSlug: action.payload.spaceSlug,
       token: action.payload.token,
@@ -80,6 +83,9 @@ var defaultLoginProps = {
   },
   TIMEOUT: function TIMEOUT(state) {
     return state.setIn(['session', 'token'], null);
+  },
+  TIMEOUT_SESSION: function TIMEOUT_SESSION(state) {
+    return state.setIn(['session', 'timedOut'], true);
   }
 });
 (0, _store.regSaga)('WATCH_SYSTEM_AUTHENTICATION', /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
@@ -313,19 +319,75 @@ var defaultLoginProps = {
     }, _callee3, null, [[0, 17]]);
   })();
 }));
+(0, _store.regSaga)((0, _effects.takeEvery)('TIMEOUT', /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee4() {
+  var system, token;
+  return (0, _regeneratorRuntime2["default"])().wrap(function _callee4$(_context4) {
+    while (1) switch (_context4.prev = _context4.next) {
+      case 0:
+        _context4.next = 2;
+        return (0, _effects.select)(function (state) {
+          return state.getIn(['session', 'system']);
+        });
+      case 2:
+        system = _context4.sent;
+        if (!system) {
+          _context4.next = 8;
+          break;
+        }
+        _context4.next = 6;
+        return (0, _effects.put)((0, _store.action)('TIMEOUT_SESSION'));
+      case 6:
+        _context4.next = 26;
+        break;
+      case 8:
+        _context4.prev = 8;
+        _context4.next = 11;
+        return (0, _effects.call)(_apis.retrieveJwt);
+      case 11:
+        token = _context4.sent;
+        if (!token) {
+          _context4.next = 17;
+          break;
+        }
+        _context4.next = 15;
+        return (0, _effects.put)((0, _store.action)('SET_AUTHENTICATED', {
+          token: token
+        }));
+      case 15:
+        _context4.next = 19;
+        break;
+      case 17:
+        _context4.next = 19;
+        return (0, _effects.put)((0, _store.action)('TIMEOUT_SESSION'));
+      case 19:
+        _context4.next = 26;
+        break;
+      case 21:
+        _context4.prev = 21;
+        _context4.t0 = _context4["catch"](8);
+        _context4.next = 25;
+        return (0, _effects.put)((0, _store.action)('TIMEOUT_SESSION'));
+      case 25:
+        console.error(_context4.t0);
+      case 26:
+      case "end":
+        return _context4.stop();
+    }
+  }, _callee4, null, [[8, 21]]);
+})));
 var SYSTEM_TOKEN = 'kd-system';
 (0, _store.regSaga)((0, _effects.takeEvery)('INITIALIZE', function (_ref3) {
   var _ref3$payload = _ref3.payload,
     system = _ref3$payload.system,
     skipInit = _ref3$payload.skipInit;
-  return /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee4() {
+  return /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee5() {
     var token, localToken, parsedToken, isValid, _yield$call4, securityStrategies, _yield$call4$session, _yield$call4$session2, csrfToken, isAuthenticated, spaceSlug, error, _token;
-    return (0, _regeneratorRuntime2["default"])().wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+    return (0, _regeneratorRuntime2["default"])().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          _context4.prev = 0;
+          _context5.prev = 0;
           if (!system) {
-            _context4.next = 8;
+            _context5.next = 8;
             break;
           }
           localToken = localStorage ? localStorage.getItem(SYSTEM_TOKEN) : null;
@@ -334,19 +396,19 @@ var SYSTEM_TOKEN = 'kd-system';
             isValid = _moment["default"].unix(parsedToken.exp).isAfter(new Date());
             token = isValid ? localToken : null;
           }
-          _context4.next = 6;
+          _context5.next = 6;
           return (0, _effects.put)((0, _store.action)('SET_INITIALIZED', {
             system: system,
             token: token
           }));
         case 6:
-          _context4.next = 33;
+          _context5.next = 33;
           break;
         case 8:
-          _context4.next = 10;
+          _context5.next = 10;
           return (0, _effects.call)(_apis.fetchSpaMeta);
         case 10:
-          _yield$call4 = _context4.sent;
+          _yield$call4 = _context5.sent;
           securityStrategies = _yield$call4.securityStrategies;
           _yield$call4$session = _yield$call4.session;
           _yield$call4$session2 = _yield$call4$session === void 0 ? {} : _yield$call4$session;
@@ -355,30 +417,30 @@ var SYSTEM_TOKEN = 'kd-system';
           spaceSlug = _yield$call4.spaceSlug;
           error = _yield$call4.error;
           if (!error) {
-            _context4.next = 23;
+            _context5.next = 23;
             break;
           }
-          _context4.next = 21;
+          _context5.next = 21;
           return (0, _effects.put)((0, _store.action)('SET_SERVER_ERROR', error));
         case 21:
-          _context4.next = 33;
+          _context5.next = 33;
           break;
         case 23:
           if (!(isAuthenticated && !skipInit)) {
-            _context4.next = 29;
+            _context5.next = 29;
             break;
           }
-          _context4.next = 26;
+          _context5.next = 26;
           return (0, _effects.call)(_apis.retrieveJwt);
         case 26:
-          _context4.t0 = _context4.sent;
-          _context4.next = 30;
+          _context5.t0 = _context5.sent;
+          _context5.next = 30;
           break;
         case 29:
-          _context4.t0 = null;
+          _context5.t0 = null;
         case 30:
-          _token = _context4.t0;
-          _context4.next = 33;
+          _token = _context5.t0;
+          _context5.next = 33;
           return (0, _effects.put)((0, _store.action)('SET_INITIALIZED', {
             csrfToken: csrfToken,
             securityStrategies: securityStrategies,
@@ -386,87 +448,87 @@ var SYSTEM_TOKEN = 'kd-system';
             token: _token
           }));
         case 33:
-          _context4.next = 38;
+          _context5.next = 38;
           break;
         case 35:
-          _context4.prev = 35;
-          _context4.t1 = _context4["catch"](0);
-          console.error(_context4.t1);
+          _context5.prev = 35;
+          _context5.t1 = _context5["catch"](0);
+          console.error(_context5.t1);
         case 38:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
-    }, _callee4, null, [[0, 35]]);
+    }, _callee5, null, [[0, 35]]);
   })();
 }));
 (0, _store.regSaga)((0, _effects.takeEvery)('LOGOUT_START', function (_ref4) {
   var payload = _ref4.payload;
-  return /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee5() {
+  return /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee6() {
     var callback, isSaml, system, loggedIn;
-    return (0, _regeneratorRuntime2["default"])().wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+    return (0, _regeneratorRuntime2["default"])().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
         case 0:
           callback = payload.callback, isSaml = payload.isSaml;
-          _context5.prev = 1;
-          _context5.next = 4;
+          _context6.prev = 1;
+          _context6.next = 4;
           return (0, _effects.select)(function (state) {
             return state.getIn(['session', 'system']);
           });
         case 4:
-          system = _context5.sent;
-          _context5.next = 7;
+          system = _context6.sent;
+          _context6.next = 7;
           return (0, _effects.select)(function (state) {
             return state.getIn(['session', 'token']);
           });
         case 7:
-          loggedIn = _context5.sent;
+          loggedIn = _context6.sent;
           if (!(!system && loggedIn)) {
-            _context5.next = 11;
+            _context6.next = 11;
             break;
           }
-          _context5.next = 11;
+          _context6.next = 11;
           return (0, _effects.call)(_apis.logoutDirect, isSaml);
         case 11:
-          _context5.next = 13;
+          _context6.next = 13;
           return (0, _effects.put)((0, _store.action)('LOGOUT'));
         case 13:
           if (!(0, _lodashEs.isFunction)(callback)) {
-            _context5.next = 16;
+            _context6.next = 16;
             break;
           }
-          _context5.next = 16;
+          _context6.next = 16;
           return (0, _effects.call)(callback);
         case 16:
-          _context5.next = 21;
+          _context6.next = 21;
           break;
         case 18:
-          _context5.prev = 18;
-          _context5.t0 = _context5["catch"](1);
-          console.error(_context5.t0);
+          _context6.prev = 18;
+          _context6.t0 = _context6["catch"](1);
+          console.error(_context6.t0);
         case 21:
         case "end":
-          return _context5.stop();
+          return _context6.stop();
       }
-    }, _callee5, null, [[1, 18]]);
+    }, _callee6, null, [[1, 18]]);
   })();
 }));
 (0, _store.regSaga)((0, _effects.takeEvery)('SET_AUTHENTICATED', function (_ref5) {
   var payload = _ref5.payload;
-  return /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee6() {
-    return (0, _regeneratorRuntime2["default"])().wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+  return /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee7() {
+    return (0, _regeneratorRuntime2["default"])().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
         case 0:
           if (!(0, _lodashEs.isFunction)(payload.callback)) {
-            _context6.next = 3;
+            _context7.next = 3;
             break;
           }
-          _context6.next = 3;
+          _context7.next = 3;
           return (0, _effects.call)(payload.callback);
         case 3:
         case "end":
-          return _context6.stop();
+          return _context7.stop();
       }
-    }, _callee6);
+    }, _callee7);
   })();
 }));
 var onChangeUsername = function onChangeUsername(e) {
@@ -520,15 +582,15 @@ var AuthenticationComponent = exports.AuthenticationComponent = /*#__PURE__*/fun
       var _this$props = this.props,
         initialized = _this$props.initialized,
         loggedIn = _this$props.loggedIn,
+        timedOut = _this$props.timedOut,
         login = _this$props.login,
         securityStrategies = _this$props.securityStrategies,
         serverError = _this$props.serverError,
-        spaceSlug = _this$props.spaceSlug,
-        token = _this$props.token;
-      return this.props.children({
+        spaceSlug = _this$props.spaceSlug;
+      var content = this.props.children({
         serverError: serverError,
         initialized: initialized,
-        timedOut: loggedIn && !token,
+        timedOut: loggedIn && timedOut,
         loggedIn: loggedIn,
         loginProps: (0, _objectSpread2["default"])({
           onChangeUsername: onChangeUsername,
@@ -542,6 +604,9 @@ var AuthenticationComponent = exports.AuthenticationComponent = /*#__PURE__*/fun
           } : null
         }, login)
       });
+      return this.props.preferences ? /*#__PURE__*/React.createElement(_PreferencesProvider.PreferencesProvider, {
+        loggedIn: loggedIn
+      }, content) : content;
     }
   }]);
   return AuthenticationComponent;
@@ -550,6 +615,7 @@ var mapStateToProps = function mapStateToProps(state) {
   return {
     initialized: state.getIn(['session', 'initialized'], false),
     loggedIn: state.getIn(['session', 'loggedIn'], false),
+    timedOut: state.getIn(['session', 'timedOut'], false),
     token: state.getIn(['session', 'token'], null),
     login: state.get('login', defaultLoginProps),
     spaceSlug: state.getIn(['session', 'spaceSlug'], ''),