mario-core 2.8.2 → 9000.0.0

package/dist/containers/User/hooks/useUserList.d.ts

@@ -2,8 +2,8 @@ declare const useUserList: () => {
     userList: any;
     totalItems: any;
     filters: import("../../..").Filter;
-    queryName: string | null;
-    getData: (fullName?: string | undefined) => Promise<void>;
+    fullName: string | null;
+    getData: () => Promise<void>;
     removeData: (id: string) => void;
     changeFilters: (updatedFilters: any) => void;
     reDirectDetailPage: (id?: number | undefined) => void;

package/dist/index.js

@@ -315,6 +315,9 @@ var checkResetToken = function checkResetToken(token) {
 var resetPassword = function resetPassword(data) {
   return api.post(ACCOUNT_URL + "/resetpassword", data);
 };
+var logInTwoFactor = function logInTwoFactor(data) {
+  return api.post(ACCOUNT_URL + "/logintwostep", data);
+};
 
 var defaultInfo = {
   email: "",
@@ -353,7 +356,10 @@ var useLogin = function useLogin() {
   var isDistrict = window.location.host.includes("-district");
   var userLogin = React.useCallback(function (data) {
     try {
-      var _temp3 = function _temp3() {
+      var _exit2 = false;
+
+      var _temp3 = function _temp3(_result) {
+        if (_exit2) return _result;
         dispatch(setLoading(false));
       };
 
@@ -361,14 +367,23 @@ var useLogin = function useLogin() {
 
       var _temp4 = _catch(function () {
         return Promise.resolve(logIn(data)).then(function (res) {
-          var _res$data = res.data,
-              token = _res$data.token,
-              id = _res$data.id,
-              firstName = _res$data.firstName,
-              lastName = _res$data.lastName,
-              roles = _res$data.roles,
-              email = _res$data.email,
-              profileImageFileName = _res$data.profileImageFileName;
+          var _res$data;
+
+          if ((_res$data = res.data) !== null && _res$data !== void 0 && _res$data.isTwoFactor) {
+            history.push("/2fa?id=" + res.data.id);
+            dispatch(setLoading(false));
+            _exit2 = true;
+            return;
+          }
+
+          var _res$data2 = res.data,
+              token = _res$data2.token,
+              id = _res$data2.id,
+              firstName = _res$data2.firstName,
+              lastName = _res$data2.lastName,
+              roles = _res$data2.roles,
+              email = _res$data2.email,
+              profileImageFileName = _res$data2.profileImageFileName;
           localStorage.setItem(ACCESS_TOKEN, token);
           dispatch(setUser({
             id: id,
@@ -892,47 +907,6 @@ var BlockResetPassword = function BlockResetPassword() {
   });
 };
 
-var LOGIN_TITLE = "Log in";
-var FORGOT_PASSWORD_TITLE = "Forgot password";
-var RESET_PASSWORD_TITLE = "Reset password";
-
-var Login = function Login(props) {
-  var isLogin = props.isLogin,
-      isForgotPassword = props.isForgotPassword,
-      isResetPassword = props.isResetPassword;
-
-  var _useLogin = useLogin(),
-      defaultInfo = _useLogin.defaultInfo,
-      userLogin = _useLogin.userLogin;
-
-  React.useEffect(function () {
-    isLogin && (document.title = LOGIN_TITLE);
-    isForgotPassword && (document.title = FORGOT_PASSWORD_TITLE);
-    isResetPassword && (document.title = RESET_PASSWORD_TITLE);
-  }, [isLogin, isForgotPassword, isResetPassword]);
-  return React__default.createElement("div", {
-    className: styles["login"] + " container-fluid font-family-lato"
-  }, React__default.createElement(reactstrap.Row, {
-    className: "h-100"
-  }, React__default.createElement(reactstrap.Col, {
-    lg: 12,
-    md: 12,
-    xs: 12,
-    className: "d-flex justify-content-center h-100 align-items-center"
-  }, React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptchaProvider, {
-    useRecaptchaNet: true,
-    reCaptchaKey: GOOGLE_RECAPTCHA_KEY,
-    scriptProps: {
-      async: true,
-      defer: true,
-      appendTo: "body"
-    }
-  }, isLogin && React__default.createElement(BlockLogin, {
-    userLogin: userLogin,
-    defaultInfo: defaultInfo
-  }), isForgotPassword && React__default.createElement(BlockForgetPassword, null)), isResetPassword && React__default.createElement(BlockResetPassword, null))));
-};
-
 function _extends() {
   _extends = Object.assign || function (target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -1012,6 +986,210 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
   return it.next.bind(it);
 }
 
+var HOMEPAGE_TEACHER$1 = "/my-one-to-one/up-coming";
+var HOMEPAGE_STUDENT$1 = "/my-one-to-one/up-coming";
+var HOMEPAGE_ADMIN$1 = "/admin/dashboard";
+var HOMEPAGE_PARENT$1 = "/parent";
+var HOMEPAGE_DISTRICT$1 = "/admin/schools";
+var TITLE$2 = "2FA";
+
+var useLoginTwoFactor = function useLoginTwoFactor() {
+  var dispatch = reactRedux.useDispatch();
+  var history = reactRouterDom.useHistory();
+  var isDistrict = window.location.host.includes("-district");
+  var userLoginTwoFactor = React.useCallback(function (data) {
+    try {
+      var _temp3 = function _temp3() {
+        dispatch(setLoading(false));
+      };
+
+      dispatch(setLoading(true));
+
+      var _temp4 = _catch(function () {
+        return Promise.resolve(logInTwoFactor(data)).then(function (res) {
+          var _res$data = res.data,
+              token = _res$data.token,
+              id = _res$data.id,
+              firstName = _res$data.firstName,
+              lastName = _res$data.lastName,
+              roles = _res$data.roles,
+              email = _res$data.email,
+              profileImageFileName = _res$data.profileImageFileName;
+          localStorage.setItem(ACCESS_TOKEN, token);
+          dispatch(setUser({
+            id: id,
+            firstName: firstName,
+            lastName: lastName,
+            roles: roles,
+            email: email,
+            profileImageFileName: profileImageFileName
+          }));
+
+          if (isDistrict) {
+            history.push(HOMEPAGE_DISTRICT$1);
+          } else if (roles.includes("Admin")) {
+            history.push(HOMEPAGE_ADMIN$1);
+          } else if (roles.includes("Teacher")) {
+            history.push(HOMEPAGE_TEACHER$1);
+          } else if (roles.includes("Student")) {
+            history.push(HOMEPAGE_STUDENT$1);
+          } else if (roles.includes("Parent")) {
+            history.push(HOMEPAGE_PARENT$1);
+          }
+        });
+      }, function (err) {
+        var _err$response, _err$response$data;
+
+        dispatch(setAlert({
+          type: "danger",
+          message: ((_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.title) || err.message || "Login failed"
+        }));
+      });
+
+      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, []);
+  React.useEffect(function () {
+    document.title = TITLE$2;
+  }, []);
+  return {
+    userLoginTwoFactor: userLoginTwoFactor
+  };
+};
+
+var initialValues$2 = {
+  twoFactorCode: "",
+  id: "",
+  rememberMe: false
+};
+var schema$1 = yup.object({
+  id: yup.string().required("Bad credential"),
+  twoFactorCode: yup.string().required("Additional Verification is required"),
+  rememberMe: yup.boolean()
+});
+
+var BlockTwoFactorLogin = function BlockTwoFactorLogin() {
+  var query = new URLSearchParams(reactRouterDom.useLocation().search);
+  var id = query.get("id");
+
+  var _useLoginTwoFactor = useLoginTwoFactor(),
+      userLoginTwoFactor = _useLoginTwoFactor.userLoginTwoFactor;
+
+  return React__default.createElement(formik.Formik, {
+    initialValues: _extends({}, initialValues$2, {
+      id: id
+    }),
+    enableReinitialize: true,
+    validationSchema: schema$1,
+    onSubmit: function onSubmit(values) {
+      userLoginTwoFactor(values);
+    }
+  }, function (formikProps) {
+    var values = formikProps.values,
+        setFieldValue = formikProps.setFieldValue,
+        handleChange = formikProps.handleChange,
+        handleSubmit = formikProps.handleSubmit,
+        touched = formikProps.touched,
+        errors = formikProps.errors;
+    return React__default.createElement(reactstrap.Row, {
+      className: "" + styles["box-login"]
+    }, React__default.createElement(reactstrap.Col, {
+      className: "p-0"
+    }, React__default.createElement("div", {
+      className: "" + styles["block-login"]
+    }, React__default.createElement("div", {
+      className: "" + styles["block-form"]
+    }, React__default.createElement("p", {
+      className: "" + styles["title-login"]
+    }, "Additional Verification"), React__default.createElement("p", {
+      className: "recover-account"
+    }, "Check your email to get Additional Verification. This code will be expired in 5 minutes"), React__default.createElement("div", null, React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(reactstrap.Label, null, "Additional Verification"), React__default.createElement(reactstrap.Input, {
+      name: "twoFactorCode",
+      value: values.twoFactorCode,
+      onChange: handleChange
+    }), touched.twoFactorCode && errors.twoFactorCode && React__default.createElement(ErrorHandler, {
+      text: errors.twoFactorCode
+    })), React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(reactstrap.Input, {
+      type: "checkbox",
+      className: "" + styles["checkbox-remember"],
+      id: "remember",
+      onChange: function onChange(e) {
+        return setFieldValue("rememberMe", e.target.checked);
+      }
+    }), React__default.createElement(reactstrap.Label, {
+      "for": "rememberMe",
+      className: "" + styles["remember"]
+    }, "Remember my browser & IP"))), React__default.createElement(reactstrap.Col, {
+      className: "p-0 mt-5"
+    }, React__default.createElement("button", {
+      className: styles["btn-login"] + " ",
+      onClick: function onClick() {
+        return handleSubmit();
+      }
+    }, "Confirm")), React__default.createElement("p", {
+      className: "d-flex justify-content-between"
+    }, React__default.createElement(reactRouterDom.Link, {
+      to: "/login",
+      className: "" + styles["link-to-login"]
+    }, "Return to login"), React__default.createElement("a", {
+      href: "https://marioframework.com/privacy-policy/",
+      target: "blank",
+      className: "" + styles["link-to-login"]
+    }, "Privacy Policy"))))), React__default.createElement(reactstrap.Col, {
+      lg: 4,
+      md: 4,
+      className: "" + styles["img-box"]
+    }, React__default.createElement("img", {
+      src: "/images/img-login.jpg",
+      className: "" + styles["img-login"]
+    })));
+  });
+};
+
+var LOGIN_TITLE = "Log in";
+var FORGOT_PASSWORD_TITLE = "Forgot password";
+var RESET_PASSWORD_TITLE = "Reset password";
+
+var Login = function Login(props) {
+  var isLogin = props.isLogin,
+      isForgotPassword = props.isForgotPassword,
+      isResetPassword = props.isResetPassword,
+      isLoginTwoFactor = props.isLoginTwoFactor;
+
+  var _useLogin = useLogin(),
+      defaultInfo = _useLogin.defaultInfo,
+      userLogin = _useLogin.userLogin;
+
+  React.useEffect(function () {
+    isLogin && (document.title = LOGIN_TITLE);
+    isForgotPassword && (document.title = FORGOT_PASSWORD_TITLE);
+    isResetPassword && (document.title = RESET_PASSWORD_TITLE);
+  }, [isLogin, isForgotPassword, isResetPassword]);
+  return React__default.createElement("div", {
+    className: styles["login"] + " container-fluid font-family-lato"
+  }, React__default.createElement(reactstrap.Row, {
+    className: "h-100"
+  }, React__default.createElement(reactstrap.Col, {
+    lg: 12,
+    md: 12,
+    xs: 12,
+    className: "d-flex justify-content-center h-100 align-items-center"
+  }, React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptchaProvider, {
+    useRecaptchaNet: true,
+    reCaptchaKey: GOOGLE_RECAPTCHA_KEY,
+    scriptProps: {
+      async: true,
+      defer: true,
+      appendTo: "body"
+    }
+  }, isLogin && React__default.createElement(BlockLogin, {
+    userLogin: userLogin,
+    defaultInfo: defaultInfo
+  }), isForgotPassword && React__default.createElement(BlockForgetPassword, null)), isResetPassword && React__default.createElement(BlockResetPassword, null), isLoginTwoFactor && React__default.createElement(BlockTwoFactorLogin, null))));
+};
+
 var QuoteContent = function QuoteContent(_ref) {
   var descriptions = _ref.descriptions;
   return React__default.createElement("div", {
@@ -1420,11 +1598,11 @@ var TheHeader = function TheHeader() {
   }, "Privacy Policy"), !isDistrict && React__default.createElement(NotificationButton, null), React__default.createElement(TheHeaderDropdown, null)));
 };
 
-var TITLE$2 = "Not found";
+var TITLE$3 = "Not found";
 
 var NotFound = function NotFound() {
   React.useEffect(function () {
-    document.title = TITLE$2;
+    document.title = TITLE$3;
   });
   return React__default.createElement("div", {
     className: "not-found"
@@ -1788,7 +1966,7 @@ var useFilters = function useFilters() {
 
 var EMAIL_TEMPLATE_URL$1 = "/admin/email-template";
 var CREATE_TEMPLATE_URL = "/admin/create-email-template";
-var TITLE$3 = "Email template list";
+var TITLE$4 = "Email template list";
 
 var useEmailTemplateList = function useEmailTemplateList() {
   var history = reactRouterDom.useHistory();
@@ -1889,7 +2067,7 @@ var useEmailTemplateList = function useEmailTemplateList() {
     history.push(url);
   }, []);
   React.useEffect(function () {
-    document.title = TITLE$3;
+    document.title = TITLE$4;
   }, []);
   React.useEffect(function () {
     getData();
@@ -2247,7 +2425,6 @@ var config = {
   force_br_newlines: true,
   force_p_newlines: false,
   branding: false,
-  convert_urls: false,
   plugins: "advlist autolink lists link image charmap print preview anchor\n        searchreplace visualblocks code fullscreen\n        insertdatetime media table paste code help wordcount media",
   toolbar: "undo redo | formatselect | bold italic backcolor |         alignleft aligncenter alignright alignjustify |         bullist numlist outdent indent | removeformat | image",
   paste_data_images: true
@@ -2375,7 +2552,7 @@ var initValue = {
   attachments: []
 };
 var EMAIL_TEMPLATE_LIST_URL = "/admin/email-template";
-var TITLE$4 = "Email template detail";
+var TITLE$5 = "Email template detail";
 var MAX_FILES_SIZE = 4194304;
 
 var useEmailTemplateDetail = function useEmailTemplateDetail(id) {
@@ -2410,7 +2587,7 @@ var useEmailTemplateDetail = function useEmailTemplateDetail(id) {
       setFileUpload = _useState4[1];
 
   React.useEffect(function () {
-    document.title = TITLE$4;
+    document.title = TITLE$5;
     setEdited(false);
     if (!!localStorage.getItem(window.location.href)) localStorage.removeItem(window.location.href);
   }, []);
@@ -2641,7 +2818,7 @@ var useEmailTemplateDetail = function useEmailTemplateDetail(id) {
   };
 };
 
-var schema$1 = yup.object({
+var schema$2 = yup.object({
   subject: yup.string().required("Template subject is required"),
   categoryId: yup.number().required("Template category is required").test("test category id", "Template category is required", function (value) {
     return value >= 1;
@@ -2678,7 +2855,7 @@ var EmailTemplateDetail = function EmailTemplateDetail() {
   return React__default.createElement(formik.Formik, {
     initialValues: emailTemplateDetail,
     enableReinitialize: true,
-    validationSchema: schema$1,
+    validationSchema: schema$2,
     onSubmit: function onSubmit(values) {
       confirmData(values);
       setEdited(false);
@@ -2895,7 +3072,7 @@ var CommonModal = function CommonModal(props, ref) {
 
 var CommonModal$1 = React.forwardRef(CommonModal);
 
-var schema$2 = yup.object({
+var schema$3 = yup.object({
   question: yup.string().required("Question is required"),
   answer: yup.string().required("Answer is required")
 });
@@ -2913,7 +3090,7 @@ var FaqDetailModal = function FaqDetailModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: faqDetail,
     enableReinitialize: true,
-    validationSchema: schema$2,
+    validationSchema: schema$3,
     onSubmit: function onSubmit(values, actions) {
       onConfirm(values);
       actions.resetForm();
@@ -2995,7 +3172,7 @@ var remove$1 = function remove(id) {
   return api["delete"](FAQ_URL + "/" + id);
 };
 
-var TITLE$5 = "FAQ list";
+var TITLE$6 = "FAQ list";
 
 var useFaqList = function useFaqList() {
   var faqList = reactRedux.useSelector(function (state) {
@@ -3078,7 +3255,7 @@ var useFaqList = function useFaqList() {
     dispatch(setLoading(false));
   }, [filters]);
   React.useEffect(function () {
-    document.title = TITLE$5;
+    document.title = TITLE$6;
   }, []);
   React.useEffect(function () {
     getData();
@@ -3425,7 +3602,7 @@ var SkillSelector = function SkillSelector(props) {
   }));
 };
 
-var schema$3 = yup.object({
+var schema$4 = yup.object({
   name: yup.string().required("Name is required"),
   description: yup.string()
 });
@@ -3444,7 +3621,7 @@ var SkillDetailModal = function SkillDetailModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: skillDetail,
     enableReinitialize: true,
-    validationSchema: schema$3,
+    validationSchema: schema$4,
     onSubmit: function onSubmit(values, actions) {
       onConfirm(values);
       actions.resetForm();
@@ -3518,7 +3695,7 @@ var SkillDetailModal$1 = React.forwardRef(SkillDetailModal);
 
 var setSkillList = toolkit.createAction("skills/setSkillList");
 
-var TITLE$6 = "Skill list";
+var TITLE$7 = "Skill list";
 
 var useSkillList = function useSkillList() {
   var skillList = reactRedux.useSelector(function (state) {
@@ -3612,7 +3789,7 @@ var useSkillList = function useSkillList() {
     dispatch(setLoading(false));
   }, [filters]);
   React.useEffect(function () {
-    document.title = TITLE$6;
+    document.title = TITLE$7;
   }, []);
   React.useEffect(function () {
     getData();
@@ -3910,12 +4087,12 @@ var changePassword = function changePassword(formData) {
 
 var USER_URL$1 = "/admin/user";
 var CREATE_USER_URL = "/admin/create-user";
-var TITLE$7 = "User list";
+var TITLE$8 = "User list";
 
 var useUserList = function useUserList() {
   var history = reactRouterDom.useHistory();
   var query = new URLSearchParams(location.search);
-  var queryName = query.get("query");
+  var fullName = query.get("query");
   var userList = reactRedux.useSelector(function (state) {
     return state.users.userList;
   });
@@ -3927,12 +4104,8 @@ var useUserList = function useUserList() {
       filters = _useFilters.filters,
       changeFilters = _useFilters.changeFilters;
 
-  var _useState = React.useState(!!queryName ? queryName : ""),
-      fullName = _useState[0],
-      setFullName = _useState[1];
-
   var dispatch = reactRedux.useDispatch();
-  var getData = React.useCallback(function (fullName) {
+  var getData = React.useCallback(function () {
     try {
       var _temp3 = function _temp3() {
         dispatch(setLoading(false));
@@ -3941,9 +4114,7 @@ var useUserList = function useUserList() {
       dispatch(setLoading(true));
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(fullName ? get$5(_extends({}, filters, {
-          searchString: fullName
-        })) : get$5(filters)).then(function (res) {
+        return Promise.resolve(get$5(filters)).then(function (res) {
           var _res$data = res.data,
               items = _res$data.items,
               totalItems = _res$data.totalItems;
@@ -3967,16 +4138,16 @@ var useUserList = function useUserList() {
     }
   }, [dispatch, filters]);
   React.useEffect(function () {
-    document.title = TITLE$7;
+    document.title = TITLE$8;
   }, []);
   React.useEffect(function () {
-    if (!!fullName) {
-      getData(fullName);
-      setFullName(null);
-    } else {
-      getData();
-    }
+    getData();
   }, [filters]);
+  React.useEffect(function () {
+    changeFilters({
+      searchString: fullName
+    });
+  }, [fullName]);
   var removeData = React.useCallback(function (id) {
     dispatch(setLoading(true));
 
@@ -4022,7 +4193,7 @@ var useUserList = function useUserList() {
     userList: userList,
     totalItems: totalItems,
     filters: filters,
-    queryName: queryName,
+    fullName: fullName,
     getData: getData,
     removeData: removeData,
     changeFilters: changeFilters,
@@ -4099,7 +4270,7 @@ var header$2 = "User";
 
 var UserList = function UserList() {
   var _useUserList = useUserList(),
-      queryName = _useUserList.queryName,
+      fullName = _useUserList.fullName,
       userList = _useUserList.userList,
       totalItems = _useUserList.totalItems,
       filters = _useUserList.filters,
@@ -4120,7 +4291,7 @@ var UserList = function UserList() {
     onClick: function onClick() {
       return reDirectDetailPage();
     },
-    initValue: !!queryName ? queryName : "",
+    initValue: !!fullName ? fullName : '',
     onSearch: function onSearch(searchString) {
       return changeFilters({
         searchString: searchString
@@ -4292,7 +4463,7 @@ var initValue$3 = {
   profileImageFileName: ""
 };
 var USER_LIST_URL = "/admin/user";
-var TITLE$8 = "User detail";
+var TITLE$9 = "User detail";
 
 var useUserDetail = function useUserDetail(id) {
   var dispatch = reactRedux.useDispatch();
@@ -4321,7 +4492,7 @@ var useUserDetail = function useUserDetail(id) {
   };
 
   React.useEffect(function () {
-    document.title = TITLE$8;
+    document.title = TITLE$9;
     setEdited(false);
     if (!!localStorage.getItem(window.location.href)) localStorage.removeItem(window.location.href);
   }, []);
@@ -5161,7 +5332,7 @@ var defaultFilters = {
   searchString: "",
   isRead: false
 };
-var TITLE$9 = "Notification list";
+var TITLE$a = "Notification list";
 var NOTIFICATION_CHANNEL$1 = "NOTIFICATION_CHANNEL";
 var NEW_NOTIFICATION$1 = "NEW_NOTIFICATION";
 
@@ -5254,7 +5425,7 @@ var useNotificationList = function useNotificationList() {
     }
   }, [filters]);
   React.useEffect(function () {
-    document.title = TITLE$9;
+    document.title = TITLE$a;
   }, []);
   React.useEffect(function () {
     getData();
@@ -5504,7 +5675,7 @@ var CommonAlert = function CommonAlert() {
   }, alert.message)) : null;
 };
 
-var schema$4 = yup.object({
+var schema$5 = yup.object({
   name: yup.string().required("Name is required")
 });
 
@@ -5518,7 +5689,7 @@ var ActionModal = function ActionModal(props, ref) {
       name: targetMedia === null || targetMedia === void 0 ? void 0 : targetMedia.name
     },
     enableReinitialize: true,
-    validationSchema: schema$4,
+    validationSchema: schema$5,
     onSubmit: function onSubmit(values, actions) {
       onConfirm && onConfirm(values);
       actions.resetForm();
@@ -5816,7 +5987,7 @@ var get$8 = function get(filter) {
   });
 };
 
-var TITLE$a = "Gallery";
+var TITLE$b = "Gallery";
 var defaultFilter = {
   searchString: ""
 };
@@ -6053,7 +6224,7 @@ var useGalleryList = function useGalleryList(isLibrary) {
     }
   }, [dispatch, filters]);
   React.useEffect(function () {
-    document.title = TITLE$a;
+    document.title = TITLE$b;
     dispatch(setTargetMedia({
       targetMedia: undefined
     }));