acsi-core 0.1.35 → 0.1.37

package/dist/index.d.ts

@@ -4,6 +4,7 @@ import { BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, OPENSALT_BASE_URL, ORGANIZ
 import Login from "./containers/Login/views/Login";
 import store from "./store";
 import getAccessToken from "./utils/getAccessToken";
+import firstCheckToken from "./utils/firstCheckToken";
 import NotFound from "./components/Commons/NotFound";
 import Loading from "./components/Loading/Loading";
 import LayoutContext from "./layouts/LayoutContext";
@@ -21,4 +22,4 @@ import CustomSelect from "./components/Selects/CustomSelect";
 import CustomAsyncSelect from "./components/Selects/CustomAsyncSelect";
 import CustomCreatable from "./components/Selects/CustomCreatable";
 import CustomSelectOption from "./components/Selects/CustomSelectOption";
-export { setLoading, BASE_URL, OPENSALT_BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, ORGANIZATION_TEAM, ORGANIZATION_TENANT, Login, getAccessToken, store, historyCore, setAlert, setUser, setTenant, setAddTenant, setTeam, setMenuCollapse, setIsRefetchSidebar, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, ToastContainer, toast, Role, CustomPagination, useGoogleSignOut, CoreButton, CoreInput, CoreSelect, CoreCheckbox, CoreRadio, CoreError, CoreModal, CoreRange, CoreTextArea, CoreSearch, CoreSelectCompact, CoreInputCompact, CoreTitleInput, getErrorMessage, CustomSelect, CustomAsyncSelect, CustomCreatable, CustomSelectOption, GoogleOAuthProvider };
+export { setLoading, BASE_URL, OPENSALT_BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, ORGANIZATION_TEAM, ORGANIZATION_TENANT, firstCheckToken, Login, getAccessToken, store, historyCore, setAlert, setUser, setTenant, setAddTenant, setTeam, setMenuCollapse, setIsRefetchSidebar, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, ToastContainer, toast, Role, CustomPagination, useGoogleSignOut, CoreButton, CoreInput, CoreSelect, CoreCheckbox, CoreRadio, CoreError, CoreModal, CoreRange, CoreTextArea, CoreSearch, CoreSelectCompact, CoreInputCompact, CoreTitleInput, getErrorMessage, CustomSelect, CustomAsyncSelect, CustomCreatable, CustomSelectOption, GoogleOAuthProvider };

package/dist/index.js

@@ -605,68 +605,6 @@ var getAccessToken$1 = (function () {
   }
 });
 
-var NotFound = function NotFound() {
-  return React__default.createElement("div", {
-    className: "not-found"
-  }, React__default.createElement("div", {
-    className: "clearfix"
-  }, React__default.createElement("h1", {
-    className: "float-left display-3 mr-4"
-  }, "404"), React__default.createElement("div", {
-    className: "float-left"
-  }, React__default.createElement("h4", {
-    className: "pt-3"
-  }, "Oops! You are lost."), React__default.createElement("p", {
-    className: "text-muted mb-2"
-  }, "The page you are looking for was not found."), React__default.createElement("div", null))));
-};
-
-var loadingStyle = {
-  minWidth: "100vw",
-  minHeight: "100vh",
-  position: "fixed",
-  top: 0,
-  left: 0,
-  zIndex: 999999999,
-  backgroundColor: "rgba(0, 0, 0, 0.4)",
-  display: "flex",
-  justifyContent: "center",
-  alignItems: "center"
-};
-var Loading = function Loading() {
-  var isLoading = reactRedux.useSelector(function (state) {
-    return state.common.isLoading;
-  });
-  localStorage.setItem("LAST_TIME_REQUETST", moment().utc().format("YYYY-MM-DD HH:mm:ss"));
-  return isLoading ? React__default.createElement("div", {
-    style: loadingStyle
-  }, React__default.createElement("div", {
-    className: "spinner-border text-secondary",
-    role: "status"
-  }, React__default.createElement("span", {
-    className: "sr-only"
-  }))) : null;
-};
-
-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 _objectWithoutPropertiesLoose(r, e) {
-  if (null == r) return {};
-  var t = {};
-  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (-1 !== e.indexOf(n)) continue;
-    t[n] = r[n];
-  }
-  return t;
-}
-
 // A type of promise-like that resolves synchronously and supports only one observer
 
 const _iteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator"))) : "@@iterator";
@@ -744,15 +682,66 @@ var apiUpload$1 = axios.create({
 });
 
 var AUTH_URL = BASE_URL + "/api/auth";
-var getInfo = function getInfo(role) {
-  return api$1.get(BASE_URL + "/api/Auth/info?role=" + role);
-};
 var checkToken = function checkToken(token) {
   return api$1.post(AUTH_URL + "/checktoken", {
     token: token
   });
 };
 
+var firstCheckToken = function firstCheckToken() {
+  return Promise.resolve(_catch(function () {
+    var token = getAccessToken$1();
+    return token ? Promise.resolve(checkToken(token)).then(function (tokenStatus) {
+      return tokenStatus.data ? true : false;
+    }) : false;
+  }, function () {
+    return false;
+  }));
+};
+
+var NotFound = function NotFound() {
+  return React__default.createElement("div", {
+    className: "not-found"
+  }, React__default.createElement("div", {
+    className: "clearfix"
+  }, React__default.createElement("h1", {
+    className: "float-left display-3 mr-4"
+  }, "404"), React__default.createElement("div", {
+    className: "float-left"
+  }, React__default.createElement("h4", {
+    className: "pt-3"
+  }, "Oops! You are lost."), React__default.createElement("p", {
+    className: "text-muted mb-2"
+  }, "The page you are looking for was not found."), React__default.createElement("div", null))));
+};
+
+var loadingStyle = {
+  minWidth: "100vw",
+  minHeight: "100vh",
+  position: "fixed",
+  top: 0,
+  left: 0,
+  zIndex: 999999999,
+  backgroundColor: "rgba(0, 0, 0, 0.4)",
+  display: "flex",
+  justifyContent: "center",
+  alignItems: "center"
+};
+var Loading = function Loading() {
+  var isLoading = reactRedux.useSelector(function (state) {
+    return state.common.isLoading;
+  });
+  localStorage.setItem("LAST_TIME_REQUETST", moment().utc().format("YYYY-MM-DD HH:mm:ss"));
+  return isLoading ? React__default.createElement("div", {
+    style: loadingStyle
+  }, React__default.createElement("div", {
+    className: "spinner-border text-secondary",
+    role: "status"
+  }, React__default.createElement("span", {
+    className: "sr-only"
+  }))) : null;
+};
+
 var useGoogleSignOut = function useGoogleSignOut(props) {
   var dispatch = reactRedux.useDispatch();
   var onLogoutSuccess = props.onLogoutSuccess,
@@ -789,73 +778,27 @@ var useGoogleSignOut = function useGoogleSignOut(props) {
   };
 };
 
-var firstCheckToken = function firstCheckToken() {
-  return Promise.resolve(_catch(function () {
-    var token = getAccessToken$1();
-    return token ? Promise.resolve(checkToken(token)).then(function (tokenStatus) {
-      return tokenStatus.data ? true : false;
-    }) : false;
-  }, function () {
-    return false;
-  }));
-};
-
 var LayoutContext = function LayoutContext(_ref) {
   var children = _ref.children,
-    role = _ref.role,
     onNavigate = _ref.onNavigate;
   var _useGoogleSignOut = useGoogleSignOut({
       onNavigate: onNavigate
     }),
     handleSignOut = _useGoogleSignOut.handleSignOut;
-  var dispatch = reactRedux.useDispatch();
   var resetAuth = function resetAuth() {
     handleSignOut();
   };
-  var checkAuthentication = function checkAuthentication() {
-    try {
-      var _temp = _catch(function () {
-        return Promise.resolve(firstCheckToken()).then(function (tokenStatus) {
-          tokenStatus ? loadInfo() : resetAuth();
-        });
-      }, function () {
-        resetAuth();
-      });
-      return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
   var loadInfo = function loadInfo() {
     try {
-      var _temp3 = function _temp3() {
-        dispatch(setLoading(false));
-      };
-      var token = getAccessToken();
-      if (!token) {
-        resetAuth();
-        return Promise.resolve();
-      }
-      dispatch(setLoading(true));
-      var _temp2 = _catch(function () {
-        return Promise.resolve(getInfo(role)).then(function (res) {
-          var userInfo = res.data;
-          if (localStorage.getItem(ORGANIZATION_TENANT) !== null && localStorage.getItem(ORGANIZATION_TEAM) !== null) {
-            userInfo = _extends({}, res.data, {
-              currentTenantId: parseInt(localStorage.getItem(ORGANIZATION_TENANT) || "0"),
-              currentTeamId: parseInt(localStorage.getItem(ORGANIZATION_TEAM) || "0")
-            });
-          }
-          dispatch(setUser(userInfo));
-        });
-      }, function () {});
-      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2));
+      var token = firstCheckToken();
+      !token && resetAuth();
+      return Promise.resolve();
     } catch (e) {
       return Promise.reject(e);
     }
   };
   React.useEffect(function () {
-    checkAuthentication();
+    loadInfo();
   }, []);
   return React__default.createElement(React.Fragment, null, children);
 };
@@ -1018,6 +961,25 @@ var CustomPagination = function CustomPagination(_ref) {
   })));
 };
 
+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 _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (-1 !== e.indexOf(n)) continue;
+    t[n] = r[n];
+  }
+  return t;
+}
+
 var styles = {"core-button":"_xvNBN","primary":"_U9Qyp","secondary":"_1VzMy","text":"_pZNuj","danger":"_2uYm1","light":"_wxH5S"};
 
 var _excluded = ["type", "children", "onClick", "icon", "disabled", "htmlType"];
@@ -2139,6 +2101,7 @@ exports.ORGANIZATION_TEAM = ORGANIZATION_TEAM;
 exports.ORGANIZATION_TENANT = ORGANIZATION_TENANT;
 exports.api = api$1;
 exports.apiUpload = apiUpload$1;
+exports.firstCheckToken = firstCheckToken;
 exports.getAccessToken = getAccessToken$1;
 exports.getErrorMessage = getErrorMessage;
 exports.historyCore = historyCore;