acsi-core 1.2.42 → 1.2.43

package/README.md

@@ -1,3 +1,46 @@
-To publish npm to gitlab.brss.work using this command:
-chmod +x publish.sh
-NPM_TOKEN=glpat-xxxxxxxx ./publish.sh
+# Getting Started with Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.\
+You will also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).

package/dist/index.js

@@ -160,9 +160,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
   });
 };
@@ -1872,8 +1893,6 @@ var BlockLogin = function BlockLogin(_ref) {
   var _useState5 = React.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 () {
@@ -1964,7 +1983,7 @@ var BlockLogin = function BlockLogin(_ref) {
                   dispatch(setLoading(false));
                 }
                 localStorage.setItem(ACCESS_TOKEN, tokenJWT);
-                onNavigate(returnUrl || "/dashboard");
+                onNavigate("/dashboard");
                 dispatch(setLoading(false));
               });
             }
@@ -2047,11 +2066,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));
                 });
               }
@@ -2144,7 +2163,7 @@ var BlockLogin = function BlockLogin(_ref) {
     to: "/",
     className: "d-flex"
   }, React__default.createElement("img", {
-    src: PUBLIC_URL + "/images/Logo.png",
+    src: "/images/Logo.png",
     alt: "",
     height: 37,
     width: 155,
@@ -2171,7 +2190,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__default.createElement("div", {
     className: "" + styleGlobal["microsoft_button"]
   }, React__default.createElement("button", {
@@ -2182,7 +2201,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__default.createElement("span", {
     className: "" + styleGlobal["box-field"]
   }, "OR"), React__default.createElement("div", {
@@ -2202,7 +2221,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__default.createElement("div", {
     className: styleGlobal["box-signin-text"] + " "
   }, React__default.createElement("span", {
@@ -2236,7 +2255,7 @@ var BlockLogin = function BlockLogin(_ref) {
   }))) : React__default.createElement("div", {
     className: "" + styleGlobal["box-right"],
     style: {
-      backgroundImage: "url('" + PUBLIC_URL + "/images/bg_login.png')"
+      backgroundImage: "url('/images/bg_login.png')"
     }
   }, React__default.createElement("div", {
     className: "" + styleGlobal["box-right-body"]
@@ -2265,7 +2284,7 @@ var BlockLogin = function BlockLogin(_ref) {
   }, React__default.createElement("img", {
     className: "img-fluid",
     alt: "",
-    src: PUBLIC_URL + "/images/image_login.png",
+    src: "/images/image_login.png",
     style: {
       width: "15vw"
     }
@@ -2276,7 +2295,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__default.createElement(reactstrap.Col, {
     sm: 12,
     lg: 5,
@@ -2284,7 +2303,7 @@ var BlockLogin = function BlockLogin(_ref) {
   }, React__default.createElement("div", {
     className: "" + styleGlobal["box-right"],
     style: {
-      backgroundImage: "url('" + PUBLIC_URL + "/images/bg_login.png')"
+      backgroundImage: "url('/images/bg_login.png')"
     }
   }, React__default.createElement("div", {
     className: "" + styleGlobal["box-right-body"]
@@ -2313,7 +2332,7 @@ var BlockLogin = function BlockLogin(_ref) {
   }, React__default.createElement("img", {
     className: "img-fluid",
     alt: "",
-    src: PUBLIC_URL + "/images/image_login.png",
+    src: "/images/image_login.png",
     style: {
       width: "15vw"
     }
@@ -2324,7 +2343,7 @@ var BlockLogin = function BlockLogin(_ref) {
       marginTop: "-15px"
     },
     alt: "",
-    src: PUBLIC_URL + "/images/icons/Vector 22.png"
+    src: "/images/icons/Vector 22.png"
   })))))))), React__default.createElement(reactstrap.Modal, {
     isOpen: isScreenCode,
     toggle: function toggle() {
@@ -2450,8 +2469,6 @@ var useLogin = function useLogin(onNavigate, trackEvent) {
   var _useState6 = React.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() {
@@ -2518,9 +2535,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 {
             reactToastify.toast.error("The code is not correct. Please check again.");