Commit 472afce9 authored by Steven's avatar Steven

chore: fix current user store

parent a12844f5
......@@ -7,6 +7,7 @@ import * as api from "@/helpers/api";
import { absolutifyLink } from "@/helpers/utils";
import useNavigateTo from "@/hooks/useNavigateTo";
import { useUserStore } from "@/store/module";
import { useUserV1Store } from "@/store/v1";
import { useTranslate } from "@/utils/i18n";
interface State {
......@@ -19,6 +20,7 @@ const AuthCallback = () => {
const navigateTo = useNavigateTo();
const [searchParams] = useSearchParams();
const userStore = useUserStore();
const userV1Store = useUserV1Store();
const [state, setState] = useState<State>({
loading: true,
errorMessage: "",
......@@ -42,6 +44,7 @@ const AuthCallback = () => {
if (user) {
userStore.setCurrentUser(user);
await userStore.fetchCurrentUser();
await userV1Store.getOrFetchUserByUsername(user.username);
navigateTo("/");
} else {
toast.error(t("message.login-failed"));
......
......@@ -9,6 +9,7 @@ import { absolutifyLink } from "@/helpers/utils";
import useLoading from "@/hooks/useLoading";
import useNavigateTo from "@/hooks/useNavigateTo";
import { useGlobalStore, useUserStore } from "@/store/module";
import { useUserV1Store } from "@/store/v1";
import { useTranslate } from "@/utils/i18n";
const SignIn = () => {
......@@ -16,6 +17,7 @@ const SignIn = () => {
const navigateTo = useNavigateTo();
const globalStore = useGlobalStore();
const userStore = useUserStore();
const userV1Store = useUserV1Store();
const actionBtnLoadingState = useLoading(false);
const { appearance, locale, systemStatus } = globalStore.state;
const mode = systemStatus.profile.mode;
......@@ -78,6 +80,7 @@ const SignIn = () => {
if (user) {
userStore.setCurrentUser(user);
await userStore.fetchCurrentUser();
await userV1Store.getOrFetchUserByUsername(user.username);
navigateTo("/");
} else {
toast.error(t("message.login-failed"));
......
......@@ -8,6 +8,7 @@ import * as api from "@/helpers/api";
import useLoading from "@/hooks/useLoading";
import useNavigateTo from "@/hooks/useNavigateTo";
import { useGlobalStore, useUserStore } from "@/store/module";
import { useUserV1Store } from "@/store/v1";
import { useTranslate } from "@/utils/i18n";
const SignUp = () => {
......@@ -15,6 +16,7 @@ const SignUp = () => {
const navigateTo = useNavigateTo();
const globalStore = useGlobalStore();
const userStore = useUserStore();
const userV1Store = useUserV1Store();
const actionBtnLoadingState = useLoading(false);
const { appearance, locale, systemStatus } = globalStore.state;
const [username, setUsername] = useState("");
......@@ -58,6 +60,7 @@ const SignUp = () => {
if (user) {
userStore.setCurrentUser(user);
await userStore.fetchCurrentUser();
await userV1Store.getOrFetchUserByUsername(user.username);
navigateTo("/");
} else {
toast.error(t("message.signup-failed"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment