dauth-context-react 1.0.2 → 2.0.0

package/dist/dauth-context-react.esm.js

@@ -1,349 +1,146 @@
-import React, { useReducer, useCallback, useEffect, useMemo, createContext, useContext } from 'react';
+import React, { useReducer, useRef, useCallback, useEffect, useMemo, createContext, useContext } from 'react';
 
-function _regeneratorRuntime() {
-  _regeneratorRuntime = function () {
-    return e;
-  };
-  var t,
-    e = {},
-    r = Object.prototype,
-    n = r.hasOwnProperty,
-    o = Object.defineProperty || function (t, e, r) {
-      t[e] = r.value;
-    },
-    i = "function" == typeof Symbol ? Symbol : {},
-    a = i.iterator || "@@iterator",
-    c = i.asyncIterator || "@@asyncIterator",
-    u = i.toStringTag || "@@toStringTag";
-  function define(t, e, r) {
-    return Object.defineProperty(t, e, {
-      value: r,
-      enumerable: !0,
-      configurable: !0,
-      writable: !0
-    }), t[e];
-  }
+function asyncGeneratorStep(n, t, e, r, o, a, c) {
   try {
-    define({}, "");
-  } catch (t) {
-    define = function (t, e, r) {
-      return t[e] = r;
-    };
-  }
-  function wrap(t, e, r, n) {
-    var i = e && e.prototype instanceof Generator ? e : Generator,
-      a = Object.create(i.prototype),
-      c = new Context(n || []);
-    return o(a, "_invoke", {
-      value: makeInvokeMethod(t, r, c)
-    }), a;
-  }
-  function tryCatch(t, e, r) {
-    try {
-      return {
-        type: "normal",
-        arg: t.call(e, r)
-      };
-    } catch (t) {
-      return {
-        type: "throw",
-        arg: t
-      };
-    }
+    var i = n[a](c),
+      u = i.value;
+  } catch (n) {
+    return void e(n);
   }
-  e.wrap = wrap;
-  var h = "suspendedStart",
-    l = "suspendedYield",
-    f = "executing",
-    s = "completed",
-    y = {};
-  function Generator() {}
-  function GeneratorFunction() {}
-  function GeneratorFunctionPrototype() {}
-  var p = {};
-  define(p, a, function () {
-    return this;
-  });
-  var d = Object.getPrototypeOf,
-    v = d && d(d(values([])));
-  v && v !== r && n.call(v, a) && (p = v);
-  var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p);
-  function defineIteratorMethods(t) {
-    ["next", "throw", "return"].forEach(function (e) {
-      define(t, e, function (t) {
-        return this._invoke(e, t);
-      });
-    });
-  }
-  function AsyncIterator(t, e) {
-    function invoke(r, o, i, a) {
-      var c = tryCatch(t[r], t, o);
-      if ("throw" !== c.type) {
-        var u = c.arg,
-          h = u.value;
-        return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) {
-          invoke("next", t, i, a);
-        }, function (t) {
-          invoke("throw", t, i, a);
-        }) : e.resolve(h).then(function (t) {
-          u.value = t, i(u);
-        }, function (t) {
-          return invoke("throw", t, i, a);
-        });
+  i.done ? t(u) : Promise.resolve(u).then(r, o);
+}
+function _asyncToGenerator(n) {
+  return function () {
+    var t = this,
+      e = arguments;
+    return new Promise(function (r, o) {
+      var a = n.apply(t, e);
+      function _next(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "next", n);
       }
-      a(c.arg);
-    }
-    var r;
-    o(this, "_invoke", {
-      value: function (t, n) {
-        function callInvokeWithMethodAndArg() {
-          return new e(function (e, r) {
-            invoke(t, n, e, r);
-          });
-        }
-        return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+      function _throw(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "throw", n);
       }
+      _next(void 0);
     });
-  }
-  function makeInvokeMethod(e, r, n) {
-    var o = h;
-    return function (i, a) {
-      if (o === f) throw new Error("Generator is already running");
-      if (o === s) {
-        if ("throw" === i) throw a;
-        return {
-          value: t,
-          done: !0
+  };
+}
+function _extends() {
+  return _extends = Object.assign ? Object.assign.bind() : function (n) {
+    for (var e = 1; e < arguments.length; e++) {
+      var t = arguments[e];
+      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
+    }
+    return n;
+  }, _extends.apply(null, arguments);
+}
+function _regenerator() {
+  /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
+  var e,
+    t,
+    r = "function" == typeof Symbol ? Symbol : {},
+    n = r.iterator || "@@iterator",
+    o = r.toStringTag || "@@toStringTag";
+  function i(r, n, o, i) {
+    var c = n && n.prototype instanceof Generator ? n : Generator,
+      u = Object.create(c.prototype);
+    return _regeneratorDefine(u, "_invoke", function (r, n, o) {
+      var i,
+        c,
+        u,
+        f = 0,
+        p = o || [],
+        y = !1,
+        G = {
+          p: 0,
+          n: 0,
+          v: e,
+          a: d,
+          f: d.bind(e, 4),
+          d: function (t, r) {
+            return i = t, c = 0, u = e, G.n = r, a;
+          }
         };
+      function d(r, n) {
+        for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) {
+          var o,
+            i = p[t],
+            d = G.p,
+            l = i[2];
+          r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0));
+        }
+        if (o || r > 1) return a;
+        throw y = !0, n;
       }
-      for (n.method = i, n.arg = a;;) {
-        var c = n.delegate;
-        if (c) {
-          var u = maybeInvokeDelegate(c, n);
-          if (u) {
-            if (u === y) continue;
-            return u;
+      return function (o, p, l) {
+        if (f > 1) throw TypeError("Generator is already running");
+        for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) {
+          i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u);
+          try {
+            if (f = 2, i) {
+              if (c || (o = "next"), t = i[o]) {
+                if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object");
+                if (!t.done) return t;
+                u = t.value, c < 2 && (c = 0);
+              } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1);
+              i = e;
+            } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break;
+          } catch (t) {
+            i = e, c = 1, u = t;
+          } finally {
+            f = 1;
           }
         }
-        if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) {
-          if (o === h) throw o = s, n.arg;
-          n.dispatchException(n.arg);
-        } else "return" === n.method && n.abrupt("return", n.arg);
-        o = f;
-        var p = tryCatch(e, r, n);
-        if ("normal" === p.type) {
-          if (o = n.done ? s : l, p.arg === y) continue;
-          return {
-            value: p.arg,
-            done: n.done
-          };
-        }
-        "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg);
-      }
-    };
-  }
-  function maybeInvokeDelegate(e, r) {
-    var n = r.method,
-      o = e.iterator[n];
-    if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y;
-    var i = tryCatch(o, e.iterator, r.arg);
-    if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y;
-    var a = i.arg;
-    return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y);
-  }
-  function pushTryEntry(t) {
-    var e = {
-      tryLoc: t[0]
-    };
-    1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e);
-  }
-  function resetTryEntry(t) {
-    var e = t.completion || {};
-    e.type = "normal", delete e.arg, t.completion = e;
-  }
-  function Context(t) {
-    this.tryEntries = [{
-      tryLoc: "root"
-    }], t.forEach(pushTryEntry, this), this.reset(!0);
+        return {
+          value: t,
+          done: y
+        };
+      };
+    }(r, o, i), !0), u;
   }
-  function values(e) {
-    if (e || "" === e) {
-      var r = e[a];
-      if (r) return r.call(e);
-      if ("function" == typeof e.next) return e;
-      if (!isNaN(e.length)) {
-        var o = -1,
-          i = function next() {
-            for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next;
-            return next.value = t, next.done = !0, next;
-          };
-        return i.next = i;
-      }
-    }
-    throw new TypeError(typeof e + " is not iterable");
+  var a = {};
+  function Generator() {}
+  function GeneratorFunction() {}
+  function GeneratorFunctionPrototype() {}
+  t = Object.getPrototypeOf;
+  var c = [][n] ? t(t([][n]())) : (_regeneratorDefine(t = {}, n, function () {
+      return this;
+    }), t),
+    u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c);
+  function f(e) {
+    return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e;
   }
-  return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", {
-    value: GeneratorFunctionPrototype,
-    configurable: !0
-  }), o(GeneratorFunctionPrototype, "constructor", {
-    value: GeneratorFunction,
-    configurable: !0
-  }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) {
-    var e = "function" == typeof t && t.constructor;
-    return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name));
-  }, e.mark = function (t) {
-    return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t;
-  }, e.awrap = function (t) {
-    return {
-      __await: t
-    };
-  }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () {
+  return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine(u), _regeneratorDefine(u, o, "Generator"), _regeneratorDefine(u, n, function () {
     return this;
-  }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) {
-    void 0 === i && (i = Promise);
-    var a = new AsyncIterator(wrap(t, r, n, o), i);
-    return e.isGeneratorFunction(r) ? a : a.next().then(function (t) {
-      return t.done ? t.value : a.next();
-    });
-  }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () {
-    return this;
-  }), define(g, "toString", function () {
+  }), _regeneratorDefine(u, "toString", function () {
     return "[object Generator]";
-  }), e.keys = function (t) {
-    var e = Object(t),
-      r = [];
-    for (var n in e) r.push(n);
-    return r.reverse(), function next() {
-      for (; r.length;) {
-        var t = r.pop();
-        if (t in e) return next.value = t, next.done = !1, next;
-      }
-      return next.done = !0, next;
+  }), (_regenerator = function () {
+    return {
+      w: i,
+      m: f
     };
-  }, e.values = values, Context.prototype = {
-    constructor: Context,
-    reset: function (e) {
-      if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t);
-    },
-    stop: function () {
-      this.done = !0;
-      var t = this.tryEntries[0].completion;
-      if ("throw" === t.type) throw t.arg;
-      return this.rval;
-    },
-    dispatchException: function (e) {
-      if (this.done) throw e;
-      var r = this;
-      function handle(n, o) {
-        return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o;
-      }
-      for (var o = this.tryEntries.length - 1; o >= 0; --o) {
-        var i = this.tryEntries[o],
-          a = i.completion;
-        if ("root" === i.tryLoc) return handle("end");
-        if (i.tryLoc <= this.prev) {
-          var c = n.call(i, "catchLoc"),
-            u = n.call(i, "finallyLoc");
-          if (c && u) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
-            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
-          } else if (c) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
-          } else {
-            if (!u) throw new Error("try statement without catch or finally");
-            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
-          }
-        }
-      }
-    },
-    abrupt: function (t, e) {
-      for (var r = this.tryEntries.length - 1; r >= 0; --r) {
-        var o = this.tryEntries[r];
-        if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) {
-          var i = o;
-          break;
-        }
-      }
-      i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null);
-      var a = i ? i.completion : {};
-      return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a);
-    },
-    complete: function (t, e) {
-      if ("throw" === t.type) throw t.arg;
-      return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y;
-    },
-    finish: function (t) {
-      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
-        var r = this.tryEntries[e];
-        if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y;
-      }
-    },
-    catch: function (t) {
-      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
-        var r = this.tryEntries[e];
-        if (r.tryLoc === t) {
-          var n = r.completion;
-          if ("throw" === n.type) {
-            var o = n.arg;
-            resetTryEntry(r);
-          }
-          return o;
-        }
-      }
-      throw new Error("illegal catch attempt");
-    },
-    delegateYield: function (e, r, n) {
-      return this.delegate = {
-        iterator: values(e),
-        resultName: r,
-        nextLoc: n
-      }, "next" === this.method && (this.arg = t), y;
-    }
-  }, e;
+  })();
 }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+function _regeneratorDefine(e, r, n, t) {
+  var i = Object.defineProperty;
   try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
+    i({}, "", {});
+  } catch (e) {
+    i = 0;
   }
-}
-function _asyncToGenerator(fn) {
-  return function () {
-    var self = this,
-      args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-      _next(undefined);
-    });
-  };
-}
-function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
+  _regeneratorDefine = function (e, r, n, t) {
+    function o(r, n) {
+      _regeneratorDefine(e, r, function (e) {
+        return this._invoke(r, n, e);
+      });
     }
-    return target;
-  };
-  return _extends.apply(this, arguments);
+    r ? i ? i(e, r, {
+      value: n,
+      enumerable: !t,
+      configurable: !t,
+      writable: !t
+    }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2));
+  }, _regeneratorDefine(e, r, n, t);
 }
 
 var initialDauthState = {
@@ -457,10 +254,10 @@ function getClientBasePath() {
 }
 
 var getUserAPI = /*#__PURE__*/function () {
-  var _ref = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(domainName, token) {
+  var _ref = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(domainName, token) {
     var params, response, data;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
           params = {
             method: 'GET',
@@ -469,21 +266,18 @@ var getUserAPI = /*#__PURE__*/function () {
               'Content-Type': 'application/json'
             }
           };
-          _context.next = 3;
+          _context.n = 1;
           return fetch(getServerBasePath() + "/app/" + domainName + "/user", params);
-        case 3:
-          response = _context.sent;
-          _context.next = 6;
+        case 1:
+          response = _context.v;
+          _context.n = 2;
           return response.json();
-        case 6:
-          data = _context.sent;
-          return _context.abrupt("return", {
+        case 2:
+          data = _context.v;
+          return _context.a(2, {
             response: response,
             data: data
           });
-        case 8:
-        case "end":
-          return _context.stop();
       }
     }, _callee);
   }));
@@ -492,10 +286,10 @@ var getUserAPI = /*#__PURE__*/function () {
   };
 }();
 var updateUserAPI = /*#__PURE__*/function () {
-  var _ref2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(domainName, user, token) {
+  var _ref2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(domainName, user, token) {
     var params, response, data;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
           params = {
             method: 'PATCH',
@@ -505,21 +299,18 @@ var updateUserAPI = /*#__PURE__*/function () {
             },
             body: JSON.stringify(user)
           };
-          _context2.next = 3;
+          _context2.n = 1;
           return fetch(getServerBasePath() + "/app/" + domainName + "/user", params);
-        case 3:
-          response = _context2.sent;
-          _context2.next = 6;
+        case 1:
+          response = _context2.v;
+          _context2.n = 2;
           return response.json();
-        case 6:
-          data = _context2.sent;
-          return _context2.abrupt("return", {
+        case 2:
+          data = _context2.v;
+          return _context2.a(2, {
             response: response,
             data: data
           });
-        case 8:
-        case "end":
-          return _context2.stop();
       }
     }, _callee2);
   }));
@@ -528,10 +319,10 @@ var updateUserAPI = /*#__PURE__*/function () {
   };
 }();
 var sendEmailVerificationAPI = /*#__PURE__*/function () {
-  var _ref3 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(domainName, token) {
+  var _ref3 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(domainName, token) {
     var params, response, data;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
         case 0:
           params = {
             method: 'GET',
@@ -540,21 +331,18 @@ var sendEmailVerificationAPI = /*#__PURE__*/function () {
               'Content-Type': 'application/json'
             }
           };
-          _context3.next = 3;
+          _context3.n = 1;
           return fetch(getServerBasePath() + "/app/" + domainName + "/resend-email-verification", params);
-        case 3:
-          response = _context3.sent;
-          _context3.next = 6;
+        case 1:
+          response = _context3.v;
+          _context3.n = 2;
           return response.json();
-        case 6:
-          data = _context3.sent;
-          return _context3.abrupt("return", {
+        case 2:
+          data = _context3.v;
+          return _context3.a(2, {
             response: response,
             data: data
           });
-        case 8:
-        case "end":
-          return _context3.stop();
       }
     }, _callee3);
   }));
@@ -562,111 +350,96 @@ var sendEmailVerificationAPI = /*#__PURE__*/function () {
     return _ref3.apply(this, arguments);
   };
 }();
-var refreshAccessTokenAPI = /*#__PURE__*/function () {
-  var _ref4 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(domainName, token) {
+var refreshTokenAPI = /*#__PURE__*/function () {
+  var _ref5 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(domainName, refreshToken) {
     var params, response, data;
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+    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.next = 3;
-          return fetch(getServerBasePath() + "/app/" + domainName + "/refresh-access-token", params);
-        case 3:
-          response = _context4.sent;
-          _context4.next = 6;
+          _context5.n = 1;
+          return fetch(getServerBasePath() + "/app/" + domainName + "/refresh-token", params);
+        case 1:
+          response = _context5.v;
+          _context5.n = 2;
           return response.json();
-        case 6:
-          data = _context4.sent;
-          return _context4.abrupt("return", {
+        case 2:
+          data = _context5.v;
+          return _context5.a(2, {
             response: response,
             data: data
           });
-        case 8:
-        case "end":
-          return _context4.stop();
       }
-    }, _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__*/_regeneratorRuntime().mark(function _callee5(_ref5) {
-    var domainName, tsk, token, params, response, data;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+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.next = 4;
-          return fetch(getServerBasePath() + "/app/" + domainName + "/verify-token", params);
-        case 4:
-          response = _context5.sent;
-          _context5.next = 7;
-          return response.json();
-        case 7:
-          data = _context5.sent;
-          return _context5.abrupt("return", {
-            response: response,
-            data: data
+          _context6.n = 1;
+          return fetch(getServerBasePath() + "/app/" + domainName + "/logout", params);
+        case 1:
+          response = _context6.v;
+          return _context6.a(2, {
+            response: response
           });
-        case 9:
-        case "end":
-          return _context5.stop();
       }
-    }, _callee5);
+    }, _callee6);
   }));
-  return function verifyTokenAPI(_x10) {
+  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__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var dispatch, token, domainName, getUserFetch;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  _setDauthStateAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
+    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: {
               isLoading: true
             }
           });
-          _context.prev = 2;
-          _context.next = 5;
+          _context.p = 1;
+          _context.n = 2;
           return getUserAPI(domainName, token);
-        case 5:
-          getUserFetch = _context.sent;
+        case 2:
+          getUserFetch = _context.v;
           if (!(getUserFetch.response.status === 200)) {
-            _context.next = 12;
+            _context.n = 3;
             break;
           }
           dispatch({
@@ -677,32 +450,33 @@ function _setDauthStateAction() {
               isAuthenticated: true
             }
           });
-          window.history.replaceState({}, document.title, getUserFetch.data.domain.loginRedirect);
-          return _context.abrupt("return", localStorage.setItem(TOKEN_LS, token));
-        case 12:
-          return _context.abrupt("return", resetUser(dispatch));
-        case 13:
-          _context.next = 19;
+          window.history.replaceState({}, document.title, window.location.pathname);
+          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:
+          _context.n = 6;
           break;
-        case 15:
-          _context.prev = 15;
-          _context.t0 = _context["catch"](2);
-          console.error(_context.t0);
-          return _context.abrupt("return", resetUser(dispatch));
-        case 19:
-          _context.prev = 19;
+        case 5:
+          _context.p = 5;
+          _t = _context.v;
+          console.error(_t);
+          return _context.a(2, resetUser(dispatch));
+        case 6:
+          _context.p = 6;
           dispatch({
             type: SET_IS_LOADING,
             payload: {
               isLoading: false
             }
           });
-          return _context.finish(19);
-        case 22:
-        case "end":
-          return _context.stop();
+          return _context.f(6);
+        case 7:
+          return _context.a(2);
       }
-    }, _callee, null, [[2, 15, 19, 22]]);
+    }, _callee, null, [[1, 5, 6, 7]]);
   }));
   return _setDauthStateAction.apply(this, arguments);
 }
@@ -710,34 +484,50 @@ function setAutoLoginAction(_x2) {
   return _setAutoLoginAction.apply(this, arguments);
 }
 function _setAutoLoginAction() {
-  _setAutoLoginAction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-    var dispatch, token_ls, domainName, refreshAccessTokenFetch, newToken, getUserFetch;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  _setAutoLoginAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref2) {
+    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
             }
           });
-          _context2.prev = 2;
-          _context2.next = 5;
-          return refreshAccessTokenAPI(domainName, token_ls);
-        case 5:
-          refreshAccessTokenFetch = _context2.sent;
-          if (!(refreshAccessTokenFetch.response.status === 200)) {
-            _context2.next = 21;
+          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 refreshTokenAPI(domainName, storedRefreshToken);
+        case 2:
+          refreshResult = _context2.v;
+          if (!(refreshResult.response.status === 200)) {
+            _context2.n = 4;
             break;
           }
-          newToken = refreshAccessTokenFetch.data.accessToken || token_ls;
-          _context2.next = 10;
-          return getUserAPI(domainName, newToken);
-        case 10:
-          getUserFetch = _context2.sent;
+          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, newAccessToken);
+        case 3:
+          getUserFetch = _context2.v;
           if (!(getUserFetch.response.status === 200)) {
-            _context2.next = 17;
+            _context2.n = 4;
             break;
           }
           dispatch({
@@ -748,134 +538,197 @@ function _setAutoLoginAction() {
               isAuthenticated: true
             }
           });
-          localStorage.setItem(TOKEN_LS, refreshAccessTokenFetch.data.accessToken);
-          return _context2.abrupt("return");
-        case 17:
-          window.location.replace(getClientBasePath() + "/" + domainName + "/" + routes.signin);
-          return _context2.abrupt("return", resetUser(dispatch));
-        case 19:
-          _context2.next = 23;
-          break;
-        case 21:
-          window.location.replace(getClientBasePath() + "/" + domainName + "/" + routes.signin);
-          return _context2.abrupt("return", resetUser(dispatch));
-        case 23:
-          _context2.next = 29;
+          return _context2.a(2);
+        case 4:
+          // Refresh failed — session expired
+          resetUser(dispatch);
+          _context2.n = 6;
           break;
-        case 25:
-          _context2.prev = 25;
-          _context2.t0 = _context2["catch"](2);
-          console.error(_context2.t0);
-          return _context2.abrupt("return", resetUser(dispatch));
-        case 29:
-          _context2.prev = 29;
+        case 5:
+          _context2.p = 5;
+          _t2 = _context2.v;
+          console.error(_t2);
+          resetUser(dispatch);
+        case 6:
+          _context2.p = 6;
           dispatch({
             type: SET_IS_LOADING,
             payload: {
               isLoading: false
             }
           });
-          return _context2.finish(29);
-        case 32:
-        case "end":
-          return _context2.stop();
+          return _context2.f(6);
+        case 7:
+          return _context2.a(2);
       }
-    }, _callee2, null, [[2, 25, 29, 32]]);
+    }, _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 _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 setUpdateUserAction(_x3) {
+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__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
-    var dispatch, domainName, user, token, getUserFetch;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  _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.next = 5;
+            _context5.n = 1;
             break;
           }
           dispatch({
             type: UPDATE_USER,
             payload: user
           });
-          return _context3.abrupt("return", false);
-        case 5:
-          _context3.prev = 5;
-          _context3.next = 8;
+          return _context5.a(2, false);
+        case 1:
+          _context5.p = 1;
+          _context5.n = 2;
           return updateUserAPI(domainName, user, token);
-        case 8:
-          getUserFetch = _context3.sent;
+        case 2:
+          getUserFetch = _context5.v;
           if (!(getUserFetch.response.status === 200)) {
-            _context3.next = 14;
+            _context5.n = 3;
             break;
           }
           dispatch({
             type: UPDATE_USER,
             payload: getUserFetch.data.user
           });
-          return _context3.abrupt("return", true);
-        case 14:
+          return _context5.a(2, true);
+        case 3:
           console.error('Update user error', getUserFetch.data.message);
-          return _context3.abrupt("return", false);
-        case 16:
-          _context3.next = 22;
+          return _context5.a(2, false);
+        case 4:
+          _context5.n = 6;
           break;
-        case 18:
-          _context3.prev = 18;
-          _context3.t0 = _context3["catch"](5);
-          console.error('Update user error', _context3.t0);
-          return _context3.abrupt("return", false);
-        case 22:
-        case "end":
-          return _context3.stop();
+        case 5:
+          _context5.p = 5;
+          _t5 = _context5.v;
+          console.error('Update user error', _t5);
+          return _context5.a(2, false);
+        case 6:
+          return _context5.a(2);
       }
-    }, _callee3, null, [[5, 18]]);
+    }, _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__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
+  _sendEmailVerificationAction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(_ref6) {
     var dispatch, domainName, token, sendEmailFetch;
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+    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
@@ -887,13 +740,13 @@ function _sendEmailVerificationAction() {
               message: 'Sending email verification...'
             }
           });
-          _context4.prev = 3;
-          _context4.next = 6;
+          _context6.p = 1;
+          _context6.n = 2;
           return sendEmailVerificationAPI(domainName, token);
-        case 6:
-          sendEmailFetch = _context4.sent;
+        case 2:
+          sendEmailFetch = _context6.v;
           if (!(sendEmailFetch.response.status === 200)) {
-            _context4.next = 13;
+            _context6.n = 3;
             break;
           }
           dispatch({
@@ -907,8 +760,8 @@ function _sendEmailVerificationAction() {
             type: SET_SEND_EMAIL_VERIFICATION_IS_LOADING,
             payload: false
           });
-          return _context4.abrupt("return", true);
-        case 13:
+          return _context6.a(2, true);
+        case 3:
           dispatch({
             type: SET_SEND_EMAIL_VERIFICATION_STATUS,
             payload: {
@@ -920,13 +773,12 @@ function _sendEmailVerificationAction() {
             type: SET_SEND_EMAIL_VERIFICATION_IS_LOADING,
             payload: false
           });
-          return _context4.abrupt("return", false);
-        case 16:
-          _context4.next = 23;
+          return _context6.a(2, false);
+        case 4:
+          _context6.n = 6;
           break;
-        case 18:
-          _context4.prev = 18;
-          _context4.t0 = _context4["catch"](3);
+        case 5:
+          _context6.p = 5;
           dispatch({
             type: SET_SEND_EMAIL_VERIFICATION_STATUS,
             payload: {
@@ -938,107 +790,68 @@ function _sendEmailVerificationAction() {
             type: SET_SEND_EMAIL_VERIFICATION_IS_LOADING,
             payload: false
           });
-          return _context4.abrupt("return", false);
-        case 23:
-        case "end":
-          return _context4.stop();
+          return _context6.a(2, false);
+        case 6:
+          return _context6.a(2);
       }
-    }, _callee4, null, [[3, 18]]);
+    }, _callee6, null, [[1, 5]]);
   }));
   return _sendEmailVerificationAction.apply(this, arguments);
 }
-function checkTokenAction(_x5) {
-  return _checkTokenAction.apply(this, arguments);
-}
-function _checkTokenAction() {
-  _checkTokenAction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref6) {
-    var dispatch, domainName, token, refreshAccessTokenFetch;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
-        case 0:
-          dispatch = _ref6.dispatch, domainName = _ref6.domainName, token = _ref6.token;
-          _context5.prev = 1;
-          _context5.next = 4;
-          return refreshAccessTokenAPI(domainName, token);
-        case 4:
-          refreshAccessTokenFetch = _context5.sent;
-          if (!(refreshAccessTokenFetch.response.status === 200)) {
-            _context5.next = 10;
-            break;
-          }
-          if (refreshAccessTokenFetch.data.accessToken) {
-            localStorage.setItem(TOKEN_LS, refreshAccessTokenFetch.data.accessToken);
-          }
-          return _context5.abrupt("return");
-        case 10:
-          window.location.replace(getClientBasePath() + "/" + domainName + "/" + routes.signin);
-          return _context5.abrupt("return", resetUser(dispatch));
-        case 12:
-          _context5.next = 18;
-          break;
-        case 14:
-          _context5.prev = 14;
-          _context5.t0 = _context5["catch"](1);
-          resetUser(dispatch);
-          throw _context5.t0;
-        case 18:
-        case "end":
-          return _context5.stop();
-      }
-    }, _callee5, null, [[1, 14]]);
-  }));
-  return _checkTokenAction.apply(this, arguments);
-}
-function getAccessTokenAction(_x6) {
+function getAccessTokenAction(_x7) {
   return _getAccessTokenAction.apply(this, arguments);
 }
 ///////////////////////////////////////////
 //////////////////////////////////////////
 function _getAccessTokenAction() {
-  _getAccessTokenAction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref7) {
-    var dispatch, domainName, token_ls, refreshAccessTokenFetch, _refreshAccessTokenFe;
-    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+  _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.next = 4;
+            _context7.n = 1;
             break;
           }
-          return _context6.abrupt("return");
-        case 4:
-          _context6.prev = 4;
-          _context6.next = 7;
-          return refreshAccessTokenAPI(domainName, token_ls);
-        case 7:
-          refreshAccessTokenFetch = _context6.sent;
-          if (!(refreshAccessTokenFetch.response.status === 200)) {
-            _context6.next = 12;
+          return _context7.a(2, 'token-not-found');
+        case 1:
+          _context7.p = 1;
+          payloadB64 = token_ls.split('.')[1];
+          if (!payloadB64) {
+            _context7.n = 3;
             break;
           }
-          return _context6.abrupt("return", (_refreshAccessTokenFe = refreshAccessTokenFetch.data.accessToken) != null ? _refreshAccessTokenFe : token_ls);
-        case 12:
-          resetUser(dispatch);
-          return _context6.abrupt("return", 'token-not-found');
-        case 14:
-          _context6.next = 20;
+          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:
+          _context7.n = 5;
           break;
-        case 16:
-          _context6.prev = 16;
-          _context6.t0 = _context6["catch"](4);
-          resetUser(dispatch);
-          throw _context6.t0;
-        case 20:
-        case "end":
-          return _context6.stop();
+        case 4:
+          _context7.p = 4;
+        case 5:
+          return _context7.a(2, token_ls);
       }
-    }, _callee6, null, [[4, 16]]);
+    }, _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: {
@@ -1049,216 +862,168 @@ 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 = useReducer(userReducer, initialDauthState),
     dauthState = _useReducer[0],
     dispatch = _useReducer[1];
-  var isValidTsk = useCallback( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(token) {
-      var verifyToken;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return verifyTokenAPI({
-              domainName: domainName,
-              token: token,
-              tsk: tsk
-            });
-          case 3:
-            verifyToken = _context.sent;
-            if (!(verifyToken.response.status !== 200)) {
-              _context.next = 6;
-              break;
-            }
-            return _context.abrupt("return", false);
-          case 6:
-            return _context.abrupt("return", true);
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](0);
-            return _context.abrupt("return", false);
-          case 12:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[0, 9]]);
-    }));
-    return function (_x) {
-      return _ref.apply(this, arguments);
-    };
-  }(), [domainName, tsk]);
-  // Check token periodically
-  useEffect(function () {
-    if (!dauthState.isAuthenticated) return;
-    var interval = setInterval( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var token_ls, isValid;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            token_ls = localStorage.getItem(TOKEN_LS);
-            if (token_ls) {
-              _context2.next = 3;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 3:
-            _context2.next = 5;
-            return isValidTsk(token_ls);
-          case 5:
-            isValid = _context2.sent;
-            if (!isValid) {
-              _context2.next = 10;
-              break;
-            }
-            return _context2.abrupt("return", checkTokenAction({
-              dispatch: dispatch,
-              domainName: domainName,
-              token: token_ls
-            }));
-          case 10:
-            setLogoutAction({
-              dispatch: dispatch
-            });
-            throw new Error('Ask value in DauthProvider is not valid');
-          case 12:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    })), 1000 * 60 * 5);
-    return function () {
-      return clearInterval(interval);
-    };
-  }, [dauthState.isAuthenticated, isValidTsk]);
+  var refreshTimerRef = useRef(null);
+  // Schedule next proactive refresh based on access token expiry
+  var scheduleRefresh = 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;
+              return refreshSessionAction({
+                dispatch: dispatch,
+                domainName: domainName
+              });
+            case 1:
+              scheduleRefresh();
+            case 2:
+              return _context2.a(2);
+          }
+        }, _callee2);
+      })), 5 * 60 * 1000);
+    }
+  }, [domainName]);
   // Catch login redirect
   useEffect(function () {
-    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var queryString, urlParams, token_url, isValid;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+      var queryString, urlParams, token_url, refresh_url;
+      return _regenerator().w(function (_context3) {
+        while (1) switch (_context3.n) {
           case 0:
             queryString = window.location.search;
             if (queryString) {
-              _context3.next = 3;
+              _context3.n = 1;
               break;
             }
-            return _context3.abrupt("return");
-          case 3:
+            return _context3.a(2);
+          case 1:
             urlParams = new URLSearchParams(queryString);
             token_url = urlParams.get(TOKEN_LS);
-            if (!(token_url && !dauthState.isAuthenticated)) {
-              _context3.next = 15;
-              break;
-            }
-            _context3.next = 8;
-            return isValidTsk(token_url);
-          case 8:
-            isValid = _context3.sent;
-            if (!isValid) {
-              _context3.next = 13;
+            refresh_url = urlParams.get(REFRESH_TOKEN_LS);
+            if (!(token_url && refresh_url && !dauthState.isAuthenticated)) {
+              _context3.n = 2;
               break;
             }
-            return _context3.abrupt("return", setDauthStateAction({
+            return _context3.a(2, setDauthStateAction({
               dispatch: dispatch,
               token: token_url,
+              refreshToken: refresh_url,
               domainName: domainName
             }));
-          case 13:
-            setLogoutAction({
-              dispatch: dispatch
-            });
-            throw new Error('Ask value in DauthProvider is not valid');
-          case 15:
-          case "end":
-            return _context3.stop();
+          case 2:
+            return _context3.a(2);
         }
       }, _callee3);
     }))();
   }, []);
   // Auto Login
   useEffect(function () {
-    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var token_ls, isValid;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
+      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.next = 13;
-              break;
-            }
-            _context4.next = 4;
-            return isValidTsk(token_ls);
-          case 4:
-            isValid = _context4.sent;
-            if (!isValid) {
-              _context4.next = 9;
+            refreshToken = localStorage.getItem(REFRESH_TOKEN_LS);
+            if (!(refreshToken && !dauthState.isAuthenticated)) {
+              _context4.n = 1;
               break;
             }
-            return _context4.abrupt("return", setAutoLoginAction({
+            return _context4.a(2, setAutoLoginAction({
               dispatch: dispatch,
-              token_ls: token_ls,
               domainName: domainName
             }));
-          case 9:
-            setLogoutAction({
-              dispatch: dispatch
-            });
-            throw new Error('Ask value in DauthProvider is not valid');
-          case 11:
-            _context4.next = 14;
-            break;
-          case 13:
-            return _context4.abrupt("return", dispatch({
+          case 1:
+            return _context4.a(2, dispatch({
               type: SET_IS_LOADING,
               payload: {
                 isLoading: false
               }
             }));
-          case 14:
-          case "end":
-            return _context4.stop();
+          case 2:
+            return _context4.a(2);
         }
       }, _callee4);
     }))();
   }, []);
+  // Schedule proactive refresh when authenticated
+  useEffect(function () {
+    if (dauthState.isAuthenticated) {
+      scheduleRefresh();
+    }
+    return function () {
+      if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current);
+    };
+  }, [dauthState.isAuthenticated, scheduleRefresh]);
   var loginWithRedirect = useCallback(function () {
     return window.location.replace(getClientBasePath() + "/" + domainName + "/" + routes.signin);
   }, [domainName]);
   var logout = useCallback(function () {
+    if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current);
     return setLogoutAction({
-      dispatch: dispatch
+      dispatch: dispatch,
+      domainName: domainName
     });
-  }, []);
-  var getAccessToken = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+  }, [domainName]);
+  var getAccessToken = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
     var token;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+    return _regenerator().w(function (_context5) {
+      while (1) switch (_context5.n) {
         case 0:
-          _context5.next = 2;
+          _context5.n = 1;
           return getAccessTokenAction({
             dispatch: dispatch,
             domainName: domainName
           });
-        case 2:
-          token = _context5.sent;
-          return _context5.abrupt("return", token);
-        case 4:
-        case "end":
-          return _context5.stop();
+        case 1:
+          token = _context5.v;
+          return _context5.a(2, token);
       }
     }, _callee5);
   })), [domainName]);
-  var updateUser = useCallback( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref6) {
+  var updateUser = useCallback(/*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(_ref6) {
       var name, lastname, nickname, telPrefix, telSuffix, language, avatar, token_ls, user;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      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);
@@ -1271,22 +1036,19 @@ var DauthProvider = function DauthProvider(props) {
               language: language,
               avatar: avatar
             };
-            _context6.next = 5;
+            _context6.n = 1;
             return setUpdateUserAction({
               dispatch: dispatch,
               domainName: domainName,
               user: user,
               token: token_ls
             });
-          case 5:
-            return _context6.abrupt("return", _context6.sent);
-          case 6:
-          case "end":
-            return _context6.stop();
+          case 1:
+            return _context6.a(2, _context6.v);
         }
       }, _callee6);
     }));
-    return function (_x2) {
+    return function (_x) {
       return _ref7.apply(this, arguments);
     };
   }(), [domainName]);
@@ -1295,29 +1057,26 @@ var DauthProvider = function DauthProvider(props) {
     if (!token_ls) return;
     return window.location.replace(getClientBasePath() + "/" + domainName + "/" + routes.updateUser + "/" + token_ls);
   }, [domainName]);
-  var sendEmailVerification = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+  var sendEmailVerification = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
     var token_ls;
-    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-      while (1) switch (_context7.prev = _context7.next) {
+    return _regenerator().w(function (_context7) {
+      while (1) switch (_context7.n) {
         case 0:
           token_ls = localStorage.getItem(TOKEN_LS);
           if (token_ls) {
-            _context7.next = 3;
+            _context7.n = 1;
             break;
           }
-          return _context7.abrupt("return", false);
-        case 3:
-          _context7.next = 5;
+          return _context7.a(2, false);
+        case 1:
+          _context7.n = 2;
           return sendEmailVerificationAction({
             dispatch: dispatch,
             domainName: domainName,
             token: token_ls
           });
-        case 5:
-          return _context7.abrupt("return", _context7.sent);
-        case 6:
-        case "end":
-          return _context7.stop();
+        case 2:
+          return _context7.a(2, _context7.v);
       }
     }, _callee7);
   })), [domainName]);