dauth-context-react 1.0.3 → 2.1.0

package/dist/dauth-context-react.cjs.development.js

@@ -357,92 +357,83 @@ var sendEmailVerificationAPI = /*#__PURE__*/function () {
     return _ref3.apply(this, arguments);
   };
 }();
-var refreshAccessTokenAPI = /*#__PURE__*/function () {
-  var _ref4 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(domainName, token) {
+var refreshTokenAPI = /*#__PURE__*/function () {
+  var _ref5 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(domainName, refreshToken) {
     var params, response, data;
-    return _regenerator().w(function (_context4) {
-      while (1) switch (_context4.n) {
+    return _regenerator().w(function (_context5) {
+      while (1) switch (_context5.n) {
         case 0:
           params = {
-            method: 'GET',
+            method: 'POST',
             headers: {
-              Authorization: token,
               'Content-Type': 'application/json'
-            }
+            },
+            body: JSON.stringify({
+              refreshToken: refreshToken
+            })
           };
-          _context4.n = 1;
-          return fetch(getServerBasePath() + "/app/" + domainName + "/refresh-access-token", params);
+          _context5.n = 1;
+          return fetch(getServerBasePath() + "/app/" + domainName + "/refresh-token", params);
         case 1:
-          response = _context4.v;
-          _context4.n = 2;
+          response = _context5.v;
+          _context5.n = 2;
           return response.json();
         case 2:
-          data = _context4.v;
-          return _context4.a(2, {
+          data = _context5.v;
+          return _context5.a(2, {
             response: response,
             data: data
           });
       }
-    }, _callee4);
+    }, _callee5);
   }));
-  return function refreshAccessTokenAPI(_x8, _x9) {
-    return _ref4.apply(this, arguments);
+  return function refreshTokenAPI(_x0, _x1) {
+    return _ref5.apply(this, arguments);
   };
 }();
-var verifyTokenAPI = /*#__PURE__*/function () {
-  var _ref6 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(_ref5) {
-    var domainName, tsk, token, params, response, data;
-    return _regenerator().w(function (_context5) {
-      while (1) switch (_context5.n) {
+var logoutAPI = /*#__PURE__*/function () {
+  var _ref6 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(domainName, refreshToken) {
+    var params, response;
+    return _regenerator().w(function (_context6) {
+      while (1) switch (_context6.n) {
         case 0:
-          domainName = _ref5.domainName, tsk = _ref5.tsk, token = _ref5.token;
           params = {
             method: 'POST',
             headers: {
-              Authorization: token,
               'Content-Type': 'application/json'
             },
             body: JSON.stringify({
-              tsk: tsk
+              refreshToken: refreshToken
             })
           };
-          _context5.n = 1;
-          return fetch(getServerBasePath() + "/app/" + domainName + "/verify-token", params);
+          _context6.n = 1;
+          return fetch(getServerBasePath() + "/app/" + domainName + "/logout", params);
         case 1:
-          response = _context5.v;
-          _context5.n = 2;
-          return response.json();
-        case 2:
-          data = _context5.v;
-          return _context5.a(2, {
-            response: response,
-            data: data
+          response = _context6.v;
+          return _context6.a(2, {
+            response: response
           });
       }
-    }, _callee5);
+    }, _callee6);
   }));
-  return function verifyTokenAPI(_x0) {
+  return function logoutAPI(_x10, _x11) {
     return _ref6.apply(this, arguments);
   };
 }();
 
 var TOKEN_LS = 'dauth_state';
-
-var routes = {
-  signin: 'signin',
-  updateUser: 'update-user'
-};
+var REFRESH_TOKEN_LS = 'dauth_refresh_token';
 
 function setDauthStateAction(_x) {
   return _setDauthStateAction.apply(this, arguments);
 }
 function _setDauthStateAction() {
   _setDauthStateAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var dispatch, token, domainName, getUserFetch, _t;
+    var dispatch, token, refreshToken, domainName, getUserFetch, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
-          dispatch = _ref.dispatch, token = _ref.token, domainName = _ref.domainName;
+          dispatch = _ref.dispatch, token = _ref.token, refreshToken = _ref.refreshToken, domainName = _ref.domainName;
           dispatch({
             type: SET_IS_LOADING,
             payload: {
@@ -467,7 +458,9 @@ function _setDauthStateAction() {
             }
           });
           window.history.replaceState({}, document.title, window.location.pathname);
-          return _context.a(2, localStorage.setItem(TOKEN_LS, token));
+          localStorage.setItem(TOKEN_LS, token);
+          localStorage.setItem(REFRESH_TOKEN_LS, refreshToken);
+          return _context.a(2);
         case 3:
           return _context.a(2, resetUser(dispatch));
         case 4:
@@ -499,29 +492,45 @@ function setAutoLoginAction(_x2) {
 }
 function _setAutoLoginAction() {
   _setAutoLoginAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref2) {
-    var dispatch, token_ls, domainName, refreshAccessTokenFetch, newToken, getUserFetch, _t2;
+    var dispatch, domainName, storedRefreshToken, refreshResult, newAccessToken, newRefreshToken, getUserFetch, _t2;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
-          dispatch = _ref2.dispatch, token_ls = _ref2.token_ls, domainName = _ref2.domainName;
+          dispatch = _ref2.dispatch, domainName = _ref2.domainName;
           dispatch({
             type: SET_IS_LOADING,
             payload: {
               isLoading: true
             }
           });
+          storedRefreshToken = localStorage.getItem(REFRESH_TOKEN_LS);
+          if (storedRefreshToken) {
+            _context2.n = 1;
+            break;
+          }
+          dispatch({
+            type: SET_IS_LOADING,
+            payload: {
+              isLoading: false
+            }
+          });
+          return _context2.a(2, resetUser(dispatch));
+        case 1:
           _context2.p = 1;
           _context2.n = 2;
-          return refreshAccessTokenAPI(domainName, token_ls);
+          return refreshTokenAPI(domainName, storedRefreshToken);
         case 2:
-          refreshAccessTokenFetch = _context2.v;
-          if (!(refreshAccessTokenFetch.response.status === 200)) {
-            _context2.n = 6;
+          refreshResult = _context2.v;
+          if (!(refreshResult.response.status === 200)) {
+            _context2.n = 4;
             break;
           }
-          newToken = refreshAccessTokenFetch.data.accessToken || token_ls;
+          newAccessToken = refreshResult.data.accessToken;
+          newRefreshToken = refreshResult.data.refreshToken;
+          localStorage.setItem(TOKEN_LS, newAccessToken);
+          localStorage.setItem(REFRESH_TOKEN_LS, newRefreshToken);
           _context2.n = 3;
-          return getUserAPI(domainName, newToken);
+          return getUserAPI(domainName, newAccessToken);
         case 3:
           getUserFetch = _context2.v;
           if (!(getUserFetch.response.status === 200)) {
@@ -536,132 +545,197 @@ function _setAutoLoginAction() {
               isAuthenticated: true
             }
           });
-          localStorage.setItem(TOKEN_LS, refreshAccessTokenFetch.data.accessToken);
           return _context2.a(2);
         case 4:
-          window.location.replace(getClientBasePath() + "/" + domainName + "/" + routes.signin);
-          return _context2.a(2, resetUser(dispatch));
-        case 5:
-          _context2.n = 7;
-          break;
-        case 6:
-          window.location.replace(getClientBasePath() + "/" + domainName + "/" + routes.signin);
-          return _context2.a(2, resetUser(dispatch));
-        case 7:
-          _context2.n = 9;
+          // Refresh failed — session expired
+          resetUser(dispatch);
+          _context2.n = 6;
           break;
-        case 8:
-          _context2.p = 8;
+        case 5:
+          _context2.p = 5;
           _t2 = _context2.v;
           console.error(_t2);
-          return _context2.a(2, resetUser(dispatch));
-        case 9:
-          _context2.p = 9;
+          resetUser(dispatch);
+        case 6:
+          _context2.p = 6;
           dispatch({
             type: SET_IS_LOADING,
             payload: {
               isLoading: false
             }
           });
-          return _context2.f(9);
-        case 10:
+          return _context2.f(6);
+        case 7:
           return _context2.a(2);
       }
-    }, _callee2, null, [[1, 8, 9, 10]]);
+    }, _callee2, null, [[1, 5, 6, 7]]);
   }));
   return _setAutoLoginAction.apply(this, arguments);
 }
-function setLogoutAction(_ref3) {
-  var dispatch = _ref3.dispatch;
-  dispatch({
-    type: SET_IS_LOADING,
-    payload: {
-      isLoading: true
-    }
-  });
-  dispatch({
-    type: LOGIN,
-    payload: {
-      user: {
-        language: window.document.documentElement.getAttribute('lang') || 'es'
-      },
-      domain: {},
-      isAuthenticated: false
-    }
-  });
-  localStorage.removeItem(TOKEN_LS);
-  return dispatch({
-    type: SET_IS_LOADING,
-    payload: {
-      isLoading: false
-    }
-  });
+function setLogoutAction(_x3) {
+  return _setLogoutAction.apply(this, arguments);
 }
-function setUpdateUserAction(_x3) {
+function _setLogoutAction() {
+  _setLogoutAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(_ref3) {
+    var dispatch, domainName, storedRefreshToken;
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.p = _context3.n) {
+        case 0:
+          dispatch = _ref3.dispatch, domainName = _ref3.domainName;
+          storedRefreshToken = localStorage.getItem(REFRESH_TOKEN_LS);
+          if (!(storedRefreshToken && domainName)) {
+            _context3.n = 4;
+            break;
+          }
+          _context3.p = 1;
+          _context3.n = 2;
+          return logoutAPI(domainName, storedRefreshToken);
+        case 2:
+          _context3.n = 4;
+          break;
+        case 3:
+          _context3.p = 3;
+        case 4:
+          dispatch({
+            type: SET_IS_LOADING,
+            payload: {
+              isLoading: true
+            }
+          });
+          dispatch({
+            type: LOGIN,
+            payload: {
+              user: {
+                language: window.document.documentElement.getAttribute('lang') || 'es'
+              },
+              domain: {},
+              isAuthenticated: false
+            }
+          });
+          localStorage.removeItem(TOKEN_LS);
+          localStorage.removeItem(REFRESH_TOKEN_LS);
+          return _context3.a(2, dispatch({
+            type: SET_IS_LOADING,
+            payload: {
+              isLoading: false
+            }
+          }));
+      }
+    }, _callee3, null, [[1, 3]]);
+  }));
+  return _setLogoutAction.apply(this, arguments);
+}
+function refreshSessionAction(_x4) {
+  return _refreshSessionAction.apply(this, arguments);
+}
+function _refreshSessionAction() {
+  _refreshSessionAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(_ref4) {
+    var dispatch, domainName, storedRefreshToken, refreshResult, _t4;
+    return _regenerator().w(function (_context4) {
+      while (1) switch (_context4.p = _context4.n) {
+        case 0:
+          dispatch = _ref4.dispatch, domainName = _ref4.domainName;
+          storedRefreshToken = localStorage.getItem(REFRESH_TOKEN_LS);
+          if (storedRefreshToken) {
+            _context4.n = 1;
+            break;
+          }
+          return _context4.a(2, resetUser(dispatch));
+        case 1:
+          _context4.p = 1;
+          _context4.n = 2;
+          return refreshTokenAPI(domainName, storedRefreshToken);
+        case 2:
+          refreshResult = _context4.v;
+          if (!(refreshResult.response.status === 200)) {
+            _context4.n = 3;
+            break;
+          }
+          localStorage.setItem(TOKEN_LS, refreshResult.data.accessToken);
+          localStorage.setItem(REFRESH_TOKEN_LS, refreshResult.data.refreshToken);
+          return _context4.a(2);
+        case 3:
+          // Refresh failed — revoked or expired
+          resetUser(dispatch);
+          _context4.n = 5;
+          break;
+        case 4:
+          _context4.p = 4;
+          _t4 = _context4.v;
+          console.error(_t4);
+          resetUser(dispatch);
+        case 5:
+          return _context4.a(2);
+      }
+    }, _callee4, null, [[1, 4]]);
+  }));
+  return _refreshSessionAction.apply(this, arguments);
+}
+function setUpdateUserAction(_x5) {
   return _setUpdateUserAction.apply(this, arguments);
 }
 function _setUpdateUserAction() {
-  _setUpdateUserAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(_ref4) {
-    var dispatch, domainName, user, token, getUserFetch, _t3;
-    return _regenerator().w(function (_context3) {
-      while (1) switch (_context3.p = _context3.n) {
+  _setUpdateUserAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(_ref5) {
+    var dispatch, domainName, user, token, getUserFetch, _t5;
+    return _regenerator().w(function (_context5) {
+      while (1) switch (_context5.p = _context5.n) {
         case 0:
-          dispatch = _ref4.dispatch, domainName = _ref4.domainName, user = _ref4.user, token = _ref4.token;
+          dispatch = _ref5.dispatch, domainName = _ref5.domainName, user = _ref5.user, token = _ref5.token;
           if (user.language) {
             window.document.documentElement.setAttribute('lang', user.language);
           }
           if (token) {
-            _context3.n = 1;
+            _context5.n = 1;
             break;
           }
           dispatch({
             type: UPDATE_USER,
             payload: user
           });
-          return _context3.a(2, false);
+          return _context5.a(2, false);
         case 1:
-          _context3.p = 1;
-          _context3.n = 2;
+          _context5.p = 1;
+          _context5.n = 2;
           return updateUserAPI(domainName, user, token);
         case 2:
-          getUserFetch = _context3.v;
+          getUserFetch = _context5.v;
           if (!(getUserFetch.response.status === 200)) {
-            _context3.n = 3;
+            _context5.n = 3;
             break;
           }
           dispatch({
             type: UPDATE_USER,
             payload: getUserFetch.data.user
           });
-          return _context3.a(2, true);
+          return _context5.a(2, true);
         case 3:
           console.error('Update user error', getUserFetch.data.message);
-          return _context3.a(2, false);
+          return _context5.a(2, false);
         case 4:
-          _context3.n = 6;
+          _context5.n = 6;
           break;
         case 5:
-          _context3.p = 5;
-          _t3 = _context3.v;
-          console.error('Update user error', _t3);
-          return _context3.a(2, false);
+          _context5.p = 5;
+          _t5 = _context5.v;
+          console.error('Update user error', _t5);
+          return _context5.a(2, false);
         case 6:
-          return _context3.a(2);
+          return _context5.a(2);
       }
-    }, _callee3, null, [[1, 5]]);
+    }, _callee5, null, [[1, 5]]);
   }));
   return _setUpdateUserAction.apply(this, arguments);
 }
-function sendEmailVerificationAction(_x4) {
+function sendEmailVerificationAction(_x6) {
   return _sendEmailVerificationAction.apply(this, arguments);
 }
 function _sendEmailVerificationAction() {
-  _sendEmailVerificationAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(_ref5) {
+  _sendEmailVerificationAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(_ref6) {
     var dispatch, domainName, token, sendEmailFetch;
-    return _regenerator().w(function (_context4) {
-      while (1) switch (_context4.p = _context4.n) {
+    return _regenerator().w(function (_context6) {
+      while (1) switch (_context6.p = _context6.n) {
         case 0:
-          dispatch = _ref5.dispatch, domainName = _ref5.domainName, token = _ref5.token;
+          dispatch = _ref6.dispatch, domainName = _ref6.domainName, token = _ref6.token;
           dispatch({
             type: SET_SEND_EMAIL_VERIFICATION_IS_LOADING,
             payload: true
@@ -673,13 +747,13 @@ function _sendEmailVerificationAction() {
               message: 'Sending email verification...'
             }
           });
-          _context4.p = 1;
-          _context4.n = 2;
+          _context6.p = 1;
+          _context6.n = 2;
           return sendEmailVerificationAPI(domainName, token);
         case 2:
-          sendEmailFetch = _context4.v;
+          sendEmailFetch = _context6.v;
           if (!(sendEmailFetch.response.status === 200)) {
-            _context4.n = 3;
+            _context6.n = 3;
             break;
           }
           dispatch({
@@ -693,7 +767,7 @@ function _sendEmailVerificationAction() {
             type: SET_SEND_EMAIL_VERIFICATION_IS_LOADING,
             payload: false
           });
-          return _context4.a(2, true);
+          return _context6.a(2, true);
         case 3:
           dispatch({
             type: SET_SEND_EMAIL_VERIFICATION_STATUS,
@@ -706,12 +780,12 @@ function _sendEmailVerificationAction() {
             type: SET_SEND_EMAIL_VERIFICATION_IS_LOADING,
             payload: false
           });
-          return _context4.a(2, false);
+          return _context6.a(2, false);
         case 4:
-          _context4.n = 6;
+          _context6.n = 6;
           break;
         case 5:
-          _context4.p = 5;
+          _context6.p = 5;
           dispatch({
             type: SET_SEND_EMAIL_VERIFICATION_STATUS,
             payload: {
@@ -723,104 +797,68 @@ function _sendEmailVerificationAction() {
             type: SET_SEND_EMAIL_VERIFICATION_IS_LOADING,
             payload: false
           });
-          return _context4.a(2, false);
+          return _context6.a(2, false);
         case 6:
-          return _context4.a(2);
+          return _context6.a(2);
       }
-    }, _callee4, null, [[1, 5]]);
+    }, _callee6, null, [[1, 5]]);
   }));
   return _sendEmailVerificationAction.apply(this, arguments);
 }
-function checkTokenAction(_x5) {
-  return _checkTokenAction.apply(this, arguments);
-}
-function _checkTokenAction() {
-  _checkTokenAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(_ref6) {
-    var dispatch, domainName, token, refreshAccessTokenFetch, _t5;
-    return _regenerator().w(function (_context5) {
-      while (1) switch (_context5.p = _context5.n) {
-        case 0:
-          dispatch = _ref6.dispatch, domainName = _ref6.domainName, token = _ref6.token;
-          _context5.p = 1;
-          _context5.n = 2;
-          return refreshAccessTokenAPI(domainName, token);
-        case 2:
-          refreshAccessTokenFetch = _context5.v;
-          if (!(refreshAccessTokenFetch.response.status === 200)) {
-            _context5.n = 3;
-            break;
-          }
-          if (refreshAccessTokenFetch.data.accessToken) {
-            localStorage.setItem(TOKEN_LS, refreshAccessTokenFetch.data.accessToken);
-          }
-          return _context5.a(2);
-        case 3:
-          window.location.replace(getClientBasePath() + "/" + domainName + "/" + routes.signin);
-          return _context5.a(2, resetUser(dispatch));
-        case 4:
-          _context5.n = 6;
-          break;
-        case 5:
-          _context5.p = 5;
-          _t5 = _context5.v;
-          resetUser(dispatch);
-          throw _t5;
-        case 6:
-          return _context5.a(2);
-      }
-    }, _callee5, null, [[1, 5]]);
-  }));
-  return _checkTokenAction.apply(this, arguments);
-}
-function getAccessTokenAction(_x6) {
+function getAccessTokenAction(_x7) {
   return _getAccessTokenAction.apply(this, arguments);
 }
 ///////////////////////////////////////////
 //////////////////////////////////////////
 function _getAccessTokenAction() {
-  _getAccessTokenAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(_ref7) {
-    var dispatch, domainName, token_ls, refreshAccessTokenFetch, _refreshAccessTokenFe, _t6;
-    return _regenerator().w(function (_context6) {
-      while (1) switch (_context6.p = _context6.n) {
+  _getAccessTokenAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(_ref7) {
+    var dispatch, domainName, token_ls, payloadB64, payload, expiresIn, refreshedToken;
+    return _regenerator().w(function (_context7) {
+      while (1) switch (_context7.p = _context7.n) {
         case 0:
           dispatch = _ref7.dispatch, domainName = _ref7.domainName;
           token_ls = localStorage.getItem(TOKEN_LS);
           if (token_ls) {
-            _context6.n = 1;
+            _context7.n = 1;
             break;
           }
-          return _context6.a(2);
+          return _context7.a(2, 'token-not-found');
         case 1:
-          _context6.p = 1;
-          _context6.n = 2;
-          return refreshAccessTokenAPI(domainName, token_ls);
-        case 2:
-          refreshAccessTokenFetch = _context6.v;
-          if (!(refreshAccessTokenFetch.response.status === 200)) {
-            _context6.n = 3;
+          _context7.p = 1;
+          payloadB64 = token_ls.split('.')[1];
+          if (!payloadB64) {
+            _context7.n = 3;
             break;
           }
-          return _context6.a(2, (_refreshAccessTokenFe = refreshAccessTokenFetch.data.accessToken) != null ? _refreshAccessTokenFe : token_ls);
+          payload = JSON.parse(atob(payloadB64));
+          expiresIn = (payload.exp || 0) * 1000 - Date.now(); // If token expires in less than 5 minutes, refresh proactively
+          if (!(expiresIn < 5 * 60 * 1000)) {
+            _context7.n = 3;
+            break;
+          }
+          _context7.n = 2;
+          return refreshSessionAction({
+            dispatch: dispatch,
+            domainName: domainName
+          });
+        case 2:
+          refreshedToken = localStorage.getItem(TOKEN_LS);
+          return _context7.a(2, refreshedToken || 'token-not-found');
         case 3:
-          resetUser(dispatch);
-          return _context6.a(2, 'token-not-found');
-        case 4:
-          _context6.n = 6;
+          _context7.n = 5;
           break;
+        case 4:
+          _context7.p = 4;
         case 5:
-          _context6.p = 5;
-          _t6 = _context6.v;
-          resetUser(dispatch);
-          throw _t6;
-        case 6:
-          return _context6.a(2);
+          return _context7.a(2, token_ls);
       }
-    }, _callee6, null, [[1, 5]]);
+    }, _callee7, null, [[1, 4]]);
   }));
   return _getAccessTokenAction.apply(this, arguments);
 }
 var resetUser = function resetUser(dispatch) {
   localStorage.removeItem(TOKEN_LS);
+  localStorage.removeItem(REFRESH_TOKEN_LS);
   return dispatch({
     type: LOGIN,
     payload: {
@@ -831,91 +869,70 @@ var resetUser = function resetUser(dispatch) {
   });
 };
 
+var routes = {
+  signin: 'signin',
+  updateUser: 'update-user'
+};
+
 var DauthProvider = function DauthProvider(props) {
   var domainName = props.domainName,
-    tsk = props.tsk,
     children = props.children;
   var _useReducer = React.useReducer(userReducer, initialDauthState),
     dauthState = _useReducer[0],
     dispatch = _useReducer[1];
-  var isValidTsk = React.useCallback(/*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(token) {
-      var verifyToken;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.p = _context.n) {
-          case 0:
-            _context.p = 0;
-            _context.n = 1;
-            return verifyTokenAPI({
-              domainName: domainName,
-              token: token,
-              tsk: tsk
-            });
-          case 1:
-            verifyToken = _context.v;
-            if (!(verifyToken.response.status !== 200)) {
-              _context.n = 2;
-              break;
-            }
-            return _context.a(2, false);
-          case 2:
-            return _context.a(2, true);
-          case 3:
-            _context.p = 3;
-            return _context.a(2, false);
-        }
-      }, _callee, null, [[0, 3]]);
-    }));
-    return function (_x) {
-      return _ref.apply(this, arguments);
-    };
-  }(), [domainName, tsk]);
-  // Check token periodically
-  React.useEffect(function () {
-    if (!dauthState.isAuthenticated) return;
-    var interval = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
-      var token_ls, isValid;
-      return _regenerator().w(function (_context2) {
-        while (1) switch (_context2.n) {
-          case 0:
-            token_ls = localStorage.getItem(TOKEN_LS);
-            if (token_ls) {
+  var refreshTimerRef = React.useRef(null);
+  // Schedule next proactive refresh based on access token expiry
+  var scheduleRefresh = React.useCallback(function () {
+    if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current);
+    var token = localStorage.getItem(TOKEN_LS);
+    if (!token) return;
+    try {
+      var payloadB64 = token.split('.')[1];
+      if (!payloadB64) return;
+      var payload = JSON.parse(atob(payloadB64));
+      var expiresIn = (payload.exp || 0) * 1000 - Date.now();
+      // Refresh 5 minutes before expiry, minimum 10 seconds
+      var refreshIn = Math.max(expiresIn - 5 * 60 * 1000, 10000);
+      refreshTimerRef.current = setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
+            case 0:
+              _context.n = 1;
+              return refreshSessionAction({
+                dispatch: dispatch,
+                domainName: domainName
+              });
+            case 1:
+              scheduleRefresh();
+            case 2:
+              return _context.a(2);
+          }
+        }, _callee);
+      })), refreshIn);
+    } catch (_) {
+      // If decode fails, retry in 5 minutes
+      refreshTimerRef.current = setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.n) {
+            case 0:
               _context2.n = 1;
-              break;
-            }
-            return _context2.a(2);
-          case 1:
-            _context2.n = 2;
-            return isValidTsk(token_ls);
-          case 2:
-            isValid = _context2.v;
-            if (!isValid) {
-              _context2.n = 3;
-              break;
-            }
-            return _context2.a(2, checkTokenAction({
-              dispatch: dispatch,
-              domainName: domainName,
-              token: token_ls
-            }));
-          case 3:
-            setLogoutAction({
-              dispatch: dispatch
-            });
-            throw new Error('Ask value in DauthProvider is not valid');
-          case 4:
-            return _context2.a(2);
-        }
-      }, _callee2);
-    })), 1000 * 60 * 5);
-    return function () {
-      return clearInterval(interval);
-    };
-  }, [dauthState.isAuthenticated, isValidTsk]);
+              return refreshSessionAction({
+                dispatch: dispatch,
+                domainName: domainName
+              });
+            case 1:
+              scheduleRefresh();
+            case 2:
+              return _context2.a(2);
+          }
+        }, _callee2);
+      })), 5 * 60 * 1000);
+    }
+  }, [domainName]);
   // Catch login redirect
   React.useEffect(function () {
     _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
-      var queryString, urlParams, token_url, isValid;
+      var queryString, urlParams, token_url, refresh_url;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.n) {
           case 0:
@@ -928,29 +945,18 @@ var DauthProvider = function DauthProvider(props) {
           case 1:
             urlParams = new URLSearchParams(queryString);
             token_url = urlParams.get(TOKEN_LS);
-            if (!(token_url && !dauthState.isAuthenticated)) {
-              _context3.n = 4;
-              break;
-            }
-            _context3.n = 2;
-            return isValidTsk(token_url);
-          case 2:
-            isValid = _context3.v;
-            if (!isValid) {
-              _context3.n = 3;
+            refresh_url = urlParams.get(REFRESH_TOKEN_LS);
+            if (!(token_url && refresh_url && !dauthState.isAuthenticated)) {
+              _context3.n = 2;
               break;
             }
             return _context3.a(2, setDauthStateAction({
               dispatch: dispatch,
               token: token_url,
+              refreshToken: refresh_url,
               domainName: domainName
             }));
-          case 3:
-            setLogoutAction({
-              dispatch: dispatch
-            });
-            throw new Error('Ask value in DauthProvider is not valid');
-          case 4:
+          case 2:
             return _context3.a(2);
         }
       }, _callee3);
@@ -959,57 +965,51 @@ var DauthProvider = function DauthProvider(props) {
   // Auto Login
   React.useEffect(function () {
     _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
-      var token_ls, isValid;
+      var refreshToken;
       return _regenerator().w(function (_context4) {
         while (1) switch (_context4.n) {
           case 0:
-            token_ls = localStorage.getItem(TOKEN_LS);
-            if (!(token_ls && !dauthState.isAuthenticated)) {
-              _context4.n = 4;
-              break;
-            }
-            _context4.n = 1;
-            return isValidTsk(token_ls);
-          case 1:
-            isValid = _context4.v;
-            if (!isValid) {
-              _context4.n = 2;
+            refreshToken = localStorage.getItem(REFRESH_TOKEN_LS);
+            if (!(refreshToken && !dauthState.isAuthenticated)) {
+              _context4.n = 1;
               break;
             }
             return _context4.a(2, setAutoLoginAction({
               dispatch: dispatch,
-              token_ls: token_ls,
               domainName: domainName
             }));
-          case 2:
-            setLogoutAction({
-              dispatch: dispatch
-            });
-            throw new Error('Ask value in DauthProvider is not valid');
-          case 3:
-            _context4.n = 5;
-            break;
-          case 4:
+          case 1:
             return _context4.a(2, dispatch({
               type: SET_IS_LOADING,
               payload: {
                 isLoading: false
               }
             }));
-          case 5:
+          case 2:
             return _context4.a(2);
         }
       }, _callee4);
     }))();
   }, []);
+  // Schedule proactive refresh when authenticated
+  React.useEffect(function () {
+    if (dauthState.isAuthenticated) {
+      scheduleRefresh();
+    }
+    return function () {
+      if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current);
+    };
+  }, [dauthState.isAuthenticated, scheduleRefresh]);
   var loginWithRedirect = React.useCallback(function () {
     return window.location.replace(getClientBasePath() + "/" + domainName + "/" + routes.signin);
   }, [domainName]);
   var logout = React.useCallback(function () {
+    if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current);
     return setLogoutAction({
-      dispatch: dispatch
+      dispatch: dispatch,
+      domainName: domainName
     });
-  }, []);
+  }, [domainName]);
   var getAccessToken = React.useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
     var token;
     return _regenerator().w(function (_context5) {
@@ -1027,13 +1027,13 @@ var DauthProvider = function DauthProvider(props) {
     }, _callee5);
   })), [domainName]);
   var updateUser = React.useCallback(/*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(_ref6) {
-      var name, lastname, nickname, telPrefix, telSuffix, language, avatar, token_ls, user;
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(fields) {
+      var token_ls, name, lastname, nickname, telPrefix, telSuffix, language, avatar, birthDate, country, metadata, user;
       return _regenerator().w(function (_context6) {
         while (1) switch (_context6.n) {
           case 0:
-            name = _ref6.name, lastname = _ref6.lastname, nickname = _ref6.nickname, telPrefix = _ref6.telPrefix, telSuffix = _ref6.telSuffix, language = _ref6.language, avatar = _ref6.avatar;
             token_ls = localStorage.getItem(TOKEN_LS);
+            name = fields.name, lastname = fields.lastname, nickname = fields.nickname, telPrefix = fields.telPrefix, telSuffix = fields.telSuffix, language = fields.language, avatar = fields.avatar, birthDate = fields.birthDate, country = fields.country, metadata = fields.metadata;
             user = {
               name: name,
               lastname: lastname,
@@ -1041,7 +1041,10 @@ var DauthProvider = function DauthProvider(props) {
               telPrefix: telPrefix,
               telSuffix: telSuffix,
               language: language,
-              avatar: avatar
+              avatar: avatar,
+              birthDate: birthDate,
+              country: country,
+              metadata: metadata
             };
             _context6.n = 1;
             return setUpdateUserAction({
@@ -1055,8 +1058,8 @@ var DauthProvider = function DauthProvider(props) {
         }
       }, _callee6);
     }));
-    return function (_x2) {
-      return _ref7.apply(this, arguments);
+    return function (_x) {
+      return _ref6.apply(this, arguments);
     };
   }(), [domainName]);
   var updateUserWithRedirect = React.useCallback(function () {