acsi-core 1.2.32 → 1.2.35

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/containers/Login/hooks/useLogin.d.ts

@@ -5,7 +5,7 @@ declare type LoginInfo = {
     captcha: string;
     rememberMe: boolean;
 };
-declare const useLogin: (_onNavigate: any, trackEvent?: ((props: any) => void) | undefined) => {
+declare const useLogin: (onNavigate: any, trackEvent?: ((props: any) => void) | undefined) => {
     defaultInfo: LoginInfo;
     openLogin: boolean;
     toggle: () => void;

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 } from "./utils/constants";
+import { BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, OPENSALT_BASE_URL, ORGANIZATION_TEAM, ORGANIZATION_TENANT, TIMEZONE_ID, UID_TENANT } from "./utils/constants";
 import Login from "./containers/Login/views/Login";
 import store from "./store";
 import getAccessToken from "./utils/getAccessToken";
@@ -32,4 +32,6 @@ 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, 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 };
+import sanitizeSrc from "./utils/sanitizeSrc";
+import sanitizeHTMLText from "./utils/sanitizeHTMLText";
+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, sanitizeHTMLText, sanitizeSrc };

package/dist/index.js

@@ -30,6 +30,7 @@ var Sentry = require('@sentry/react');
 var fa = require('react-icons/fa');
 var CreatableSelect = _interopDefault(require('react-select/creatable'));
 var moment$1 = _interopDefault(require('moment-timezone'));
+var DOMPurify = _interopDefault(require('dompurify'));
 
 var setLoading = toolkit.createAction("common/setLoading");
 var setLoadingPage = toolkit.createAction("common/setLoadingPage");
@@ -89,6 +90,7 @@ 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"};
 
@@ -1721,6 +1723,7 @@ 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"));
@@ -1729,9 +1732,8 @@ var apiUpload = axios.create({
     if (imPersonate) {
       config.headers.ImPersonate = imPersonate;
     }
-    var tenantId = localStorage.getItem(ORGANIZATION_TENANT);
-    if (tenantId) {
-      config.headers["X-TenantID"] = tenantId;
+    if (organizationTenant) {
+      config.headers["X-Tenant-ID"] = organizationTenant;
     }
     return config;
   }, function (error) {
@@ -1742,10 +1744,7 @@ var apiUpload = axios.create({
   return i.interceptors.response.use(function (response) {
     return response;
   }, function (error) {
-    if (error.response.status === 401) {
-      window.location.href = "/login";
-    }
-    if (error.response.status == 403) {
+    if ((error.response.status == 403 || error.response.status == 401) && window.location.pathname !== '/login') {
       var hostname = window.location.hostname;
       var parts = hostname.split('.');
       var domain = parts.slice(-2).join('.');
@@ -1753,6 +1752,7 @@ 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
@@ -1838,8 +1838,8 @@ var msalConfig = function msalConfig(clientId, redirectUri) {
 };
 
 var BlockLogin = function BlockLogin(_ref) {
-  var _ref$role = _ref.role,
-    role = _ref$role === void 0 ? "LandingPage" : _ref$role,
+  var onNavigate = _ref.onNavigate,
+    role = _ref.role,
     hiddenSignup = _ref.hiddenSignup,
     email = _ref.email,
     setEmail = _ref.setEmail,
@@ -1919,7 +1919,7 @@ var BlockLogin = function BlockLogin(_ref) {
               };
               dispatch(setLoading(true));
               return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (authResult) {
-                var _authResult$data, _authResult$data2, _authResult$data2$rol, _authResult$data3;
+                var _authResult$data;
                 if (((_authResult$data = authResult.data) === null || _authResult$data === void 0 ? void 0 : _authResult$data.id) == null) {
                   dispatch(setLoading(false));
                   alert("Please contact admin.");
@@ -1937,16 +1937,27 @@ var BlockLogin = function BlockLogin(_ref) {
                     timestamp: new Date().toISOString()
                   }
                 });
-                CookieService.setAuthCookie({
-                  token: tokenJWT,
-                  expiresAt: Date.now() + 24 * 60 * 60 * 1000
-                });
-                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";
+                if (role === "LandingPage") {
+                  CookieService.setAuthCookie({
+                    token: tokenJWT,
+                    expiresAt: Date.now() + 24 * 60 * 60 * 1000
+                  });
+                  var getRedirectUrl = function getRedirectUrl(role) {
+                    switch (role) {
+                      case "Admin":
+                        return ADMIN_ORIGIN;
+                      case "Teacher":
+                        return TEACHER_ORIGIN;
+                      default:
+                        return role + "." + REQUEST_ORIGIN;
+                    }
+                  };
+                  var redirectUrl = getRedirectUrl(authResult.data.role);
+                  window.location.href = redirectUrl + "/dashboard";
+                  dispatch(setLoading(false));
                 }
-                window.location.href = domain + "/dashboard";
+                localStorage.setItem(ACCESS_TOKEN, tokenJWT);
+                onNavigate("/dashboard");
                 dispatch(setLoading(false));
               });
             }
@@ -1995,8 +2006,8 @@ var BlockLogin = function BlockLogin(_ref) {
                 };
                 dispatch(setLoading(true));
                 return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (authResult) {
-                  var _authResult$data4, _authResult$data5, _authResult$data5$rol, _authResult$data6;
-                  if (((_authResult$data4 = authResult.data) === null || _authResult$data4 === void 0 ? void 0 : _authResult$data4.id) == null) {
+                  var _authResult$data2;
+                  if (((_authResult$data2 = authResult.data) === null || _authResult$data2 === void 0 ? void 0 : _authResult$data2.id) == null) {
                     dispatch(setLoading(false));
                     alert("Please contact admin.");
                     return;
@@ -2013,16 +2024,27 @@ var BlockLogin = function BlockLogin(_ref) {
                       timestamp: new Date().toISOString()
                     }
                   });
-                  CookieService.setAuthCookie({
-                    token: tokenJWT,
-                    expiresAt: Date.now() + 24 * 60 * 60 * 1000
-                  });
-                  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";
+                  if (role === "LandingPage") {
+                    CookieService.setAuthCookie({
+                      token: tokenJWT,
+                      expiresAt: Date.now() + 24 * 60 * 60 * 1000
+                    });
+                    var getRedirectUrl = function getRedirectUrl(role) {
+                      switch (role) {
+                        case "Admin":
+                          return ADMIN_ORIGIN;
+                        case "Teacher":
+                          return TEACHER_ORIGIN;
+                        default:
+                          return role + "." + REQUEST_ORIGIN;
+                      }
+                    };
+                    var redirectUrl = getRedirectUrl(authResult.data.role);
+                    window.location.href = redirectUrl + "/dashboard";
+                    dispatch(setLoading(false));
                   }
-                  window.location.href = domain + "/dashboard";
+                  localStorage.setItem(ACCESS_TOKEN, tokenJWT);
+                  onNavigate("/dashboard");
                   dispatch(setLoading(false));
                 });
               }
@@ -2398,7 +2420,7 @@ var defaultInfo = {
   rememberMe: false
 };
 var minutes = 15;
-var useLogin = function useLogin(_onNavigate, trackEvent) {
+var useLogin = function useLogin(onNavigate, trackEvent) {
   var _useState = React.useState(false),
     openLogin = _useState[0],
     setOpenLogin = _useState[1];
@@ -2465,7 +2487,6 @@ var useLogin = function useLogin(_onNavigate, trackEvent) {
         })).then(function (res) {
           var data = res.data;
           if (data.success) {
-            var _data$data$roles;
             localStorage.clear();
             var tokenJWT = data.data.token;
             localStorage.setItem(ACCESS_TOKEN, tokenJWT);
@@ -2477,15 +2498,21 @@ var useLogin = function useLogin(_onNavigate, trackEvent) {
                 timestamp: new Date().toISOString()
               }
             });
-            CookieService.setAuthCookie({
-              token: tokenJWT,
-              expiresAt: Date.now() + 24 * 60 * 60 * 1000
-            });
-            var domain = "/teacher";
-            if ((_data$data$roles = data.data.roles) !== null && _data$data$roles !== void 0 && _data$data$roles.includes("Admin") || data.data.role === "Admin") {
-              domain = "/admin";
+            var isRootDomain = window.location.hostname === REQUEST_ORIGIN || window.location.hostname === "www." + REQUEST_ORIGIN;
+            if (isRootDomain) {
+              var _data$data$roles;
+              CookieService.setAuthCookie({
+                token: tokenJWT,
+                expiresAt: Date.now() + 24 * 60 * 60 * 1000
+              });
+              var domain = TEACHER_ORIGIN;
+              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";
+            } else {
+              onNavigate("/dashboard");
             }
-            window.location.href = domain + "/dashboard";
           } else {
             reactToastify.toast.error("The code is not correct. Please check again.");
           }
@@ -3596,6 +3623,56 @@ var timeSpanToUtc = (function (time, timezone, format) {
   }
 });
 
+var sanitizeSrc = function sanitizeSrc(url) {
+  if (!url || typeof url !== 'string') {
+    return '';
+  }
+  url = url.trim().replace(/[\s\n\r\t]+/g, '');
+  if (url.length > 2048) {
+    return '';
+  }
+  var dangerousProtocols = ['javascript:', 'data:text/html', 'vbscript:', 'file:', 'about:', 'blob:'];
+  var lowerUrl = url.toLowerCase();
+  for (var _i = 0, _dangerousProtocols = dangerousProtocols; _i < _dangerousProtocols.length; _i++) {
+    var protocol = _dangerousProtocols[_i];
+    if (lowerUrl.startsWith(protocol)) {
+      return '';
+    }
+  }
+  var decoded = decodeURIComponent(url);
+  var decodedLower = decoded.toLowerCase();
+  for (var _i2 = 0, _dangerousProtocols2 = dangerousProtocols; _i2 < _dangerousProtocols2.length; _i2++) {
+    var _protocol = _dangerousProtocols2[_i2];
+    if (decodedLower.includes(_protocol)) {
+      return '';
+    }
+  }
+  try {
+    if (url.startsWith('data:')) {
+      if (/^data:image\/(png|jpeg|jpg|gif|webp|bmp|ico);base64,[A-Za-z0-9+/]+=*$/.test(url)) {
+        return url;
+      }
+      return '';
+    }
+    var parsed = new URL(url, window.location.origin);
+    if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+      return '';
+    }
+    if (parsed.username || parsed.password) {
+      return '';
+    }
+    return parsed.href;
+  } catch (error) {
+    return '';
+  }
+};
+
+var sanitizeHTMLText = function sanitizeHTMLText(text) {
+  var _DOMPurify$sanitize;
+  if (!text) return "";
+  return (_DOMPurify$sanitize = DOMPurify.sanitize(text)) != null ? _DOMPurify$sanitize : "";
+};
+
 var historyCore = history.createBrowserHistory();
 
 Object.defineProperty(exports, 'GoogleOAuthProvider', {
@@ -3651,6 +3728,7 @@ 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;
@@ -3661,6 +3739,8 @@ exports.getTimeZoneId = getTimeZoneId;
 exports.historyCore = historyCore;
 exports.initSentry = initSentry;
 exports.initializeAmplitude = initializeAmplitude;
+exports.sanitizeHTMLText = sanitizeHTMLText;
+exports.sanitizeSrc = sanitizeSrc;
 exports.setAddTenant = setAddTenant;
 exports.setAlert = setAlert;
 exports.setIsFirstCalendar = setIsFirstCalendar;