haogeniubi

src/components/RightContent/AvatarDropdown.jsx

@@ -19,12 +19,9 @@ import moment from 'moment';
  */
 const loginOut = async () => {
   const { logoutRedirectUrl } = await fakeAccountLoginOut();
-  const { query = {} } = history.location;
-  const { redirect } = query; // Note: There may be security issues, please note
-
-  if (window.location.pathname !== '/user/login' && !redirect) {
+  if (window.location.pathname !== '/user/login') {
     localStorage.clear();
-    window.location.href = logoutRedirectUrl;
+    window.location.replace(logoutRedirectUrl);
   }
 };
 
@@ -85,25 +82,18 @@ const AvatarDropdown = ({ menu }) => {
       },
     };
   }, []);
-  const onMenuClick = useCallback(
-    (event) => {
-      const { key } = event;
-      if (key === 'logout') {
-        setInitialState((s) => ({
-          ...s,
-          currentUser: undefined,
-          newMenu: undefined,
-        }));
-        loginOut();
-        return;
-      } else if (key == 'changepwd') {
-        cv(true);
-        return;
-      }
-      history.push(`/account/${key}`);
-    },
-    [setInitialState],
-  );
+
+  const onMenuClick = (event) => {
+    const { key } = event;
+    if (key === 'logout') {
+      loginOut();
+      return;
+    } else if (key == 'changepwd') {
+      cv(true);
+      return;
+    }
+  };
+
   const loadings = (
     <HeaderDropdown overlay={menuHeaderDropdown}>
       <React.Fragment>