mario-core 2.9.215-release → 2.9.217-release

package/dist/containers/Login/hooks/useLogin.d.ts

@@ -22,6 +22,5 @@ declare const useLogin: () => {
     googleRecaptchaId: string;
     handleCancelModelAssign: () => void;
     openModelAssign: boolean;
-    handleAssignTeacherByCode: (teacherCode: string, setIsError: Function) => Promise<void>;
 };
 export default useLogin;

package/dist/containers/Login/views/block/BlockLogin.d.ts

@@ -4,7 +4,6 @@ interface Props {
     userLogin?: any;
     onCancelModelAssign: Function;
     openModelAssign: boolean;
-    onAssignTeacherByCode: Function;
 }
 declare const BlockLogin: FC<Props>;
 export default BlockLogin;

package/dist/index.js

@@ -30021,7 +30021,13 @@ var apiUpload = axios.create({
   return i.interceptors.response.use(function (response) {
     return response;
   }, function (error) {
-    if (error.response.status === 401) {
+    var _error$response$confi, _error$response$confi2, _error$response$confi3, _error$response$confi4;
+
+    console.log({
+      error: error
+    });
+
+    if (error.response.status === 401 && !((_error$response$confi = error.response.config) !== null && _error$response$confi !== void 0 && (_error$response$confi2 = _error$response$confi.url) !== null && _error$response$confi2 !== void 0 && _error$response$confi2.includes("cookieyes"))) {
       Object.keys(localStorage).forEach(function (key) {
         if (!key.includes('learning-plan')) delete localStorage[key];
       });
@@ -30042,7 +30048,7 @@ var apiUpload = axios.create({
       window.location.href = "/login";
     }
 
-    if (error.response.status == 403) {
+    if (error.response.status == 403 && !((_error$response$confi3 = error.response.config) !== null && _error$response$confi3 !== void 0 && (_error$response$confi4 = _error$response$confi3.url) !== null && _error$response$confi4 !== void 0 && _error$response$confi4.includes("cookieyes"))) {
       localStorage.removeItem(ACCESS_TOKEN);
       localStorage.removeItem("USER_EMAIL");
       window.location.href = "/login";
@@ -30055,7 +30061,6 @@ var apiUpload = axios.create({
 var ACCOUNT_URL = BASE_URL + "/api/account";
 var USER_URL = BASE_URL + "/api/user";
 var TEACHER_URL = BASE_URL + "/api/teacher";
-var STUDENT_URL = BASE_URL + "/api/Student";
 var apiInforUserClassLink = function apiInforUserClassLink(data) {
   return api.post(BASE_URL + "/api/User/infor-user-classlink", data);
 };
@@ -30106,14 +30111,6 @@ var registerUserStudent = function registerUserStudent(body) {
 var createPassword = function createPassword(data) {
   return api.post(ACCOUNT_URL + "/createPassword", data);
 };
-var checkStudentAssign = function checkStudentAssign() {
-  return api.get(STUDENT_URL + "/checkMainTeacher");
-};
-var assignTeacherByCode = function assignTeacherByCode(teacherCode) {
-  return api.post(STUDENT_URL + "/assign-teacher-by-code", {
-    teacherCode: teacherCode
-  });
-};
 
 var SCHOOL_URL = BASE_URL + "/api/school";
 var getSchoolSettings = function getSchoolSettings() {
@@ -30163,8 +30160,7 @@ var useLogin = function useLogin() {
   var tokenClassLink = params.get("token");
 
   var _useState6 = React.useState(false),
-      openModelAssign = _useState6[0],
-      setOpenModelAssign = _useState6[1];
+      openModelAssign = _useState6[0];
 
   var toggle = React.useCallback(function () {
     setOpenLogin(!openLogin);
@@ -30184,7 +30180,6 @@ var useLogin = function useLogin() {
   var handleCancelModelAssign = function handleCancelModelAssign() {
     localStorage.removeItem(ACCESS_TOKEN);
     localStorage.removeItem("USER_EMAIL");
-    setOpenModelAssign(false);
   };
 
   React.useEffect(function () {
@@ -30233,7 +30228,7 @@ var useLogin = function useLogin() {
   };
 
   var isDistrict = window.location.host.includes("-district");
-  var handleCheckStudentAssignTeacher = React.useCallback(function () {
+  var userLogin = React.useCallback(function (data) {
     try {
       var _temp7 = function _temp7() {
         dispatch(setLoading(false));
@@ -30242,66 +30237,6 @@ var useLogin = function useLogin() {
       dispatch(setLoading(true));
 
       var _temp8 = _catch(function () {
-        return Promise.resolve(checkStudentAssign()).then(function (res) {
-          if (!res.data) {
-            setOpenModelAssign(true);
-          } else {
-            history.push(HOMEPAGE_STUDENT);
-          }
-        });
-      }, function (err) {
-        var _err$response2, _err$response2$data;
-
-        dispatch(setAlert({
-          type: "danger",
-          message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || err.message
-        }));
-      });
-
-      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  }, []);
-  var handleAssignTeacherByCode = React.useCallback(function (teacherCode, setIsError) {
-    try {
-      var _temp11 = function _temp11() {
-        dispatch(setLoading(false));
-      };
-
-      dispatch(setLoading(true));
-
-      var _temp12 = _catch(function () {
-        return Promise.resolve(assignTeacherByCode(teacherCode)).then(function (res) {
-          if (res.data) {
-            setOpenModelAssign(false);
-            history.push(HOMEPAGE_STUDENT);
-          }
-        });
-      }, function (err) {
-        var _err$response3, _err$response3$data;
-
-        setIsError(true);
-        dispatch(setAlert({
-          type: "danger",
-          message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.title) || err.message
-        }));
-      });
-
-      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  }, []);
-  var userLogin = React.useCallback(function (data) {
-    try {
-      var _temp19 = function _temp19() {
-        dispatch(setLoading(false));
-      };
-
-      dispatch(setLoading(true));
-
-      var _temp20 = _catch(function () {
         var _data$email, _data$password;
 
         return Promise.resolve(logIn(_extends({}, data, {
@@ -30363,53 +30298,31 @@ var useLogin = function useLogin() {
             }
           }
 
-          var _temp16 = function () {
-            if (isDistrict) {
-              history.push(HOMEPAGE_DISTRICT);
-            } else {
-              var _temp21 = function () {
-                if (roles.includes("Admin")) {
-                  history.push(HOMEPAGE_ADMIN);
-                } else {
-                  var _temp22 = function () {
-                    if (roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor") || roles.includes("SecondaryTeacher")) {
-                      history.push(HOMEPAGE_TEACHER);
-                    } else {
-                      var _temp23 = function () {
-                        if (roles.includes("Student")) {
-                          return Promise.resolve(handleCheckStudentAssignTeacher()).then(function () {});
-                        } else if (roles.includes("Parent")) {
-                          history.push(HOMEPAGE_PARENT);
-                        } else if (roles.includes("EduTeacher")) {
-                          history.push(HOMEPAGE_EDU_TEACHER);
-                        }
-                      }();
-
-                      if (_temp23 && _temp23.then) return _temp23.then(function () {});
-                    }
-                  }();
-
-                  if (_temp22 && _temp22.then) return _temp22.then(function () {});
-                }
-              }();
-
-              if (_temp21 && _temp21.then) return _temp21.then(function () {});
-            }
-          }();
-
-          if (_temp16 && _temp16.then) return _temp16.then(function () {});
+          if (isDistrict) {
+            history.push(HOMEPAGE_DISTRICT);
+          } else if (roles.includes("Admin")) {
+            history.push(HOMEPAGE_ADMIN);
+          } else if (roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor") || roles.includes("SecondaryTeacher")) {
+            history.push(HOMEPAGE_TEACHER);
+          } else if (roles.includes("Student")) {
+            history.push(HOMEPAGE_STUDENT);
+          } else if (roles.includes("Parent")) {
+            history.push(HOMEPAGE_PARENT);
+          } else if (roles.includes("EduTeacher")) {
+            history.push(HOMEPAGE_EDU_TEACHER);
+          }
         });
       }, function (err) {
-        var _err$response4, _err$response4$data;
+        var _err$response2, _err$response2$data;
 
         dispatch(setAlert({
           type: "danger",
-          message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message || "Login failed"
+          message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || err.message || "Login failed"
         }));
         localStorage.removeItem(ACCESS_TOKEN);
       });
 
-      return Promise.resolve(_temp20 && _temp20.then ? _temp20.then(_temp19) : _temp19(_temp20));
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -30417,21 +30330,21 @@ var useLogin = function useLogin() {
 
   var getInfoGoogle = function getInfoGoogle() {
     try {
-      var _temp25 = _catch(function () {
+      var _temp10 = _catch(function () {
         return Promise.resolve(getGoogleClientId()).then(function (res) {
           setGoogleClientId(res.data.googleClientId);
           setGoogleRecaptchaId(res.data.googleCaptchaId);
         });
       }, function (err) {
-        var _err$response5, _err$response5$data;
+        var _err$response3, _err$response3$data;
 
         dispatch(setAlert({
           type: "danger",
-          message: ((_err$response5 = err.response) === null || _err$response5 === void 0 ? void 0 : (_err$response5$data = _err$response5.data) === null || _err$response5$data === void 0 ? void 0 : _err$response5$data.title) || err.message || "Login failed"
+          message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.title) || err.message || "Login failed"
         }));
       });
 
-      return Promise.resolve(_temp25 && _temp25.then ? _temp25.then(function () {}) : void 0);
+      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -30439,17 +30352,17 @@ var useLogin = function useLogin() {
 
   var fnIsCheckLogin = React.useCallback(function (data, token, clickHandler) {
     try {
-      var _temp29 = function _temp29() {
+      var _temp14 = function _temp14() {
         dispatch(setLoading(false));
       };
 
       dispatch(setLoading(true));
 
-      var _temp30 = _catch(function () {
+      var _temp15 = _catch(function () {
         return Promise.resolve(checkUserGoogle(data)).then(function (res) {
           var checkUser = res.data;
 
-          var _temp26 = function () {
+          var _temp11 = function () {
             if (checkUser) {
               return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
                 var dataUser = {
@@ -30469,18 +30382,18 @@ var useLogin = function useLogin() {
             }
           }();
 
-          if (_temp26 && _temp26.then) return _temp26.then(function () {});
+          if (_temp11 && _temp11.then) return _temp11.then(function () {});
         });
       }, function (err) {
-        var _err$response6, _err$response6$data;
+        var _err$response4, _err$response4$data;
 
         dispatch(setAlert({
           type: "danger",
-          message: ((_err$response6 = err.response) === null || _err$response6 === void 0 ? void 0 : (_err$response6$data = _err$response6.data) === null || _err$response6$data === void 0 ? void 0 : _err$response6$data.title) || err.message || "Login failed"
+          message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message || "Login failed"
         }));
       });
 
-      return Promise.resolve(_temp30 && _temp30.then ? _temp30.then(_temp29) : _temp29(_temp30));
+      return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(_temp14) : _temp14(_temp15));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -30488,14 +30401,14 @@ var useLogin = function useLogin() {
 
   var submitLogin = function submitLogin(teacherId, clickHandler) {
     try {
-      var _temp34 = function _temp34() {
+      var _temp19 = function _temp19() {
         setIsLoginGoogle(false);
         dispatch(setLoading(false));
       };
 
       dispatch(setLoading(true));
 
-      var _temp35 = _catch(function () {
+      var _temp20 = _catch(function () {
         var data = {
           firstName: infoUser.firstName,
           lastName: infoUser.lastName,
@@ -30506,7 +30419,7 @@ var useLogin = function useLogin() {
           teacherId: teacherId
         };
         return Promise.resolve(registerUserStudent(data)).then(function (res) {
-          var _temp31 = function () {
+          var _temp16 = function () {
             if (res.data) {
               return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
                 var dataLogin = {
@@ -30525,18 +30438,18 @@ var useLogin = function useLogin() {
             }
           }();
 
-          if (_temp31 && _temp31.then) return _temp31.then(function () {});
+          if (_temp16 && _temp16.then) return _temp16.then(function () {});
         });
       }, function (err) {
-        var _err$response7, _err$response7$data;
+        var _err$response5, _err$response5$data;
 
         dispatch(setAlert({
           type: "danger",
-          message: ((_err$response7 = err.response) === null || _err$response7 === void 0 ? void 0 : (_err$response7$data = _err$response7.data) === null || _err$response7$data === void 0 ? void 0 : _err$response7$data.title) || err.message || "Login failed"
+          message: ((_err$response5 = err.response) === null || _err$response5 === void 0 ? void 0 : (_err$response5$data = _err$response5.data) === null || _err$response5$data === void 0 ? void 0 : _err$response5$data.title) || err.message || "Login failed"
         }));
       });
 
-      return Promise.resolve(_temp35 && _temp35.then ? _temp35.then(_temp34) : _temp34(_temp35));
+      return Promise.resolve(_temp20 && _temp20.then ? _temp20.then(_temp19) : _temp19(_temp20));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -30544,7 +30457,7 @@ var useLogin = function useLogin() {
 
   var getInformationSetting = function getInformationSetting() {
     try {
-      var _temp37 = _catch(function () {
+      var _temp22 = _catch(function () {
         return Promise.resolve(getSchoolSettings()).then(function (res) {
           dispatch(setSandboxMode(res.data.isSandboxMode));
         });
@@ -30552,7 +30465,7 @@ var useLogin = function useLogin() {
         console.error(err);
       });
 
-      return Promise.resolve(_temp37 && _temp37.then ? _temp37.then(function () {}) : void 0);
+      return Promise.resolve(_temp22 && _temp22.then ? _temp22.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -30577,8 +30490,7 @@ var useLogin = function useLogin() {
     googleClientId: googleClientId,
     googleRecaptchaId: googleRecaptchaId,
     handleCancelModelAssign: handleCancelModelAssign,
-    openModelAssign: openModelAssign,
-    handleAssignTeacherByCode: handleAssignTeacherByCode
+    openModelAssign: openModelAssign
   };
 };
 
@@ -30734,52 +30646,6 @@ var getStaticFileUrl = function getStaticFileUrl(url) {
   if (url.startsWith("/")) return "" + (isStage ? STAGE_DOMAIN : MARIO_SUCCESS_BASE_URL) + url;else return (isStage ? STAGE_DOMAIN : MARIO_SUCCESS_BASE_URL) + "/" + url;
 };
 
-var BlockAssignTeacherByCode = function BlockAssignTeacherByCode(_ref) {
-  var open = _ref.open,
-      onClose = _ref.onClose,
-      onConfirm = _ref.onConfirm;
-
-  var _useState = React.useState(""),
-      teacherCode = _useState[0],
-      setTeacherCode = _useState[1];
-
-  var _useState2 = React.useState(false),
-      isError = _useState2[0],
-      setIsError = _useState2[1];
-
-  var handleChange = function handleChange(event) {
-    var value = event.target.value;
-    setTeacherCode(value === null || value === void 0 ? void 0 : value.trim());
-    setIsError(!(value !== null && value !== void 0 && value.trim()));
-  };
-
-  return React__default.createElement(reactstrap.Modal, {
-    isOpen: open,
-    onClosed: function onClosed() {
-      return onClose();
-    }
-  }, React__default.createElement(reactstrap.ModalHeader, null, " Assign Teacher "), React__default.createElement(reactstrap.ModalBody, null, React__default.createElement("h6", null, "You are logging in as a student, please enter your teacher code"), React__default.createElement(reactstrap.Input, {
-    value: teacherCode,
-    onChange: function onChange(e) {
-      return handleChange(e);
-    },
-    invalid: isError
-  }), isError && React__default.createElement(ErrorHandler, {
-    text: "Teacher code is not correct"
-  })), React__default.createElement(reactstrap.ModalFooter, null, React__default.createElement(reactstrap.Button, {
-    disabled: !teacherCode,
-    color: "primary",
-    onClick: function onClick() {
-      onConfirm(teacherCode, setIsError);
-    }
-  }, "Finish"), " ", React__default.createElement(reactstrap.Button, {
-    color: "secondary",
-    onClick: function onClick() {
-      return onClose();
-    }
-  }, "Cancel")));
-};
-
 var schema = yup.object({
   email: yup.string().email("Email is invalid").required("Email is required"),
   password: yup.string().required("Password is required"),
@@ -30788,10 +30654,7 @@ var schema = yup.object({
 
 var BlockLogin = function BlockLogin(_ref) {
   var defaultInfo = _ref.defaultInfo,
-      userLogin = _ref.userLogin,
-      onCancelModelAssign = _ref.onCancelModelAssign,
-      openModelAssign = _ref.openModelAssign,
-      onAssignTeacherByCode = _ref.onAssignTeacherByCode;
+      userLogin = _ref.userLogin;
 
   var _useLogin = useLogin(),
       isShowPassword = _useLogin.isShowPassword,
@@ -30959,10 +30822,6 @@ var BlockLogin = function BlockLogin(_ref) {
     token: infoUser.accessToken,
     email: infoUser.email,
     setOpenModal: setIsLoginGoogle
-  }), React__default.createElement(BlockAssignTeacherByCode, {
-    open: openModelAssign,
-    onClose: onCancelModelAssign,
-    onConfirm: onAssignTeacherByCode
   }));
 };
 
@@ -31585,8 +31444,7 @@ var Login = function Login(props) {
       userLogin = _useLogin.userLogin,
       googleRecaptchaId = _useLogin.googleRecaptchaId,
       handleCancelModelAssign = _useLogin.handleCancelModelAssign,
-      openModelAssign = _useLogin.openModelAssign,
-      handleAssignTeacherByCode = _useLogin.handleAssignTeacherByCode;
+      openModelAssign = _useLogin.openModelAssign;
 
   React.useEffect(function () {
     isLogin && (document.title = LOGIN_TITLE);
@@ -31614,8 +31472,7 @@ var Login = function Login(props) {
     userLogin: userLogin,
     defaultInfo: defaultInfo,
     onCancelModelAssign: handleCancelModelAssign,
-    openModelAssign: openModelAssign,
-    onAssignTeacherByCode: handleAssignTeacherByCode
+    openModelAssign: openModelAssign
   }), isForgotPassword && React__default.createElement(BlockForgetPassword, null)), isResetPassword && React__default.createElement(BlockResetPassword, null), isCreatePassword && React__default.createElement(BlockCreatePassword, null))));
 };