acsi-core 0.1.34 → 0.1.35

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 declare const historyCore: import("history").History<unknown>;
 import { setLoading, setAlert, setTenant, setAddTenant, setTeam, setUser, setMenuCollapse, setIsRefetchSidebar } from "./redux/commons/action";
-import { BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, OPENSALT_BASE_URL } from "./utils/constants";
+import { BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, OPENSALT_BASE_URL, ORGANIZATION_TEAM, ORGANIZATION_TENANT } from "./utils/constants";
 import Login from "./containers/Login/views/Login";
 import store from "./store";
 import getAccessToken from "./utils/getAccessToken";
@@ -21,4 +21,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, 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, 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

@@ -82,6 +82,8 @@ var COLORS = {
   red: "#ce3636",
   lightYellow: "#fff5ce"
 };
+var ORGANIZATION_TENANT = "ORGANIZATION_TENANT";
+var ORGANIZATION_TEAM = "ORGANIZATION_TEAM";
 
 var styleGlobal = {"signup_wrap":"_1KLz9","box-signin":"_2Jo1o","signin_title":"_3egBO","signup_link":"_1DoIT","google_button":"_34hK_","box-field":"_2e9xO","box-input":"_3zXRp","box-button-email":"_21FPk","box-signin-container":"_1QERu","box-signin-text":"_2-znH","box-signin-logo":"_1aB2m","box-right":"_3qndF","box-right-body":"_JzdCr","box-right-footer":"_19aCA","pr-30":"_2HB5r"};
 
@@ -646,6 +648,25 @@ var Loading = function Loading() {
   }))) : 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";
@@ -722,9 +743,15 @@ 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 useGoogleSignOut = function useGoogleSignOut(props) {
   var dispatch = reactRedux.useDispatch();
@@ -762,6 +789,17 @@ 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,
@@ -774,9 +812,23 @@ var LayoutContext = function LayoutContext(_ref) {
   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 _temp2 = function _temp2() {
+      var _temp3 = function _temp3() {
         dispatch(setLoading(false));
       };
       var token = getAccessToken();
@@ -785,19 +837,25 @@ var LayoutContext = function LayoutContext(_ref) {
         return Promise.resolve();
       }
       dispatch(setLoading(true));
-      var _temp = _catch(function () {
-        return Promise.resolve(getInfo(role)).then(function (info) {
-          if (!info) {}
-          dispatch(setUser(info.data));
+      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(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
+      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2));
     } catch (e) {
       return Promise.reject(e);
     }
   };
   React.useEffect(function () {
-    loadInfo();
+    checkAuthentication();
   }, []);
   return React__default.createElement(React.Fragment, null, children);
 };
@@ -960,25 +1018,6 @@ 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"];
@@ -2096,6 +2135,8 @@ exports.Loading = Loading;
 exports.Login = Login;
 exports.NotFound = NotFound;
 exports.OPENSALT_BASE_URL = OPENSALT_BASE_URL;
+exports.ORGANIZATION_TEAM = ORGANIZATION_TEAM;
+exports.ORGANIZATION_TENANT = ORGANIZATION_TENANT;
 exports.api = api$1;
 exports.apiUpload = apiUpload$1;
 exports.getAccessToken = getAccessToken$1;