mario-core 2.9.238-layout → 2.9.239-release

package/dist/index.modern.js

@@ -5,9 +5,10 @@ export { I18nextProvider, useTranslation } from 'react-i18next';
 import React, { useState, useCallback, useEffect, forwardRef, useRef, Suspense, memo, Fragment, useImperativeHandle, useMemo } from 'react';
 import { Input, Modal, ModalHeader, ModalBody, ModalFooter, Button, Row, Col, Form, FormGroup, Navbar, NavbarBrand, Collapse, Nav, NavItem, NavLink, Dropdown, DropdownToggle, DropdownMenu, DropdownItem, Alert, Pagination, PaginationItem, PaginationLink, Table, Label, Popover, PopoverBody, TabContent, TabPane, CardText, CustomInput, Card, CardImg, CardBody, CardTitle, CardHeader } from 'reactstrap';
 import { useHistory, Link, useLocation, Switch, Route, Prompt, useParams } from 'react-router-dom';
+import { useDispatch, useSelector } from 'react-redux';
 import { Formik } from 'formik';
 import { object, string, boolean, number, array } from 'yup';
-import { useDispatch, useSelector } from 'react-redux';
+import { LogLevel, PublicClientApplication } from '@azure/msal-browser';
 import { createAction, createReducer, configureStore } from '@reduxjs/toolkit';
 import axios from 'axios';
 import amplitude from 'amplitude-js';
@@ -1843,6 +1844,7 @@ var accommodation_set = "Accommodation Set";
 var add_new_accommodation = "Add new accommodation";
 var print_my_accommodations = "Print my accommodations";
 var my_learning_progress = "My Learning Progress";
+var weekly_quests = "Weekly quests";
 var responses_comparisons = "Responses Comparisons";
 var dropdown_and_verbal_questions_responses = "Dropdown and Verbal Questions Responses";
 var mario_tools = "MARIO TOOLS";
@@ -1984,6 +1986,7 @@ var suggestion = "suggestion";
 var tutorial_screen = "tutorial screen";
 var reflection_forms = "reflection forms";
 var select_question_to_add = "Select question to add";
+var all_of_the_students_marked_as_feeling_safe = "All of the students marked as feeling safe";
 var lang_us = {
 	dashboard: dashboard,
 	user: user,
@@ -3811,6 +3814,7 @@ var lang_us = {
 	my_learning_progress: my_learning_progress,
 	"here_your_teacher_can_edit_or_add_your_accommodation_details._please_note_that_you_can_view_the_information,_but_for_any_edits_or_additions,_kindly_contact_your_teacher_directly.": "Here your teacher can edit or add your accommodation details. Please note that you can view the information, but for any edits or additions, kindly contact your teacher directly.",
 	"this_is_a_brand_new_beta_version_for_your_personal_learning_journey._you_can_think_about_what_you_want_like_to_do_and_how_you_like_to_learn._we_advise_you_to_do_it_gradually_per_section_and_visit_it_once_a_month.": "This is a brand new beta version for your personal learning journey. You can think about what you want like to do and how you like to learn. We advise you to do it gradually per section and visit it once a month.",
+	weekly_quests: weekly_quests,
 	responses_comparisons: responses_comparisons,
 	dropdown_and_verbal_questions_responses: dropdown_and_verbal_questions_responses,
 	mario_tools: mario_tools,
@@ -3967,7 +3971,8 @@ var lang_us = {
 	suggestion: suggestion,
 	tutorial_screen: tutorial_screen,
 	reflection_forms: reflection_forms,
-	select_question_to_add: select_question_to_add
+	select_question_to_add: select_question_to_add,
+	all_of_the_students_marked_as_feeling_safe: all_of_the_students_marked_as_feeling_safe
 };
 
 var dashboard$1 = "Dashboard";
@@ -4520,6 +4525,7 @@ var do_you_want_to_share_a_survey_to_teachers$1 = "Do you want to share a survey
 var you_can_share_this_survey_to_teachers_to_get_more_insight_about_your_student$1 = "You can share this survey to teachers to get more insight about your student.";
 var skip$1 = "skip";
 var survey_questions$1 = "Survey questions";
+var weekly_quests$1 = "Weekly quests";
 var add_survey_question$1 = "Add Survey Question";
 var additional_question$1 = "Additional Question";
 var add_additional_question$1 = "Add additional question";
@@ -5776,13 +5782,13 @@ var accommodation_set$1 = "Accommodation Set";
 var add_new_accommodation$1 = "Add new accommodation";
 var print_my_accommodations$1 = "Print my accommodations";
 var my_learning_progress$1 = "My Learning Progress";
+var inactive_students$1 = "Inactive Students";
 var responses_comparisons$1 = "Responses Comparisons";
 var dropdown_and_verbal_questions_responses$1 = "Dropdown and Verbal Questions Responses";
 var mario_tools$1 = "MARIO TOOLS";
 var customize$1 = "Customize";
 var techical_settings$1 = "Technical Settings";
 var data_import_export$1 = "Data Import/Export";
-var inactive_students$1 = "Inactive Students";
 var admin_general_tips$1 = "Admin General Tips";
 var school_usage$1 = "School Usage";
 var total_conversations_time$1 = "Total Conversations Time";
@@ -5917,6 +5923,7 @@ var suggestion$1 = "suggestion";
 var tutorial_screen$1 = "tutorial screen";
 var reflection_forms$1 = "reflection forms";
 var select_question_to_add$1 = "Select question to add";
+var all_of_the_students_marked_as_feeling_safe$1 = "All of the students marked as feeling safe";
 var lang_uk = {
 	dashboard: dashboard$1,
 	user: user$1,
@@ -6474,6 +6481,7 @@ var lang_uk = {
 	you_can_share_this_survey_to_teachers_to_get_more_insight_about_your_student: you_can_share_this_survey_to_teachers_to_get_more_insight_about_your_student$1,
 	skip: skip$1,
 	survey_questions: survey_questions$1,
+	weekly_quests: weekly_quests$1,
 	add_survey_question: add_survey_question$1,
 	additional_question: additional_question$1,
 	add_additional_question: add_additional_question$1,
@@ -7743,6 +7751,7 @@ var lang_uk = {
 	print_my_accommodations: print_my_accommodations$1,
 	my_learning_progress: my_learning_progress$1,
 	"here_your_teacher_can_edit_or_add_your_accommodation_details._please_note_that_you_can_view_the_information,_but_for_any_edits_or_additions,_kindly_contact_your_teacher_directly.": "Here your teacher can edit or add your accommodation details. Please note that you can view the information, but for any edits or additions, kindly contact your teacher directly.",
+	inactive_students: inactive_students$1,
 	"this_is_a_brand_new_beta_version_for_your_personal_learning_journey._you_can_think_about_what_you_want_like_to_do_and_how_you_like_to_learn._we_advise_you_to_do_it_gradually_per_section_and_visit_it_once_a_month.": "This is a brand new beta version for your personal learning journey. You can think about what you want like to do and how you like to learn. We advise you to do it gradually per section and visit it once a month.",
 	responses_comparisons: responses_comparisons$1,
 	dropdown_and_verbal_questions_responses: dropdown_and_verbal_questions_responses$1,
@@ -7750,7 +7759,6 @@ var lang_uk = {
 	customize: customize$1,
 	techical_settings: techical_settings$1,
 	data_import_export: data_import_export$1,
-	inactive_students: inactive_students$1,
 	admin_general_tips: admin_general_tips$1,
 	school_usage: school_usage$1,
 	total_conversations_time: total_conversations_time$1,
@@ -7900,7 +7908,8 @@ var lang_uk = {
 	suggestion: suggestion$1,
 	tutorial_screen: tutorial_screen$1,
 	reflection_forms: reflection_forms$1,
-	select_question_to_add: select_question_to_add$1
+	select_question_to_add: select_question_to_add$1,
+	all_of_the_students_marked_as_feeling_safe: all_of_the_students_marked_as_feeling_safe$1
 };
 
 var dashboard$2 = "لوحة المعلومات";
@@ -12519,8 +12528,6 @@ var performance$4 = "Actuación";
 var not_enough_challenge_leading_to_boredom_and_lack_of_interest$3 = "No hay suficientes desafíos lo que lleva al aburrimiento y la falta de interés.";
 var calm_and_relaxed_but_not_enough_motivation_to_perform_at_my_best$3 = "Tranquilo y relajado pero no hay suficiente motivación para dar lo mejor de mí.";
 var manageable_levels_of_stress_allowing_me_to_perform_at_my_best$3 = "Niveles manejables de estrés que me permiten rendir al máximo.";
-var still_in_control_but_starting_to_feel_the_pressure$3 = "Aún tengo el control pero empiezo a sentir la presión.";
-var too_much_pressure_and_really_struggling_to_manage_my_workload$3 = "Demasiada presión y muchas dificultades para gestionar mi carga de trabajo.";
 var import_emails_by_csv$3 = "Importar correo electrónico por csv";
 var request_number$3 = "Número de solicitud";
 var select_or_input_class_type$3 = "Seleccione o ingrese el tipo de clase";
@@ -13600,7 +13607,7 @@ var customize$3 = "Personalizar";
 var techical_settings$3 = "Configuración técnica";
 var data_import_export$3 = "Importación/Exportación de datos";
 var question_text$3 = "Texto de la pregunta";
-var weekly_quests = "Misiones semanales";
+var weekly_quests$2 = "Misiones semanales";
 var inactive_students$3 = "Estudiantes inactivos";
 var admin_general_tips$3 = "Consejos generales para el administrador";
 var school_usage$3 = "Uso escolar";
@@ -14453,8 +14460,6 @@ var lang_es = {
 	not_enough_challenge_leading_to_boredom_and_lack_of_interest: not_enough_challenge_leading_to_boredom_and_lack_of_interest$3,
 	calm_and_relaxed_but_not_enough_motivation_to_perform_at_my_best: calm_and_relaxed_but_not_enough_motivation_to_perform_at_my_best$3,
 	manageable_levels_of_stress_allowing_me_to_perform_at_my_best: manageable_levels_of_stress_allowing_me_to_perform_at_my_best$3,
-	still_in_control_but_starting_to_feel_the_pressure: still_in_control_but_starting_to_feel_the_pressure$3,
-	too_much_pressure_and_really_struggling_to_manage_my_workload: too_much_pressure_and_really_struggling_to_manage_my_workload$3,
 	import_emails_by_csv: import_emails_by_csv$3,
 	request_number: request_number$3,
 	select_or_input_class_type: select_or_input_class_type$3,
@@ -15539,7 +15544,7 @@ var lang_es = {
 	techical_settings: techical_settings$3,
 	data_import_export: data_import_export$3,
 	question_text: question_text$3,
-	weekly_quests: weekly_quests,
+	weekly_quests: weekly_quests$2,
 	inactive_students: inactive_students$3,
 	admin_general_tips: admin_general_tips$3,
 	school_usage: school_usage$3,
@@ -16422,8 +16427,8 @@ var performance$5 = "表现";
 var not_enough_challenge_leading_to_boredom_and_lack_of_interest$4 = "挑战不够，导致无聊和缺乏兴趣。";
 var calm_and_relaxed_but_not_enough_motivation_to_perform_at_my_best$4 = "平静而放松，但没有足够的动力来发挥我的最佳水平。";
 var manageable_levels_of_stress_allowing_me_to_perform_at_my_best$4 = "可控的压力水平让我能够发挥出最佳水平。";
-var still_in_control_but_starting_to_feel_the_pressure$4 = "仍在控制之中，但开始感到压力。";
-var too_much_pressure_and_really_struggling_to_manage_my_workload$4 = "压力过大，真的很难管理我的工作量。";
+var still_in_control_but_starting_to_feel_the_pressure$3 = "仍在控制之中，但开始感到压力。";
+var too_much_pressure_and_really_struggling_to_manage_my_workload$3 = "压力过大，真的很难管理我的工作量。";
 var import_emails_by_csv$4 = "通过 csv 导入电子邮件";
 var request_number$4 = "请求编号";
 var select_or_input_class_type$4 = "选择或输入班级类型";
@@ -17503,7 +17508,7 @@ var customize$4 = "自定义";
 var techical_settings$4 = "技术设置";
 var data_import_export$4 = "数据导入/导出";
 var question_text$4 = "问题文本";
-var weekly_quests$1 = "每周任务";
+var weekly_quests$3 = "每周任务";
 var inactive_students$4 = "非活跃学生";
 var admin_general_tips$4 = "管理员一般提示";
 var school_usage$4 = "学校使用";
@@ -18383,8 +18388,8 @@ var lang_zh = {
 	not_enough_challenge_leading_to_boredom_and_lack_of_interest: not_enough_challenge_leading_to_boredom_and_lack_of_interest$4,
 	calm_and_relaxed_but_not_enough_motivation_to_perform_at_my_best: calm_and_relaxed_but_not_enough_motivation_to_perform_at_my_best$4,
 	manageable_levels_of_stress_allowing_me_to_perform_at_my_best: manageable_levels_of_stress_allowing_me_to_perform_at_my_best$4,
-	still_in_control_but_starting_to_feel_the_pressure: still_in_control_but_starting_to_feel_the_pressure$4,
-	too_much_pressure_and_really_struggling_to_manage_my_workload: too_much_pressure_and_really_struggling_to_manage_my_workload$4,
+	still_in_control_but_starting_to_feel_the_pressure: still_in_control_but_starting_to_feel_the_pressure$3,
+	too_much_pressure_and_really_struggling_to_manage_my_workload: too_much_pressure_and_really_struggling_to_manage_my_workload$3,
 	import_emails_by_csv: import_emails_by_csv$4,
 	request_number: request_number$4,
 	select_or_input_class_type: select_or_input_class_type$4,
@@ -19469,7 +19474,7 @@ var lang_zh = {
 	techical_settings: techical_settings$4,
 	data_import_export: data_import_export$4,
 	question_text: question_text$4,
-	weekly_quests: weekly_quests$1,
+	weekly_quests: weekly_quests$3,
 	inactive_students: inactive_students$4,
 	admin_general_tips: admin_general_tips$4,
 	school_usage: school_usage$4,
@@ -37171,6 +37176,8 @@ var setModal = createAction("common/setModal");
 var setUser = createAction("common/setUser");
 var setSidebar = createAction("common/setSidebar");
 var setAlert = createAction("common/setAlert");
+var setIsLoginGoogle = createAction("common/setIsLoginGoogle");
+var setInforUserGoogle = createAction("common/setInforUserGoogle");
 var reset = createAction("common/reset");
 var showMenuBar = createAction("common/showMenuBar");
 var showFontSize = createAction("common/showFontSize");
@@ -37234,13 +37241,11 @@ var apiUpload = axios.create({
   return i.interceptors.response.use(function (response) {
     return response;
   }, function (error) {
-    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"))) {
+    if (error.response.status === 401) {
       Object.keys(localStorage).forEach(function (key) {
         if (!key.includes('learning-plan')) delete localStorage[key];
       });
@@ -37257,13 +37262,16 @@ var apiUpload = axios.create({
         amplitude.getInstance().resetSessionId();
       }
 
-      localStorage.setItem("USER_EMAIL", "");
+      localStorage.removeItem(ACCESS_TOKEN);
+      localStorage.removeItem("USER_EMAIL");
+      localStorage.removeItem("ROLES");
       window.location.href = "/login";
     }
 
-    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"))) {
+    if (error.response.status == 403) {
       localStorage.removeItem(ACCESS_TOKEN);
       localStorage.removeItem("USER_EMAIL");
+      localStorage.removeItem("ROLES");
       window.location.href = "/login";
     }
 
@@ -37307,8 +37315,12 @@ var checkResetToken = function checkResetToken(token, key) {
 var resetPassword = function resetPassword(data) {
   return api.post(ACCOUNT_URL + "/resetpassword", data);
 };
-var checkUserGoogle = function checkUserGoogle(body) {
-  return api.post(USER_URL + "/check-user", body);
+var checkUserGoogle = function checkUserGoogle(type, body) {
+  return api.post(USER_URL + "/check-user", body, {
+    params: {
+      type: type
+    }
+  });
 };
 var getAllLoginTeacher = function getAllLoginTeacher(param) {
   return api.get(TEACHER_URL + "/get-teacher-login", {
@@ -37330,6 +37342,14 @@ var getSchoolSettings = function getSchoolSettings() {
   return api.get(SCHOOL_URL + "/settings");
 };
 
+var TypeLogin;
+
+(function (TypeLogin) {
+  TypeLogin[TypeLogin["Google"] = 0] = "Google";
+  TypeLogin[TypeLogin["ClassLink"] = 1] = "ClassLink";
+  TypeLogin[TypeLogin["MicrosoftSSO"] = 2] = "MicrosoftSSO";
+})(TypeLogin || (TypeLogin = {}));
+
 var LoginType;
 
 (function (LoginType) {
@@ -37338,6 +37358,48 @@ var LoginType;
   LoginType[LoginType["Impersonate"] = 2] = "Impersonate";
 })(LoginType || (LoginType = {}));
 
+var msalConfig = {
+  auth: {
+    clientId: "90c6897c-f17b-475e-a7a8-9a19651e0060",
+    authority: "https://login.microsoftonline.com/common",
+    redirectUri: window.location.origin + "/login"
+  },
+  cache: {
+    cacheLocation: "sessionStorage",
+    storeAuthStateInCookie: false
+  },
+  system: {
+    loggerOptions: {
+      loggerCallback: function loggerCallback(level, message, containsPii) {
+        if (containsPii) {
+          return;
+        }
+
+        switch (level) {
+          case LogLevel.Error:
+            console.error(message);
+            return;
+
+          case LogLevel.Info:
+            console.info(message);
+            return;
+
+          case LogLevel.Verbose:
+            console.debug(message);
+            return;
+
+          case LogLevel.Warning:
+            console.warn(message);
+            return;
+
+          default:
+            return;
+        }
+      }
+    }
+  }
+};
+
 var defaultInfo = {
   email: "",
   password: "",
@@ -37360,36 +37422,39 @@ var useLogin = function useLogin() {
       openLogin = _useState[0],
       setOpenLogin = _useState[1];
 
-  var _useState2 = useState(false),
-      isLoginGoogle = _useState2[0],
-      setIsLoginGoogle = _useState2[1];
-
-  var _useState3 = useState(""),
-      googleClientId = _useState3[0],
-      setGoogleClientId = _useState3[1];
+  var isLoginGoogle = useSelector(function (state) {
+    return state.common.isLoginGoogle;
+  });
 
-  var _useState4 = useState(""),
-      googleRecaptchaId = _useState4[0],
-      setGoogleRecaptchaId = _useState4[1];
+  var _useState2 = useState(""),
+      googleClientId = _useState2[0],
+      setGoogleClientId = _useState2[1];
 
-  var _useState5 = useState(),
-      infoUser = _useState5[0],
-      setInfoUser = _useState5[1];
+  var _useState3 = useState(""),
+      googleRecaptchaId = _useState3[0],
+      setGoogleRecaptchaId = _useState3[1];
 
+  var infoUser = useSelector(function (state) {
+    return state.common.inforUserGoogle;
+  });
   var params = new URLSearchParams(location.search);
   var loginClassLink = params.get("type") === "classlink";
   var tokenClassLink = params.get("token");
 
-  var _useState6 = useState(false),
-      openModelAssign = _useState6[0];
+  var _useState4 = useState(false),
+      openModelAssign = _useState4[0];
+
+  var _useState5 = useState(),
+      msalInstance = _useState5[0],
+      setMsalInstance = _useState5[1];
 
   var toggle = useCallback(function () {
     setOpenLogin(!openLogin);
   }, [openLogin]);
 
-  var _useState7 = useState(false),
-      isShowPassword = _useState7[0],
-      setIsShowPassword = _useState7[1];
+  var _useState6 = useState(false),
+      isShowPassword = _useState6[0],
+      setIsShowPassword = _useState6[1];
 
   useEffect(function () {
     document.title = TITLE;
@@ -37571,40 +37636,51 @@ var useLogin = function useLogin() {
     }
   };
 
-  var fnIsCheckLogin = useCallback(function (data, token, clickHandler) {
+  var fnIsCheckLogin = useCallback(function (type, data, token, clickHandler) {
     try {
-      var _temp14 = function _temp14() {
+      var _temp16 = function _temp16() {
         dispatch(setLoading(false));
       };
 
       dispatch(setLoading(true));
 
-      var _temp15 = _catch(function () {
-        return Promise.resolve(checkUserGoogle(data)).then(function (res) {
+      var _temp17 = _catch(function () {
+        return Promise.resolve(checkUserGoogle(type, data)).then(function (res) {
           var checkUser = res.data;
 
-          var _temp11 = function () {
+          var _temp13 = function () {
             if (checkUser) {
-              return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
-                var dataUser = {
-                  email: data.email,
-                  captcha: clickHandlerRes,
-                  isLoginGoogle: true,
-                  rememberMe: false,
-                  password: "default",
-                  accessToken: token,
-                  loginType: LoginType.Google
-                };
-                return Promise.resolve(userLogin(dataUser)).then(function () {
-                  setIsLoginGoogle(false);
+              var _temp18 = function _temp18() {
+                return Promise.resolve(userLogin(_dataUser)).then(function () {
+                  dispatch(setIsLoginGoogle(false));
                 });
-              });
+              };
+
+              var _dataUser = {
+                email: data.email,
+                isLoginGoogle: true,
+                rememberMe: false,
+                password: "default",
+                accessToken: token,
+                captcha: "",
+                loginType: LoginType.Google
+              };
+
+              var _temp19 = function () {
+                if (clickHandler != null) {
+                  return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
+                    _dataUser.captcha = clickHandlerRes;
+                  });
+                }
+              }();
+
+              return _temp19 && _temp19.then ? _temp19.then(_temp18) : _temp18(_temp19);
             } else {
-              setIsLoginGoogle(true);
+              dispatch(setIsLoginGoogle(true));
             }
           }();
 
-          if (_temp11 && _temp11.then) return _temp11.then(function () {});
+          if (_temp13 && _temp13.then) return _temp13.then(function () {});
         });
       }, function (err) {
         var _err$response4, _err$response4$data;
@@ -37615,7 +37691,7 @@ var useLogin = function useLogin() {
         }));
       });
 
-      return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(_temp14) : _temp14(_temp15));
+      return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(_temp16) : _temp16(_temp17));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -37623,14 +37699,14 @@ var useLogin = function useLogin() {
 
   var submitLogin = function submitLogin(teacherId, clickHandler) {
     try {
-      var _temp19 = function _temp19() {
-        setIsLoginGoogle(false);
+      var _temp23 = function _temp23() {
+        dispatch(setIsLoginGoogle(false));
         dispatch(setLoading(false));
       };
 
       dispatch(setLoading(true));
 
-      var _temp20 = _catch(function () {
+      var _temp24 = _catch(function () {
         var data = {
           firstName: infoUser.firstName,
           lastName: infoUser.lastName,
@@ -37641,7 +37717,7 @@ var useLogin = function useLogin() {
           teacherId: teacherId
         };
         return Promise.resolve(registerUserStudent(data)).then(function (res) {
-          var _temp16 = function () {
+          var _temp20 = function () {
             if (res.data) {
               return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
                 var dataLogin = {
@@ -37653,7 +37729,7 @@ var useLogin = function useLogin() {
                   accessToken: infoUser.accessToken,
                   loginType: LoginType.Google
                 };
-                setIsLoginGoogle(false);
+                dispatch(setIsLoginGoogle(false));
                 return Promise.resolve(userLogin(dataLogin)).then(function () {
                   history.push(HOMEPAGE_STUDENT);
                 });
@@ -37661,7 +37737,7 @@ var useLogin = function useLogin() {
             }
           }();
 
-          if (_temp16 && _temp16.then) return _temp16.then(function () {});
+          if (_temp20 && _temp20.then) return _temp20.then(function () {});
         });
       }, function (err) {
         var _err$response5, _err$response5$data;
@@ -37672,7 +37748,7 @@ var useLogin = function useLogin() {
         }));
       });
 
-      return Promise.resolve(_temp20 && _temp20.then ? _temp20.then(_temp19) : _temp19(_temp20));
+      return Promise.resolve(_temp24 && _temp24.then ? _temp24.then(_temp23) : _temp23(_temp24));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -37680,7 +37756,7 @@ var useLogin = function useLogin() {
 
   var getInformationSetting = function getInformationSetting() {
     try {
-      var _temp22 = _catch(function () {
+      var _temp26 = _catch(function () {
         return Promise.resolve(getSchoolSettings()).then(function (res) {
           dispatch(setSandboxMode(res.data.isSandboxMode));
         });
@@ -37688,14 +37764,89 @@ var useLogin = function useLogin() {
         console.error(err);
       });
 
-      return Promise.resolve(_temp22 && _temp22.then ? _temp22.then(function () {}) : void 0);
+      return Promise.resolve(_temp26 && _temp26.then ? _temp26.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
+  var fnLoginSSO = function fnLoginSSO(clickHandler) {
+    try {
+      msalInstance.handleRedirectPromise().then(function (tokenResponse) {
+        try {
+          var _temp29 = function () {
+            if (!tokenResponse) {
+              var accounts = msalInstance.getAllAccounts();
+
+              var _temp30 = function () {
+                if (accounts.length === 0) {
+                  msalInstance.loginRedirect();
+                } else {
+                  var currentAccount = accounts[0];
+                  return Promise.resolve(getCurrentAccount(currentAccount, clickHandler)).then(function () {});
+                }
+              }();
+
+              if (_temp30 && _temp30.then) return _temp30.then(function () {});
+            } else {
+              var currentAccount = tokenResponse.account;
+              return Promise.resolve(getCurrentAccount(currentAccount, clickHandler)).then(function () {});
+            }
+          }();
+
+          return Promise.resolve(_temp29 && _temp29.then ? _temp29.then(function () {}) : void 0);
+        } catch (e) {
+          return Promise.reject(e);
+        }
+      })["catch"](function (err) {
+        console.error(err);
+      });
+      return Promise.resolve();
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
+  var getCurrentAccount = function getCurrentAccount(account, clickHandler) {
+    try {
+      var fullName = account.name;
+      var infoLogin = {
+        firstName: fullName.split(' ').slice(0, -1).join(' '),
+        lastName: fullName.split(' ').slice(-1).join(' '),
+        fullName: fullName,
+        imageUrl: "",
+        email: account.username,
+        accessToken: account.idTokenClaims.aio,
+        googleId: account.tenantId
+      };
+      dispatch(setInforUserGoogle(infoLogin));
+      return Promise.resolve(fnIsCheckLogin(TypeLogin.MicrosoftSSO, infoLogin, account.idTokenClaims.aio, clickHandler)).then(function () {});
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
+  var initInformationSSO = function initInformationSSO() {
+    try {
+      var _msalInstance = new PublicClientApplication(msalConfig);
+
+      setMsalInstance(_msalInstance);
+      return Promise.resolve();
     } catch (e) {
       return Promise.reject(e);
     }
   };
 
+  useEffect(function () {
+    var redirectUrl = window.location.href;
+
+    if (!!msalInstance && redirectUrl.includes("code") && redirectUrl.includes("client_info")) {
+      fnLoginSSO();
+    }
+  }, [JSON.stringify(msalInstance)]);
   useEffect(function () {
     getInformationSetting();
+    initInformationSSO();
   }, []);
   return {
     defaultInfo: defaultInfo,
@@ -37707,13 +37858,12 @@ var useLogin = function useLogin() {
     fnIsCheckLogin: fnIsCheckLogin,
     isLoginGoogle: isLoginGoogle,
     infoUser: infoUser,
-    setInfoUser: setInfoUser,
     submitLogin: submitLogin,
-    setIsLoginGoogle: setIsLoginGoogle,
     googleClientId: googleClientId,
     googleRecaptchaId: googleRecaptchaId,
     handleCancelModelAssign: handleCancelModelAssign,
-    openModelAssign: openModelAssign
+    openModelAssign: openModelAssign,
+    fnLoginSSO: fnLoginSSO
   };
 };
 
@@ -37741,8 +37891,7 @@ var BlockSelectTeacher = function BlockSelectTeacher(_ref) {
       openModal = _ref.openModal,
       onSubmit = _ref.onSubmit,
       token = _ref.token,
-      email = _ref.email,
-      setOpenModal = _ref.setOpenModal;
+      email = _ref.email;
 
   var _useState = useState(false),
       modal = _useState[0],
@@ -37751,12 +37900,6 @@ var BlockSelectTeacher = function BlockSelectTeacher(_ref) {
   useEffect(function () {
     setModal(openModal);
   }, [openModal]);
-
-  var toggle = function toggle() {
-    setModal(!modal);
-    setOpenModal(!modal);
-  };
-
   var dispatch = useDispatch();
 
   var _useState2 = useState([]),
@@ -37776,6 +37919,12 @@ var BlockSelectTeacher = function BlockSelectTeacher(_ref) {
       setLoading = _useState5[1];
 
   var timeout = useRef();
+
+  var toggle = function toggle() {
+    setModal(!modal);
+    dispatch(setIsLoginGoogle(!modal));
+  };
+
   var loadData = useCallback(function () {
     try {
       var _temp3 = function _temp3() {
@@ -37884,16 +38033,17 @@ var BlockLogin = function BlockLogin(_ref) {
       setIsShowPassword = _useLogin.setIsShowPassword,
       fnIsCheckLogin = _useLogin.fnIsCheckLogin,
       isLoginGoogle = _useLogin.isLoginGoogle,
-      setInfoUser = _useLogin.setInfoUser,
       submitLogin = _useLogin.submitLogin,
       infoUser = _useLogin.infoUser,
-      setIsLoginGoogle = _useLogin.setIsLoginGoogle,
-      googleClientId = _useLogin.googleClientId;
+      googleClientId = _useLogin.googleClientId,
+      fnLoginSSO = _useLogin.fnLoginSSO;
 
   var togglePasswordVisible = function togglePasswordVisible() {
     return setIsShowPassword(!isShowPassword);
   };
 
+  var dispatch = useDispatch();
+
   var _useGoogleReCaptcha = useGoogleReCaptcha(),
       executeRecaptcha = _useGoogleReCaptcha.executeRecaptcha;
 
@@ -37927,6 +38077,7 @@ var BlockLogin = function BlockLogin(_ref) {
         return;
       }
 
+      console.log("assss");
       var infoLogin = {
         firstName: givenName,
         lastName: familyName,
@@ -37936,8 +38087,8 @@ var BlockLogin = function BlockLogin(_ref) {
         accessToken: accessToken,
         googleId: googleId
       };
-      setInfoUser(infoLogin);
-      fnIsCheckLogin(infoLogin, accessToken, clickHandler);
+      dispatch(setInforUserGoogle(infoLogin));
+      fnIsCheckLogin(TypeLogin.Google, infoLogin, accessToken, clickHandler);
     }
   };
 
@@ -38022,6 +38173,15 @@ var BlockLogin = function BlockLogin(_ref) {
       cookiePolicy: 'single_host_origin',
       className: "" + styles["btn-login-google"]
     })), React.createElement("div", {
+      className: styles["btn-login-sso"] + " mb-3"
+    }, React.createElement("div", {
+      className: styles["btn-login-with-sso"],
+      onClick: function onClick() {
+        return fnLoginSSO(clickHandler);
+      }
+    }, React.createElement("img", {
+      src: "images/Single-Sign-On.png"
+    }), " Login with SSO")), React.createElement("div", {
       className: "d-flex justify-content-between"
     }, React.createElement(Link, {
       to: "/forgot-password",
@@ -38044,8 +38204,7 @@ var BlockLogin = function BlockLogin(_ref) {
     },
     openModal: isLoginGoogle,
     token: infoUser.accessToken,
-    email: infoUser.email,
-    setOpenModal: setIsLoginGoogle
+    email: infoUser.email
   }));
 };
 
@@ -47060,6 +47219,8 @@ var initialState = {
   isEnableSurvey: false,
   isConversationOneToOne: false,
   isSandboxMode: false,
+  isLoginGoogle: false,
+  inforUserGoogle: null,
   language: DEFAULT_LANGUAGE_CODE,
   amplitude: {
     user_id: "",
@@ -47085,6 +47246,10 @@ var commonReducer = createReducer(initialState, function (builder) {
     state.user = action.payload;
   }).addCase(setSidebar, function (state, action) {
     state.sidebarShow = action.payload;
+  }).addCase(setIsLoginGoogle, function (state, action) {
+    state.isLoginGoogle = action.payload;
+  }).addCase(setInforUserGoogle, function (state, action) {
+    state.inforUserGoogle = action.payload;
   }).addCase(setAlert, function (state, action) {
     state.alert = action.payload;
   }).addCase(reset, function (_state, _action) {
@@ -47960,6 +48125,24 @@ var navMobileReducer = createReducer(initialState$B, function (builder) {
   });
 });
 
+var setWeeklyQuestList = createAction("setWeeklyQuestList");
+var setOpenModelCongratulation = createAction("setOpenModelCongratulation");
+
+var initialState$C = {
+  isOpenModelCongratulation: false,
+  lastQuest: undefined,
+  weeklyQuests: []
+};
+var weeklyQuestReducer = createReducer(initialState$C, function (builder) {
+  builder.addCase(setWeeklyQuestList, function (state, action) {
+    state.weeklyQuests = action.payload;
+  }).addCase(setOpenModelCongratulation, function (state, action) {
+    state.isOpenModelCongratulation = action.payload;
+  }).addCase(reset, function (_state, _action) {
+    return initialState$C;
+  });
+});
+
 var rootReducer = combineReducers({
   common: commonReducer,
   classes: classReducer,
@@ -48000,7 +48183,8 @@ var rootReducer = combineReducers({
   widget: widgetReducer,
   bandScores: commonReducer$h,
   schoolBlankDays: commonReducer$i,
-  navMobileReducer: navMobileReducer
+  navMobileReducer: navMobileReducer,
+  weeklyQuests: weeklyQuestReducer
 });
 
 var store = configureStore({
@@ -48456,6 +48640,7 @@ var TheLayout = function TheLayout(_ref) {
 
   var resetAuth = function resetAuth() {
     localStorage.removeItem(ACCESS_TOKEN);
+    localStorage.removeItem("ROLES");
     history.push("/");
   };
 
@@ -48483,5 +48668,5 @@ var TheLayout = function TheLayout(_ref) {
 
 var amplitudeClient$1 = amplitude.getInstance();
 
-export { ACCESS_TOKEN, ANSWER_EDITOR_HEIGHT, AcademicClassSelector, AddButton, BASE_URL, CHAT_CHANNEL, CategorySelector, CommonAlert, CommonHeader, CommonModal$1 as CommonModal, CreatableSelector, CustomPagination, CustomSelector, CustomTabs as CustomTab, DATE_FORMAT, DATE_RESULT, DEFAULT_FILTER, DEFAULT_LANGUAGE_CODE, Dashboard, DeleteButtonIcon, DetailActionButtons, EMOTIONS, EditButtonIcon, EmailTemplateDetail, EmailTemplateList, EmptyDataAlert, ErrorHandler, FULL_DATE_RESULT, FaqList, InputFile as FileInput, GOOGLE_RECAPTCHA_KEY, GalleryList, INIT_AMPLITUDE_KEY_PROD, INIT_AMPLITUDE_KEY_STAGE, Images, LANGUAGES, LICENSE_AGGRID, LinkEditButton, Loading, Login, MediaList, NOTIFICATION_ALERT_KEY, NOTIFICATION_CHANNEL, NotFound, NotificationList, NotificationLogoutModal, NotificationModal, QUESTION_TYPES, QUESTION_TYPES_OPTIONS, QuestionCategorySelector, QuestionTypeSelector, QuitPrompt, ReactNotification, RequiredLabel$1 as RequiredLabel, SANDBOX_NOTIFICATION, SUPPORTED_LANGUAGES_CODE, SandboxAlert, SchoolList, ScrollToTop, SearchBox$1 as SearchBox, SearchBoxContainer, SkillList, StarRatingSelector, SuggestionCategorySelector, TAB_COLORS, TINY_MCE_API_KEY, TheContent$1 as TheContent, TheLayout, ToggleButton, UploadFileButton, UserContainer, UserDetail, UserList, addTab, amplitudeClient$1 as amplitudeClient, answerQuestion, answerQuestionDataPlayer, api, apiUpload, canAccess as canAccessRoute, changeNote, changeTags, clearTab, closeTab, debounce, editTab, editorConfig, firstCheckToken, generateRandomString, getCookieValue, getFileUrl, getInfo, getStaticFileUrl, getTextFromHTML, i18n, initAmplitude, isInViewport, isLocalhost, reset, setAlert, setAssessmentList, setAssignmentList, setAssistantList, setBadgeList, setBandScoreList, setCertificateList, setClassList, setConferenceRubricList, setConversationOneToOne, setCurrentStudentId, setCurrentStudentName, setCurrentStudentUserId, setCustomAlertList, setDataPlayer, setEditItemQuesion, setEnableIEP, setEnableSurvey, setFeedbackList, setFilterWidget, setGoalExampleList, setImproveMyClass, setLanguage, setLearningSupportCategoryList, setLoading, setMailCategory, setModal, setMoveItemQuestion, setMyStudent, setQuestionByCategory, setQuestionCateList, setQuestionList, setReflectionList, setReflectionResultList, setResetQuestionList, setSandboxMode, setSchoolBlankDayList, setSelectQuestion, setSemesterList, setSessionPlayer, setSessionTemplateGeneralClassList, setSessionTemplateList, setStartTime, setStrategyList, setStudentIdSelectedByTeacher, setStudentList, setSubjectList, setSuggestionList, setTurnOffPassWhenChangeMode, setTutorialScreenList, setUser, setUserList, showFontSize, showMenuBar, store, systemCertificateUpload, systemStudentBadge, uploadFile, useFilters, useGalleryList, utcToLocalTime };
+export { ACCESS_TOKEN, ANSWER_EDITOR_HEIGHT, AcademicClassSelector, AddButton, BASE_URL, CHAT_CHANNEL, CategorySelector, CommonAlert, CommonHeader, CommonModal$1 as CommonModal, CreatableSelector, CustomPagination, CustomSelector, CustomTabs as CustomTab, DATE_FORMAT, DATE_RESULT, DEFAULT_FILTER, DEFAULT_LANGUAGE_CODE, Dashboard, DeleteButtonIcon, DetailActionButtons, EMOTIONS, EditButtonIcon, EmailTemplateDetail, EmailTemplateList, EmptyDataAlert, ErrorHandler, FULL_DATE_RESULT, FaqList, InputFile as FileInput, GOOGLE_RECAPTCHA_KEY, GalleryList, INIT_AMPLITUDE_KEY_PROD, INIT_AMPLITUDE_KEY_STAGE, Images, LANGUAGES, LICENSE_AGGRID, LinkEditButton, Loading, Login, MediaList, NOTIFICATION_ALERT_KEY, NOTIFICATION_CHANNEL, NotFound, NotificationList, NotificationLogoutModal, NotificationModal, QUESTION_TYPES, QUESTION_TYPES_OPTIONS, QuestionCategorySelector, QuestionTypeSelector, QuitPrompt, ReactNotification, RequiredLabel$1 as RequiredLabel, SANDBOX_NOTIFICATION, SUPPORTED_LANGUAGES_CODE, SandboxAlert, SchoolList, ScrollToTop, SearchBox$1 as SearchBox, SearchBoxContainer, SkillList, StarRatingSelector, SuggestionCategorySelector, TAB_COLORS, TINY_MCE_API_KEY, TheContent$1 as TheContent, TheLayout, ToggleButton, UploadFileButton, UserContainer, UserDetail, UserList, addTab, amplitudeClient$1 as amplitudeClient, answerQuestion, answerQuestionDataPlayer, api, apiUpload, canAccess as canAccessRoute, changeNote, changeTags, clearTab, closeTab, debounce, editTab, editorConfig, firstCheckToken, generateRandomString, getCookieValue, getFileUrl, getInfo, getStaticFileUrl, getTextFromHTML, i18n, initAmplitude, isInViewport, isLocalhost, reset, setAlert, setAssessmentList, setAssignmentList, setAssistantList, setBadgeList, setBandScoreList, setCertificateList, setClassList, setConferenceRubricList, setConversationOneToOne, setCurrentStudentId, setCurrentStudentName, setCurrentStudentUserId, setCustomAlertList, setDataPlayer, setEditItemQuesion, setEnableIEP, setEnableSurvey, setFeedbackList, setFilterWidget, setGoalExampleList, setImproveMyClass, setLanguage, setLearningSupportCategoryList, setLoading, setMailCategory, setModal, setMoveItemQuestion, setMyStudent, setOpenModelCongratulation, setQuestionByCategory, setQuestionCateList, setQuestionList, setReflectionList, setReflectionResultList, setResetQuestionList, setSandboxMode, setSchoolBlankDayList, setSelectQuestion, setSemesterList, setSessionPlayer, setSessionTemplateGeneralClassList, setSessionTemplateList, setStartTime, setStrategyList, setStudentIdSelectedByTeacher, setStudentList, setSubjectList, setSuggestionList, setTurnOffPassWhenChangeMode, setTutorialScreenList, setUser, setUserList, setWeeklyQuestList, showFontSize, showMenuBar, store, systemCertificateUpload, systemStudentBadge, uploadFile, useFilters, useGalleryList, utcToLocalTime };
 //# sourceMappingURL=index.modern.js.map