acsi-core 0.1.61 → 0.1.63

package/dist/index.d.ts

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

package/dist/index.js

@@ -263,11 +263,8 @@ var BlockLogin = function BlockLogin(_ref) {
                   alert("Please contact admin.");
                   return;
                 }
+                localStorage.clear();
                 var tokenJWT = authResult.data.token;
-                CookieService.setAuthCookie({
-                  token: tokenJWT,
-                  expiresAt: Date.now() + 24 * 60 * 60 * 1000
-                });
                 trackEvent === null || trackEvent === void 0 ? void 0 : trackEvent({
                   eventName: exports.AmplitudeEvent.LOGIN,
                   eventProperties: {
@@ -279,6 +276,10 @@ var BlockLogin = function BlockLogin(_ref) {
                   }
                 });
                 if (role === "LandingPage") {
+                  CookieService.setAuthCookie({
+                    token: tokenJWT,
+                    expiresAt: Date.now() + 24 * 60 * 60 * 1000
+                  });
                   var getRedirectUrl = function getRedirectUrl(role) {
                     switch (role) {
                       case "Admin":
@@ -604,6 +605,7 @@ var useLogin = function useLogin(onNavigate, trackEvent) {
         })).then(function (res) {
           var data = res.data;
           if (data.status == 1) {
+            localStorage.clear();
             var tokenJWT = data.data.token;
             localStorage.setItem(ACCESS_TOKEN, tokenJWT);
             trackEvent === null || trackEvent === void 0 ? void 0 : trackEvent({
@@ -1017,6 +1019,25 @@ var firstCheckToken = function firstCheckToken() {
   }));
 };
 
+var getImageUrl = function getImageUrl(imageUrl) {
+  try {
+    try {
+      if (!!imageUrl) {
+        var imageTrimmed = imageUrl.trim();
+        if (imageTrimmed.startsWith('http://') || imageTrimmed.startsWith('https://')) {
+          return Promise.resolve(imageTrimmed);
+        }
+        return Promise.resolve(BASE_URL + "/images/" + imageTrimmed);
+      }
+      return Promise.resolve("/images/avatar-default.png");
+    } catch (err) {
+      return Promise.resolve("/images/avatar-default.png");
+    }
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
 var NotFound = function NotFound() {
   return React__default.createElement("div", {
     className: "not-found"
@@ -1078,10 +1099,7 @@ var useGoogleSignOut = function useGoogleSignOut(props) {
     signOut = _useGoogleLogout.signOut,
     loaded = _useGoogleLogout.loaded;
   var handleSignOut = function handleSignOut() {
-    localStorage.removeItem("USER_INFORMATION");
-    localStorage.removeItem(ACCESS_TOKEN);
-    localStorage.removeItem(ORGANIZATION_TENANT);
-    localStorage.removeItem(ORGANIZATION_TEAM);
+    localStorage.clear();
     try {
       signOut();
     } catch (error) {
@@ -2666,6 +2684,7 @@ exports.apiUpload = apiUpload$1;
 exports.firstCheckToken = firstCheckToken;
 exports.getAccessToken = getAccessToken$1;
 exports.getErrorMessage = getErrorMessage;
+exports.getImageUrl = getImageUrl;
 exports.historyCore = historyCore;
 exports.initializeAmplitude = initializeAmplitude;
 exports.setAddTenant = setAddTenant;