acsi-core 1.2.42 → 1.2.43

package/dist/index.modern.js

@@ -159,9 +159,6 @@ function _catch(body, recover) {
 	return result;
 }
 
-var _process$env$PUBLIC_U;
-var PUBLIC_URL = (_process$env$PUBLIC_U = process.env.PUBLIC_URL) != null ? _process$env$PUBLIC_U : '';
-
 var styles = {"core-button":"_xvNBN","primary":"_U9Qyp","secondary":"_1VzMy","text":"_pZNuj","danger":"_2uYm1","light":"_wxH5S"};
 
 var _excluded = ["type", "children", "onClick", "icon", "disabled", "htmlType"];
@@ -1733,9 +1730,9 @@ var apiUpload = axios.create({
     if (imPersonate) {
       config.headers.ImPersonate = imPersonate;
     }
-    var tenantId = config.externalTenantId || localStorage.getItem(ORGANIZATION_TENANT);
+    var tenantId = localStorage.getItem(ORGANIZATION_TENANT);
     if (tenantId) {
-      config.headers["X-TenantID"] = tenantId;
+      config.headers["X-TenantId"] = tenantId;
     }
     return config;
   }, function (error) {
@@ -1744,39 +1741,63 @@ var apiUpload = axios.create({
 });
 [api, apiUpload].forEach(function (i) {
   return i.interceptors.response.use(function (response) {
+    if (response.data && response.data.message === "RedirectToTenantDomain" && response.data.redirectDomain) {
+      var token = localStorage.getItem(ACCESS_TOKEN) || "";
+      var redirectUrl = response.data.redirectDomain;
+      if (!/^https?:\/\//i.test(redirectUrl)) {
+        redirectUrl = window.location.protocol + "//" + redirectUrl;
+      }
+      redirectUrl = redirectUrl.replace(/\/$/, "");
+      window.location.href = redirectUrl + "/login?token=" + encodeURIComponent(token);
+      return new Promise(function () {});
+    }
     return response;
   }, function (error) {
-    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('.');
-      localStorage.removeItem(ACCESS_TOKEN);
-      localStorage.removeItem(ORGANIZATION_TENANT);
-      localStorage.removeItem(TIMEZONE_ID);
-      localStorage.removeItem(ORGANIZATION_TEAM);
-      Cookies.remove('auth', {
-        path: '/',
-        domain: "." + domain
-      });
-      localStorage.removeItem("USER_EMAIL");
-      window.location.href = "/login";
+    if (error.response && error.response.data) {
+      var data = error.response.data;
+      if (data.message === "RedirectToTenantDomain" && data.redirectDomain) {
+        var token = localStorage.getItem(ACCESS_TOKEN) || "";
+        var redirectUrl = data.redirectDomain;
+        if (!/^https?:\/\//i.test(redirectUrl)) {
+          redirectUrl = window.location.protocol + "//" + redirectUrl;
+        }
+        redirectUrl = redirectUrl.replace(/\/$/, "");
+        window.location.href = redirectUrl + "/login?token=" + encodeURIComponent(token);
+        return new Promise(function () {});
+      }
+    }
+    if (error.response) {
+      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('.');
+        localStorage.removeItem(ACCESS_TOKEN);
+        localStorage.removeItem(ORGANIZATION_TENANT);
+        localStorage.removeItem(TIMEZONE_ID);
+        localStorage.removeItem(ORGANIZATION_TEAM);
+        Cookies.remove('auth', {
+          path: '/',
+          domain: "." + domain
+        });
+        localStorage.removeItem("USER_EMAIL");
+        window.location.href = "/login";
+      }
     }
     return Promise.reject(error);
   });
 });
 
-var IDP_URL = "" + process.env.REACT_APP_IDP_API_URL;
 var apiLoginGoogle = function apiLoginGoogle(body) {
-  return api.post(IDP_URL + "/api/Auth/login", body);
+  return api.post(BASE_URL + "/api/Auth/login", body);
 };
 var apiSendEmailCode = function apiSendEmailCode(body) {
-  return api.post(IDP_URL + "/api/Auth/send-code-email", body);
+  return api.post(BASE_URL + "/api/Auth/send-code-email", body);
 };
 var apiCheckEmailCode = function apiCheckEmailCode(params) {
-  return api.get(IDP_URL + "/api/Auth/check-code-email", {
+  return api.get(BASE_URL + "/api/Auth/check-code-email", {
     params: params
   });
 };
@@ -1873,8 +1894,6 @@ var BlockLogin = function BlockLogin(_ref) {
   var _useState5 = useState(0),
     currentImageIndex = _useState5[0],
     setCurrentImageIndex = _useState5[1];
-  var search = new URLSearchParams(window.location.search);
-  var returnUrl = search.get("returnUrl") || "";
   var handleGetImage = function handleGetImage() {
     try {
       var _temp = _catch(function () {
@@ -1965,7 +1984,7 @@ var BlockLogin = function BlockLogin(_ref) {
                   dispatch(setLoading(false));
                 }
                 localStorage.setItem(ACCESS_TOKEN, tokenJWT);
-                onNavigate(returnUrl || "/dashboard");
+                onNavigate("/dashboard");
                 dispatch(setLoading(false));
               });
             }
@@ -2048,11 +2067,11 @@ var BlockLogin = function BlockLogin(_ref) {
                       }
                     };
                     var redirectUrl = getRedirectUrl(authResult.data.role);
-                    window.location.href = redirectUrl + " " + (returnUrl || "/dashboard");
+                    window.location.href = redirectUrl + "/dashboard";
                     dispatch(setLoading(false));
                   }
                   localStorage.setItem(ACCESS_TOKEN, tokenJWT);
-                  onNavigate(returnUrl || "/dashboard");
+                  onNavigate("/dashboard");
                   dispatch(setLoading(false));
                 });
               }
@@ -2145,7 +2164,7 @@ var BlockLogin = function BlockLogin(_ref) {
     to: "/",
     className: "d-flex"
   }, React.createElement("img", {
-    src: PUBLIC_URL + "/images/Logo.png",
+    src: "/images/Logo.png",
     alt: "",
     height: 37,
     width: 155,
@@ -2172,7 +2191,7 @@ var BlockLogin = function BlockLogin(_ref) {
     width: 24,
     height: 24,
     alt: "Google sign-in",
-    src: PUBLIC_URL + "/images/icons/Google__G__logo.png"
+    src: "/images/icons/Google__G__logo.png"
   }), "Sign in with Google")), MICROSOFT_SSO_ENABLED === "true" && React.createElement("div", {
     className: "" + styleGlobal["microsoft_button"]
   }, React.createElement("button", {
@@ -2183,7 +2202,7 @@ var BlockLogin = function BlockLogin(_ref) {
     width: 24,
     height: 24,
     alt: "Google sign-in",
-    src: PUBLIC_URL + "/images/Single-Sign-On-logo.png"
+    src: "/images/Single-Sign-On-logo.png"
   }), "Sign in with Microsoft")), React.createElement("span", {
     className: "" + styleGlobal["box-field"]
   }, "OR"), React.createElement("div", {
@@ -2203,7 +2222,7 @@ var BlockLogin = function BlockLogin(_ref) {
     width: 20,
     height: 20,
     alt: "Email sign-in",
-    src: PUBLIC_URL + "/images/icons/Login_icon.png"
+    src: "/images/icons/Login_icon.png"
   }), "Sign in with Email")), React.createElement("div", {
     className: styleGlobal["box-signin-text"] + " "
   }, React.createElement("span", {
@@ -2237,7 +2256,7 @@ var BlockLogin = function BlockLogin(_ref) {
   }))) : React.createElement("div", {
     className: "" + styleGlobal["box-right"],
     style: {
-      backgroundImage: "url('" + PUBLIC_URL + "/images/bg_login.png')"
+      backgroundImage: "url('/images/bg_login.png')"
     }
   }, React.createElement("div", {
     className: "" + styleGlobal["box-right-body"]
@@ -2266,7 +2285,7 @@ var BlockLogin = function BlockLogin(_ref) {
   }, React.createElement("img", {
     className: "img-fluid",
     alt: "",
-    src: PUBLIC_URL + "/images/image_login.png",
+    src: "/images/image_login.png",
     style: {
       width: "15vw"
     }
@@ -2277,7 +2296,7 @@ var BlockLogin = function BlockLogin(_ref) {
       marginTop: "-15px"
     },
     alt: "",
-    src: PUBLIC_URL + "/images/icons/Vector 22.png"
+    src: "/images/icons/Vector 22.png"
   }))))))), role === "LandingPage" && React.createElement(Col, {
     sm: 12,
     lg: 5,
@@ -2285,7 +2304,7 @@ var BlockLogin = function BlockLogin(_ref) {
   }, React.createElement("div", {
     className: "" + styleGlobal["box-right"],
     style: {
-      backgroundImage: "url('" + PUBLIC_URL + "/images/bg_login.png')"
+      backgroundImage: "url('/images/bg_login.png')"
     }
   }, React.createElement("div", {
     className: "" + styleGlobal["box-right-body"]
@@ -2314,7 +2333,7 @@ var BlockLogin = function BlockLogin(_ref) {
   }, React.createElement("img", {
     className: "img-fluid",
     alt: "",
-    src: PUBLIC_URL + "/images/image_login.png",
+    src: "/images/image_login.png",
     style: {
       width: "15vw"
     }
@@ -2325,7 +2344,7 @@ var BlockLogin = function BlockLogin(_ref) {
       marginTop: "-15px"
     },
     alt: "",
-    src: PUBLIC_URL + "/images/icons/Vector 22.png"
+    src: "/images/icons/Vector 22.png"
   })))))))), React.createElement(Modal, {
     isOpen: isScreenCode,
     toggle: function toggle() {
@@ -2451,8 +2470,6 @@ var useLogin = function useLogin(onNavigate, trackEvent) {
   var _useState6 = useState(minutes * 60),
     timeLeft = _useState6[0],
     setTimeLeft = _useState6[1];
-  var search = new URLSearchParams(window.location.search);
-  var returnUrl = search.get("returnUrl") || "/dashboard";
   var loginWithEmail = function loginWithEmail(role) {
     try {
       var _temp2 = function _temp2() {
@@ -2519,9 +2536,9 @@ 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 + (returnUrl || "/dashboard");
+              window.location.href = domain + "/dashboard";
             } else {
-              onNavigate(returnUrl || "/dashboard");
+              onNavigate("/dashboard");
             }
           } else {
             toast.error("The code is not correct. Please check again.");