acsi-core 1.2.28 → 1.2.31

package/dist/containers/Login/apiClient/index.d.ts

@@ -1,5 +1,5 @@
-export declare const getGoogleClientId: () => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const apiLoginGoogle: (body: any) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const apiSendEmailCode: (body: any) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const apiCheckEmailCode: (params: any) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const apiGetImage: () => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const getGoogleClientId: () => Promise<import("axios").AxiosResponse<any, any, {}>>;
+export declare const apiLoginGoogle: (body: any) => Promise<import("axios").AxiosResponse<any, any, {}>>;
+export declare const apiSendEmailCode: (body: any) => Promise<import("axios").AxiosResponse<any, any, {}>>;
+export declare const apiCheckEmailCode: (params: any) => Promise<import("axios").AxiosResponse<any, any, {}>>;
+export declare const apiGetImage: () => Promise<import("axios").AxiosResponse<any, any, {}>>;

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, setLoadingPage, setIsFirstCalendar } from "./redux/commons/action";
-import { BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, OPENSALT_BASE_URL, ORGANIZATION_TEAM, ORGANIZATION_TENANT, TIMEZONE_ID, UID_TENANT } from "./utils/constants";
+import { BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, OPENSALT_BASE_URL, ORGANIZATION_TEAM, ORGANIZATION_TENANT, TIMEZONE_ID } from "./utils/constants";
 import Login from "./containers/Login/views/Login";
 import store from "./store";
 import getAccessToken from "./utils/getAccessToken";
@@ -32,4 +32,4 @@ import getTimeZoneId from "./utils/getTimeZoneId";
 import timeSpanToLocalMoment from "./utils/timeSpanToLocalMoment";
 import timeSpanToUtc from "./utils/timeSpanToUtc";
 import Cookies from "js-cookie";
-export { setLoading, setLoadingPage, setIsFirstCalendar, BASE_URL, OPENSALT_BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, ORGANIZATION_TEAM, ORGANIZATION_TENANT, TIMEZONE_ID, UID_TENANT, firstCheckToken, getImageUrl, Login, utcToLocalTime, timeSpanToUtc, getTimeZoneId, timeSpanToLocalMoment, 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, MarkdownLatexRender, RichContentRenderer, CustomSelect, CustomAsyncSelect, CustomCreatable, CustomSelectOption, GoogleOAuthProvider, useAmplitude, AmplitudeEvent, initializeAmplitude, initSentry };
+export { setLoading, setLoadingPage, setIsFirstCalendar, BASE_URL, OPENSALT_BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, ORGANIZATION_TEAM, ORGANIZATION_TENANT, TIMEZONE_ID, firstCheckToken, getImageUrl, Login, utcToLocalTime, timeSpanToUtc, getTimeZoneId, timeSpanToLocalMoment, 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, MarkdownLatexRender, RichContentRenderer, CustomSelect, CustomAsyncSelect, CustomCreatable, CustomSelectOption, GoogleOAuthProvider, useAmplitude, AmplitudeEvent, initializeAmplitude, initSentry };

package/dist/index.js

@@ -89,7 +89,6 @@ var COLORS = {
 var ORGANIZATION_TENANT = "ORGANIZATION_TENANT";
 var ORGANIZATION_TEAM = "ORGANIZATION_TEAM";
 var TIMEZONE_ID = "TIMEZONE_ID";
-var UID_TENANT = "uid";
 
 var styleGlobal = {"signup_wrap":"_1KLz9","box-signin":"_2Jo1o","signin_title":"_3egBO","signup_link":"_1DoIT","google_button":"_34hK_","microsoft_button":"_19ESb","box-field":"_2e9xO","box-input":"_3zXRp","box-text":"_8NJga","box-button-email":"_21FPk","box-signin-container":"_1QERu","box-signin-text":"_2-znH","box-signin-logo":"_1aB2m","box-right":"_3qndF","image-slideshow":"_1aM7m","active":"_Vx1zf","box-right-body":"_JzdCr","box-right-footer":"_19aCA","pr-30":"_2HB5r","width-400":"_4ehXP"};
 
@@ -1722,7 +1721,6 @@ var apiUpload = axios.create({
 [api, apiUpload].forEach(function (i) {
   return i.interceptors.request.use(function (config) {
     var token = getAccessToken();
-    var organizationTenant = localStorage.getItem(ORGANIZATION_TENANT);
     if (token) {
       config.headers.Authorization = "Bearer " + token;
       localStorage.setItem("LAST_TIME_REQUETST", moment().utc().format("YYYY-MM-DD HH:mm:ss"));
@@ -1731,8 +1729,9 @@ var apiUpload = axios.create({
     if (imPersonate) {
       config.headers.ImPersonate = imPersonate;
     }
-    if (organizationTenant) {
-      config.headers["X-Tenant-ID"] = organizationTenant;
+    var tenantId = localStorage.getItem(ORGANIZATION_TENANT);
+    if (tenantId) {
+      config.headers["X-TenantID"] = tenantId;
     }
     return config;
   }, function (error) {
@@ -1743,7 +1742,10 @@ var apiUpload = axios.create({
   return i.interceptors.response.use(function (response) {
     return response;
   }, function (error) {
-    if ((error.response.status == 403 || error.response.status == 401) && window.location.pathname !== '/login') {
+    if (error.response.status === 401) {
+      window.location.href = "/login";
+    }
+    if (error.response.status == 403) {
       var hostname = window.location.hostname;
       var parts = hostname.split('.');
       var domain = parts.slice(-2).join('.');
@@ -1751,7 +1753,6 @@ var apiUpload = axios.create({
       localStorage.removeItem(ORGANIZATION_TENANT);
       localStorage.removeItem(TIMEZONE_ID);
       localStorage.removeItem(ORGANIZATION_TEAM);
-      localStorage.removeItem(UID_TENANT);
       Cookies.remove('auth', {
         path: '/',
         domain: "." + domain
@@ -1837,8 +1838,7 @@ var msalConfig = function msalConfig(clientId, redirectUri) {
 };
 
 var BlockLogin = function BlockLogin(_ref) {
-  var onNavigate = _ref.onNavigate,
-    role = _ref.role,
+  var role = _ref.role,
     hiddenSignup = _ref.hiddenSignup,
     email = _ref.email,
     setEmail = _ref.setEmail,
@@ -1954,9 +1954,15 @@ var BlockLogin = function BlockLogin(_ref) {
                   var redirectUrl = getRedirectUrl(authResult.data.role);
                   window.location.href = redirectUrl + "/dashboard";
                   dispatch(setLoading(false));
+                } else {
+                  var _authResult$data2, _authResult$data2$rol, _authResult$data3;
+                  localStorage.setItem(ACCESS_TOKEN, tokenJWT);
+                  var domain = "/teacher";
+                  if ((_authResult$data2 = authResult.data) !== null && _authResult$data2 !== void 0 && (_authResult$data2$rol = _authResult$data2.roles) !== null && _authResult$data2$rol !== void 0 && _authResult$data2$rol.includes("Admin") || ((_authResult$data3 = authResult.data) === null || _authResult$data3 === void 0 ? void 0 : _authResult$data3.role) === "Admin") {
+                    domain = "/admin";
+                  }
+                  window.location.href = domain + "/dashboard";
                 }
-                localStorage.setItem(ACCESS_TOKEN, tokenJWT);
-                onNavigate("/dashboard");
                 dispatch(setLoading(false));
               });
             }
@@ -2005,8 +2011,8 @@ var BlockLogin = function BlockLogin(_ref) {
                 };
                 dispatch(setLoading(true));
                 return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (authResult) {
-                  var _authResult$data2;
-                  if (((_authResult$data2 = authResult.data) === null || _authResult$data2 === void 0 ? void 0 : _authResult$data2.id) == null) {
+                  var _authResult$data4;
+                  if (((_authResult$data4 = authResult.data) === null || _authResult$data4 === void 0 ? void 0 : _authResult$data4.id) == null) {
                     dispatch(setLoading(false));
                     alert("Please contact admin.");
                     return;
@@ -2041,9 +2047,15 @@ var BlockLogin = function BlockLogin(_ref) {
                     var redirectUrl = getRedirectUrl(authResult.data.role);
                     window.location.href = redirectUrl + "/dashboard";
                     dispatch(setLoading(false));
+                  } else {
+                    var _authResult$data5, _authResult$data5$rol, _authResult$data6;
+                    localStorage.setItem(ACCESS_TOKEN, tokenJWT);
+                    var domain = "/teacher";
+                    if ((_authResult$data5 = authResult.data) !== null && _authResult$data5 !== void 0 && (_authResult$data5$rol = _authResult$data5.roles) !== null && _authResult$data5$rol !== void 0 && _authResult$data5$rol.includes("Admin") || ((_authResult$data6 = authResult.data) === null || _authResult$data6 === void 0 ? void 0 : _authResult$data6.role) === "Admin") {
+                      domain = "/admin";
+                    }
+                    window.location.href = domain + "/dashboard";
                   }
-                  localStorage.setItem(ACCESS_TOKEN, tokenJWT);
-                  onNavigate("/dashboard");
                   dispatch(setLoading(false));
                 });
               }
@@ -2508,9 +2520,14 @@ var useLogin = function useLogin(onNavigate, trackEvent) {
               if ((_data$data$roles = data.data.roles) !== null && _data$data$roles !== void 0 && _data$data$roles.includes("Admin")) {
                 domain = ADMIN_ORIGIN;
               }
-              window.location.href = domain + "/dashboard";
+              onNavigate(domain + "/dashboard");
             } else {
-              onNavigate("/dashboard");
+              var _data$data$roles2;
+              var _domain = "/teacher";
+              if ((_data$data$roles2 = data.data.roles) !== null && _data$data$roles2 !== void 0 && _data$data$roles2.includes("Admin")) {
+                _domain = "/admin";
+              }
+              onNavigate(_domain + "/dashboard");
             }
           } else {
             reactToastify.toast.error("The code is not correct. Please check again.");
@@ -3677,7 +3694,6 @@ exports.ORGANIZATION_TEAM = ORGANIZATION_TEAM;
 exports.ORGANIZATION_TENANT = ORGANIZATION_TENANT;
 exports.RichContentRenderer = RichContentRenderer;
 exports.TIMEZONE_ID = TIMEZONE_ID;
-exports.UID_TENANT = UID_TENANT;
 exports.api = api;
 exports.apiUpload = apiUpload;
 exports.firstCheckToken = firstCheckToken;