acsi-core 1.2.32 → 1.2.36

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.js

@@ -1729,7 +1729,7 @@ var apiUpload = axios.create({
     if (imPersonate) {
       config.headers.ImPersonate = imPersonate;
     }
-    var tenantId = localStorage.getItem(ORGANIZATION_TENANT);
+    var tenantId = config.externalTenant || localStorage.getItem(ORGANIZATION_TENANT);
     if (tenantId) {
       config.headers["X-TenantID"] = tenantId;
     }
@@ -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.");
           }