mario-core 2.9.433-feedback → 2.9.434-feedback

package/dist/index.js

@@ -39792,6 +39792,175 @@ var setCurrentStudentName = toolkit.createAction("common/setCurrentStudentName")
 var setTurnOffPassWhenChangeMode = toolkit.createAction("common/setTurnOffPassWhenChangeMode");
 var initAmplitude = toolkit.createAction("common/initAmplitude");
 
+var encodeParams = (function (params) {
+  return Object.keys(params).filter(function (key) {
+    return params[key] || params[key] === 0 || params[key] === false;
+  }).map(function (key) {
+    if (Array.isArray(params[key])) {
+      return params[key].map(function (i) {
+        return encodeURIComponent(key) + "=" + encodeURIComponent(i);
+      }).join('&');
+    }
+
+    return encodeURIComponent(key) + "=" + encodeURIComponent(params[key]);
+  }).join('&');
+});
+
+var getAccessToken = (function () {
+  try {
+    var isSessionUserBrowser = sessionStorage.getItem(IS_USER_SESSION_BROWSER);
+    return !isSessionUserBrowser ? localStorage.getItem(ACCESS_TOKEN) : sessionStorage.getItem(ACCESS_TOKEN);
+  } catch (err) {
+    return null;
+  }
+});
+
+var api = axios.create({
+  baseURL: BASE_URL,
+  timeout: 0,
+  headers: {
+    "Content-Type": "application/json"
+  },
+  paramsSerializer: function paramsSerializer(params) {
+    return encodeParams(params);
+  }
+});
+var apiUpload = axios.create({
+  baseURL: BASE_URL,
+  timeout: 60000,
+  headers: {
+    "Content-Type": "multipart/form-data"
+  }
+});
+[api, apiUpload].forEach(function (i) {
+  return i.interceptors.request.use(function (config) {
+    var token = getAccessToken();
+
+    if (token) {
+      config.headers.Authorization = "Bearer " + token;
+      localStorage.setItem("LAST_TIME_REQUETST", moment().utc().format("YYYY-MM-DD HH:mm:ss"));
+    }
+
+    return config;
+  }, function (error) {
+    return Promise.reject(error);
+  });
+});
+[api, apiUpload].forEach(function (i) {
+  return i.interceptors.response.use(function (response) {
+    return response;
+  }, function (error) {
+    console.log({
+      error: error
+    });
+
+    if (error.response.status === 401) {
+      Object.keys(localStorage).forEach(function (key) {
+        if (!key.includes('learning-plan')) delete localStorage[key];
+      });
+      var userEmail = localStorage.getItem("USER_EMAIL");
+      var roles = localStorage.getItem("ROLES");
+      var hostName = window.location.hostname;
+
+      if (userEmail) {
+        amplitude.track("general: session end", {
+          user_id: userEmail,
+          domain: hostName,
+          roles: roles
+        });
+        amplitude.setSessionId(-1);
+      }
+
+      localStorage.removeItem(ACCESS_TOKEN);
+      sessionStorage.removeItem(ACCESS_TOKEN);
+      sessionStorage.removeItem(IS_USER_SESSION_BROWSER);
+      localStorage.removeItem("USER_EMAIL");
+      localStorage.removeItem("ROLES");
+      window.location.href = "/login";
+    }
+
+    if (error.response.status == 403) {
+      localStorage.removeItem(ACCESS_TOKEN);
+      localStorage.removeItem("USER_EMAIL");
+      localStorage.removeItem("ROLES");
+      window.location.href = "/login";
+    }
+
+    return Promise.reject(error);
+  });
+});
+
+var ACCOUNT_URL = BASE_URL + "/api/account";
+var USER_URL = BASE_URL + "/api/user";
+var USER_EDU_URL = BASE_URL + "/api/User";
+var apiInforUserClassLink = function apiInforUserClassLink(data) {
+  return api.post(BASE_URL + "/api/User/infor-user-classlink", data);
+};
+var logIn = function logIn(data) {
+  return api.post(ACCOUNT_URL + "/login", data);
+};
+var checkToken = function checkToken(token) {
+  return api.post(ACCOUNT_URL + "/checktoken", {
+    token: token
+  });
+};
+var getInfo = function getInfo() {
+  return api.get(ACCOUNT_URL + "/info");
+};
+var forgotPassword = function forgotPassword(data) {
+  return api.post(ACCOUNT_URL + "/forgotpassword", data);
+};
+var getUserNewPassword = function getUserNewPassword(userId) {
+  return api.get(ACCOUNT_URL + "/new-user-create-password", {
+    params: {
+      userId: userId
+    }
+  });
+};
+var checkResetToken = function checkResetToken(token, key) {
+  return api.post(ACCOUNT_URL + "/checkResetToken", {
+    token: token,
+    key: key
+  });
+};
+var resetPassword = function resetPassword(data) {
+  return api.post(ACCOUNT_URL + "/resetpassword", data);
+};
+var checkUserGoogle = function checkUserGoogle(type, body) {
+  return api.post(USER_URL + "/check-user", body, {
+    params: {
+      type: type
+    }
+  });
+};
+var getGoogleClientId = function getGoogleClientId() {
+  return api.get(ACCOUNT_URL + "/send-google");
+};
+var registerUserStudent = function registerUserStudent(body) {
+  return api.post(BASE_URL + "/api/User/register-user", body);
+};
+var createPassword = function createPassword(data) {
+  return api.post(ACCOUNT_URL + "/createPassword", data);
+};
+var get = function get(filter) {
+  return api.get(USER_EDU_URL + "/all/deleted", {
+    params: filter
+  });
+};
+var remove = function remove(id, userChangeId) {
+  return api["delete"](USER_EDU_URL + "/hardDelete/" + id, {
+    params: {
+      userChangeId: userChangeId
+    }
+  });
+};
+var getTeacher = function getTeacher() {
+  return api.get(USER_EDU_URL + "/all/teacher");
+};
+var AccountSSOLogApi = function AccountSSOLogApi(data) {
+  return api.post(ACCOUNT_URL + "/account-sso-log", data);
+};
+
 var schema = yup.object({
   email: yup.string().email("Email is invalid").required("Email is required"),
   password: yup.string().required("Password is required"),
@@ -39833,45 +40002,75 @@ var BlockLogin = function BlockLogin(_ref) {
   }, [executeRecaptcha]);
   var handleVerify = React.useCallback(function () {}, []);
 
-  var onSuccessGoogle = function onSuccessGoogle(res) {
-    if (!!(res !== null && res !== void 0 && res.accessToken)) {
-      var _hostName$split, _email$split, _extensionEmail$split, _extensionEmail$split2;
-
-      var _res$profileObj = res.profileObj,
-          email = _res$profileObj.email,
-          familyName = _res$profileObj.familyName,
-          givenName = _res$profileObj.givenName,
-          imageUrl = _res$profileObj.imageUrl,
-          name = _res$profileObj.name;
-      var accessToken = res.accessToken;
-      var googleId = res.googleId;
-      var hostName = window.location.hostname;
-      var subDomain = (_hostName$split = hostName.split(".marioforme.com")) === null || _hostName$split === void 0 ? void 0 : _hostName$split[0];
-      var emailDomain = (_email$split = email.split("@")) === null || _email$split === void 0 ? void 0 : _email$split[1];
-      var matchExtension = extensionEmail === null || extensionEmail === void 0 ? void 0 : (_extensionEmail$split = extensionEmail.split(",")) === null || _extensionEmail$split === void 0 ? void 0 : (_extensionEmail$split2 = _extensionEmail$split.map(function (x) {
-        return x.trim();
-      })) === null || _extensionEmail$split2 === void 0 ? void 0 : _extensionEmail$split2.filter(function (x) {
-        return x;
-      }).some(function (ext) {
-        return emailDomain.includes(ext);
+  var logGoogleLoginFail = function logGoogleLoginFail(err) {
+    try {
+      var _temp2 = _catch(function () {
+        return Promise.resolve(AccountSSOLogApi(err)).then(function () {});
+      }, function (error) {
+        console.error(error);
       });
 
-      if (!emailDomain.includes(subDomain) && !matchExtension) {
-        alert("The email address you used does not match the login information in the database.  Please check that you are using your school assigned email address to log into MARIO for Me.  If you have further trouble please notify your school site administrator");
-        return;
-      }
+      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
 
-      var infoLogin = {
-        firstName: givenName,
-        lastName: familyName,
-        imageUrl: imageUrl,
-        fullName: name,
-        email: email,
-        accessToken: accessToken,
-        googleId: googleId
-      };
-      dispatch(setInforUserGoogle(infoLogin));
-      fnIsCheckLogin(TypeLogin.Google, infoLogin, accessToken, clickHandler);
+  var onSuccessGoogle = function onSuccessGoogle(res) {
+    try {
+      var _exit2 = false;
+      return Promise.resolve(function () {
+        if (!!(res !== null && res !== void 0 && res.accessToken)) {
+          var _hostName$split, _email$split, _extensionEmail$split, _extensionEmail$split2;
+
+          var _temp5 = function _temp5(_result) {
+            if (_exit2) return _result;
+            var infoLogin = {
+              firstName: _givenName,
+              lastName: _familyName,
+              imageUrl: _imageUrl,
+              fullName: _name,
+              email: _email,
+              accessToken: _accessToken,
+              googleId: _googleId
+            };
+            dispatch(setInforUserGoogle(infoLogin));
+            fnIsCheckLogin(TypeLogin.Google, infoLogin, _accessToken, clickHandler);
+          };
+
+          var _res$profileObj = res.profileObj,
+              _email = _res$profileObj.email,
+              _familyName = _res$profileObj.familyName,
+              _givenName = _res$profileObj.givenName,
+              _imageUrl = _res$profileObj.imageUrl,
+              _name = _res$profileObj.name;
+          var _accessToken = res.accessToken;
+          var _googleId = res.googleId;
+          var hostName = window.location.hostname;
+          var subDomain = (_hostName$split = hostName.split(".marioforme.com")) === null || _hostName$split === void 0 ? void 0 : _hostName$split[0];
+          var emailDomain = (_email$split = _email.split("@")) === null || _email$split === void 0 ? void 0 : _email$split[1];
+          var matchExtension = extensionEmail === null || extensionEmail === void 0 ? void 0 : (_extensionEmail$split = extensionEmail.split(",")) === null || _extensionEmail$split === void 0 ? void 0 : (_extensionEmail$split2 = _extensionEmail$split.map(function (x) {
+            return x.trim();
+          })) === null || _extensionEmail$split2 === void 0 ? void 0 : _extensionEmail$split2.filter(function (x) {
+            return x;
+          }).some(function (ext) {
+            return emailDomain.includes(ext);
+          });
+
+          var _temp6 = function () {
+            if (!emailDomain.includes(subDomain) && !matchExtension) {
+              alert("The email address you used does not match the login information in the database.  Please check that you are using your school assigned email address to log into MARIO for Me.  If you have further trouble please notify your school site administrator");
+              return Promise.resolve(logGoogleLoginFail([emailDomain + " is incorrect"])).then(function () {
+                _exit2 = true;
+              });
+            }
+          }();
+
+          return _temp6 && _temp6.then ? _temp6.then(_temp5) : _temp5(_temp6);
+        }
+      }());
+    } catch (e) {
+      return Promise.reject(e);
     }
   };
 
@@ -40095,172 +40294,6 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
   return it.next.bind(it);
 }
 
-var encodeParams = (function (params) {
-  return Object.keys(params).filter(function (key) {
-    return params[key] || params[key] === 0 || params[key] === false;
-  }).map(function (key) {
-    if (Array.isArray(params[key])) {
-      return params[key].map(function (i) {
-        return encodeURIComponent(key) + "=" + encodeURIComponent(i);
-      }).join('&');
-    }
-
-    return encodeURIComponent(key) + "=" + encodeURIComponent(params[key]);
-  }).join('&');
-});
-
-var getAccessToken = (function () {
-  try {
-    var isSessionUserBrowser = sessionStorage.getItem(IS_USER_SESSION_BROWSER);
-    return !isSessionUserBrowser ? localStorage.getItem(ACCESS_TOKEN) : sessionStorage.getItem(ACCESS_TOKEN);
-  } catch (err) {
-    return null;
-  }
-});
-
-var api = axios.create({
-  baseURL: BASE_URL,
-  timeout: 0,
-  headers: {
-    "Content-Type": "application/json"
-  },
-  paramsSerializer: function paramsSerializer(params) {
-    return encodeParams(params);
-  }
-});
-var apiUpload = axios.create({
-  baseURL: BASE_URL,
-  timeout: 60000,
-  headers: {
-    "Content-Type": "multipart/form-data"
-  }
-});
-[api, apiUpload].forEach(function (i) {
-  return i.interceptors.request.use(function (config) {
-    var token = getAccessToken();
-
-    if (token) {
-      config.headers.Authorization = "Bearer " + token;
-      localStorage.setItem("LAST_TIME_REQUETST", moment().utc().format("YYYY-MM-DD HH:mm:ss"));
-    }
-
-    return config;
-  }, function (error) {
-    return Promise.reject(error);
-  });
-});
-[api, apiUpload].forEach(function (i) {
-  return i.interceptors.response.use(function (response) {
-    return response;
-  }, function (error) {
-    console.log({
-      error: error
-    });
-
-    if (error.response.status === 401) {
-      Object.keys(localStorage).forEach(function (key) {
-        if (!key.includes('learning-plan')) delete localStorage[key];
-      });
-      var userEmail = localStorage.getItem("USER_EMAIL");
-      var roles = localStorage.getItem("ROLES");
-      var hostName = window.location.hostname;
-
-      if (userEmail) {
-        amplitude.track("general: session end", {
-          user_id: userEmail,
-          domain: hostName,
-          roles: roles
-        });
-        amplitude.setSessionId(-1);
-      }
-
-      localStorage.removeItem(ACCESS_TOKEN);
-      sessionStorage.removeItem(ACCESS_TOKEN);
-      sessionStorage.removeItem(IS_USER_SESSION_BROWSER);
-      localStorage.removeItem("USER_EMAIL");
-      localStorage.removeItem("ROLES");
-      window.location.href = "/login";
-    }
-
-    if (error.response.status == 403) {
-      localStorage.removeItem(ACCESS_TOKEN);
-      localStorage.removeItem("USER_EMAIL");
-      localStorage.removeItem("ROLES");
-      window.location.href = "/login";
-    }
-
-    return Promise.reject(error);
-  });
-});
-
-var ACCOUNT_URL = BASE_URL + "/api/account";
-var USER_URL = BASE_URL + "/api/user";
-var USER_EDU_URL = BASE_URL + "/api/User";
-var apiInforUserClassLink = function apiInforUserClassLink(data) {
-  return api.post(BASE_URL + "/api/User/infor-user-classlink", data);
-};
-var logIn = function logIn(data) {
-  return api.post(ACCOUNT_URL + "/login", data);
-};
-var checkToken = function checkToken(token) {
-  return api.post(ACCOUNT_URL + "/checktoken", {
-    token: token
-  });
-};
-var getInfo = function getInfo() {
-  return api.get(ACCOUNT_URL + "/info");
-};
-var forgotPassword = function forgotPassword(data) {
-  return api.post(ACCOUNT_URL + "/forgotpassword", data);
-};
-var getUserNewPassword = function getUserNewPassword(userId) {
-  return api.get(ACCOUNT_URL + "/new-user-create-password", {
-    params: {
-      userId: userId
-    }
-  });
-};
-var checkResetToken = function checkResetToken(token, key) {
-  return api.post(ACCOUNT_URL + "/checkResetToken", {
-    token: token,
-    key: key
-  });
-};
-var resetPassword = function resetPassword(data) {
-  return api.post(ACCOUNT_URL + "/resetpassword", data);
-};
-var checkUserGoogle = function checkUserGoogle(type, body) {
-  return api.post(USER_URL + "/check-user", body, {
-    params: {
-      type: type
-    }
-  });
-};
-var getGoogleClientId = function getGoogleClientId() {
-  return api.get(ACCOUNT_URL + "/send-google");
-};
-var registerUserStudent = function registerUserStudent(body) {
-  return api.post(BASE_URL + "/api/User/register-user", body);
-};
-var createPassword = function createPassword(data) {
-  return api.post(ACCOUNT_URL + "/createPassword", data);
-};
-var get = function get(filter) {
-  return api.get(USER_EDU_URL + "/all/deleted", {
-    params: filter
-  });
-};
-var remove = function remove(id, userChangeId) {
-  return api["delete"](USER_EDU_URL + "/hardDelete/" + id, {
-    params: {
-      userChangeId: userChangeId
-    }
-  });
-};
-var getTeacher = function getTeacher() {
-  return api.get(USER_EDU_URL + "/all/teacher");
-};
-
 var defaultInfo = {
   email: "",
   captcha: ""