touchstudy-core 0.1.63 → 0.1.64

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

@@ -5,7 +5,7 @@ declare type LoginInfo = {
     captcha: string;
     rememberMe: boolean;
 };
-declare const useLogin: (history: any) => {
+declare const useLogin: () => {
     defaultInfo: LoginInfo;
     openLogin: boolean;
     toggle: () => void;

package/dist/index.js

@@ -499,8 +499,16 @@ var useGoogleSignOut = function useGoogleSignOut(props) {
   };
 };
 
-var pushTo = function pushTo(history, data) {
-  if (history.push) history.push(data);else history(data);
+var pushTo = function pushTo(history, data, isReplace) {
+  if (isReplace === void 0) {
+    isReplace = false;
+  }
+  if (history.push && !isReplace || history.replace && isReplace) {
+    !isReplace && history.push(data);
+    isReplace && history.replace(data);
+  } else history(data, {
+    replace: isReplace
+  });
 };
 
 var getErrorMessage = function getErrorMessage(t, error, defaultErrorMessage) {
@@ -936,7 +944,7 @@ var defaultInfo = {
   captcha: "",
   rememberMe: false
 };
-var useLogin$1 = function useLogin(history) {
+var useLogin$1 = function useLogin() {
   var _useState = React.useState(false),
     openLogin = _useState[0],
     setOpenLogin = _useState[1];
@@ -960,7 +968,7 @@ var useLogin$1 = function useLogin(history) {
   }, [gapiScript.gapi]);
   React.useEffect(function () {
     var token = getAccessToken();
-    if (!!token) pushTo(history, "/");
+    if (token) window.location.href = "/";
   }, []);
   return {
     defaultInfo: defaultInfo,
@@ -1034,7 +1042,7 @@ var useLanguage = function useLanguage(history) {
     searchParams.set("lang", languageItem.code);
     pushTo(history, _extends({}, window.location, {
       search: searchParams.toString()
-    }));
+    }), true);
   };
   var handleChangeLanguageParam = function handleChangeLanguageParam() {
     var search = window.location.search;
@@ -1070,7 +1078,7 @@ var _excluded = ["history"];
 var Login = function Login(_ref) {
   var history = _ref.history,
     rest = _objectWithoutPropertiesLoose(_ref, _excluded);
-  var _useLogin = useLogin$1(history),
+  var _useLogin = useLogin$1(),
     defaultInfo = _useLogin.defaultInfo;
   useLanguage(history);
   return React__default.createElement("div", {
@@ -9496,7 +9504,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
         searchParams["delete"]("domain");
         pushTo(history, _extends({}, window.location, {
           search: searchParams.toString()
-        }));
+        }), true);
         return;
       }
     } else {
@@ -9516,7 +9524,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
         searchParams.set("domain", academyDomain);
         pushTo(history, _extends({}, window.location, {
           search: searchParams.toString()
-        }));
+        }), true);
         return;
       }
     }
@@ -14400,7 +14408,7 @@ var useLogin$2 = function useLogin(_ref) {
   };
   React.useEffect(function () {
     var token = getAccessToken();
-    if (!!token) pushTo(history, "/");
+    if (token) window.location.href = "/";
   }, []);
   return {
     handleSubmit: handleSubmit,