acsi-core 1.2.30 → 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.js

@@ -1838,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,
@@ -1955,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));
               });
             }
@@ -2006,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;
@@ -2042,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));
                 });
               }
@@ -2509,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.");