From fcf6bb05d78e6c22751765187974c57b64f0caf3 Mon Sep 17 00:00:00 2001 From: Liyang Zhu <1184997399@qq.com> Date: Mon, 6 Jun 2022 21:39:01 +0800 Subject: [PATCH] fix: remove setAuthData after login --- .../onboarding/steps/3-adminCredentials.js | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/routes/onboarding/steps/3-adminCredentials.js b/src/routes/onboarding/steps/3-adminCredentials.js index 88b8fca4..f0b507fd 100644 --- a/src/routes/onboarding/steps/3-adminCredentials.js +++ b/src/routes/onboarding/steps/3-adminCredentials.js @@ -6,12 +6,11 @@ import StyledInput from "../../../common/component/styled/Input"; import StyledButton from "../../../common/component/styled/Button"; import { useCreateAdminMutation, - useGetInitializedQuery, useGetServerQuery, useUpdateServerMutation } from "../../../app/services/server"; import { useLoginMutation } from "../../../app/services/auth"; -import { setAuthData } from "../../../app/slices/auth.data"; +import { updateInitialized } from "../../../app/slices/auth.data"; const StyledAdminCredentialsStep = styled.div` height: 100%; @@ -33,11 +32,8 @@ export default function AdminCredentialsStep({ data, setStep }) { const dispatch = useDispatch(); const [createAdmin, { isLoading: isSigningUp, error: signUpError }] = useCreateAdminMutation(); - const [ - login, - { isLoading: isLoggingIn, isSuccess: isLoggedIn, error: loginError, data: loginData } - ] = useLoginMutation(); - const { refetch: refetchInitialized } = useGetInitializedQuery(); + const [login, { isLoading: isLoggingIn, isSuccess: isLoggedIn, error: loginError }] = + useLoginMutation(); const { data: serverData } = useGetServerQuery(); const [updateServer, { isLoading: isUpdatingServer, isSuccess: isUpdatedServer }] = useUpdateServerMutation(); @@ -58,18 +54,17 @@ export default function AdminCredentialsStep({ data, setStep }) { // After logged in useEffect(() => { - if (isLoggedIn && loginData) { - // Update local auth data - dispatch(setAuthData(loginData)); - // Update initialized state - refetchInitialized(); - // Set server name - updateServer({ - ...serverData, - name: data.serverName - }); + if (isLoggedIn) { + dispatch(updateInitialized(true)); + setTimeout(() => { + // Set server name + updateServer({ + ...serverData, + name: data.serverName + }); + }, 0); } - }, [isLoggedIn, loginData]); + }, [isLoggedIn]); // After updated server useEffect(() => {