touchstudy-core 0.1.50 → 0.1.52

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

@@ -8,7 +8,9 @@ declare type Props = {
 };
 declare const useLogin: ({ onNavigate, role, homeAcademyUrl, homeUrl, registerUrl }: Props) => {
     handleSubmit: (event: React.FormEvent<HTMLFormElement>) => Promise<void>;
+    handleClearAcademyDomain: () => void;
     emailError: string;
     passwordError: string;
+    academyDomain: string | null;
 };
 export default useLogin;

package/dist/index.js

@@ -8561,7 +8561,10 @@ var TextbookViewDetail = function TextbookViewDetail(props) {
   }));
 };
 
-var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superUrls, homeUrl, homeAcademyUrl) {
+var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superUrls, homeUrl, homeAcademyUrl, isAuthPage) {
+  if (isAuthPage === void 0) {
+    isAuthPage = true;
+  }
   var searchParams = new URLSearchParams(window.location.search);
   var user = reactRedux.useSelector(function (state) {
     var _state$common;
@@ -8571,38 +8574,42 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
     var paramAcademyDomain = searchParams.get("domain");
     var domain = getAcademyDomain();
     var pathname = window.location.pathname.toLowerCase();
-    if (!user) return;
-    var academyDomain = user.academyDomain;
+    if (!!user !== isAuthPage) return;
+    var academyDomain = user === null || user === void 0 ? void 0 : user.academyDomain;
     if (!academyDomain) {
       if (!superUrls.some(function (i) {
         return pathname.startsWith(i);
       })) {
+        !paramAcademyDomain && domain && searchParams.append("domain", domain);
         pushTo({
           pathname: homeUrl,
-          search: ""
+          search: searchParams.toString()
         });
+        return;
       }
-      if (domain) {
-        searchParams.append("domain", domain);
-        pushTo({
-          pathname: homeUrl,
-          search: ""
-        });
+      if (paramAcademyDomain) {
+        searchParams["delete"]("domain");
+        pushTo(_extends({}, window.location, {
+          search: searchParams.toString()
+        }));
       }
     } else {
       if (superUrls.some(function (i) {
         return pathname.startsWith(i);
       })) {
+        searchParams["delete"]("domain");
         pushTo({
           pathname: homeAcademyUrl,
-          search: ""
+          search: searchParams.toString()
         });
+        return;
       }
       if (paramAcademyDomain && academyDomain.trim().toLocaleLowerCase() != (paramAcademyDomain === null || paramAcademyDomain === void 0 ? void 0 : paramAcademyDomain.trim().toLocaleLowerCase())) {
         logout();
+        return;
       }
-      if (!paramAcademyDomain && academyDomain) {
-        searchParams.append("domain", academyDomain);
+      if (!paramAcademyDomain) {
+        !paramAcademyDomain && searchParams.append("domain", academyDomain);
         pushTo(_extends({}, window.location, {
           search: searchParams.toString()
         }));
@@ -8614,7 +8621,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
   };
   React.useEffect(function () {
     initialAcademySearchParam();
-  }, [window.location.pathname, user === null || user === void 0 ? void 0 : user.academyDomain]);
+  }, [window.location.pathname, user === null || user === void 0 ? void 0 : user.academyDomain, window.location.search]);
 };
 
 var DEFAULT_PAGING_RESPONSE = {
@@ -13389,6 +13396,10 @@ var useLogin$2 = function useLogin(_ref) {
   var searchParams = new URLSearchParams(window.location.search);
   var paramDomain = searchParams.get('domain');
   var academyDomain = paramDomain || getAcademyDomain();
+  var handleClearAcademyDomain = function handleClearAcademyDomain() {
+    localStorage.removeItem(ACADEMY_DOMAIN);
+    onNavigate("/login-with-account");
+  };
   var handleValidateForm = function handleValidateForm(_ref2) {
     var email = _ref2.email,
       password = _ref2.password;
@@ -13462,8 +13473,10 @@ var useLogin$2 = function useLogin(_ref) {
   }, []);
   return {
     handleSubmit: handleSubmit,
+    handleClearAcademyDomain: handleClearAcademyDomain,
     emailError: emailError,
-    passwordError: passwordError
+    passwordError: passwordError,
+    academyDomain: academyDomain
   };
 };
 
@@ -13484,8 +13497,10 @@ function SignIn(_ref) {
       registerUrl: registerUrl
     }),
     handleSubmit = _useLoginWithPassword.handleSubmit,
+    handleClearAcademyDomain = _useLoginWithPassword.handleClearAcademyDomain,
     emailError = _useLoginWithPassword.emailError,
-    passwordError = _useLoginWithPassword.passwordError;
+    passwordError = _useLoginWithPassword.passwordError,
+    academyDomain = _useLoginWithPassword.academyDomain;
   return React.createElement(Grid, {
     container: true,
     justifyContent: "center",
@@ -13515,7 +13530,20 @@ function SignIn(_ref) {
   }), React.createElement(Typography, {
     component: "h1",
     variant: "h5"
-  }, t("sign_in")), React.createElement(Box, {
+  }, t("sign_in")), !!academyDomain && React.createElement(Typography, {
+    sx: {
+      color: styles.dark,
+      mt: 1
+    }
+  }, academyDomain, React.createElement(material.IconButton, {
+    sx: {
+      ml: "2px",
+      p: "8px"
+    },
+    onClick: handleClearAcademyDomain
+  }, React.createElement(fa.FaTimes, {
+    size: 12
+  }))), React.createElement(Box, {
     noValidate: true,
     component: "form",
     onSubmit: handleSubmit,