refactor: get magic_token with useOutletContext in reg

This commit is contained in:
Tristan Yang
2023-03-22 11:35:58 +08:00
parent 5f08b79a60
commit 5bfcc0d3bf
3 changed files with 22 additions and 11 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
import { useState, useEffect, FC, FormEvent, ChangeEvent } from "react";
import { useDispatch } from "react-redux";
import { useTranslation } from "react-i18next";
import { useParams, useSearchParams } from "react-router-dom";
import { useParams } from "react-router-dom";
import toast from "react-hot-toast";
import { setAuthData } from "../../app/slices/auth.data";
import Input from "../../common/component/styled/Input";
@@ -9,11 +9,12 @@ import Button from "../../common/component/styled/Button";
import { useLoginMutation, useCheckMagicTokenValidMutation } from "../../app/services/auth";
import ExpiredTip from "./ExpiredTip";
import { useRegisterMutation } from "../../app/services/auth";
import { useMagicToken } from "./index";
const RegWithUsername: FC = () => {
const { t: ct } = useTranslation();
const { t } = useTranslation("auth");
const [searchParams] = useSearchParams();
const { token } = useMagicToken();
const [checkTokenInvalid, { data: isTokenValid, isLoading: checkingToken }] =
useCheckMagicTokenValidMutation();
const [
@@ -29,7 +30,6 @@ const RegWithUsername: FC = () => {
const dispatch = useDispatch();
const [username, setUsername] = useState("");
// todo: check if query param exists
const token = searchParams.get("magic_token") as string;
useEffect(() => {
if (token) {
checkTokenInvalid(token);
+5 -5
View File
@@ -1,7 +1,7 @@
import { useState, useEffect, ChangeEvent, FormEvent } from "react";
import toast from "react-hot-toast";
import { useTranslation } from "react-i18next";
import { useSearchParams } from "react-router-dom";
import { useNavigate } from "react-router-dom";
import BASE_URL, { KEY_LOCAL_MAGIC_TOKEN } from "../../app/config";
import Input from "../../common/component/styled/Input";
import Button from "../../common/component/styled/Button";
@@ -15,6 +15,7 @@ import SocialLoginButtons from "../login/SocialLoginButtons";
import { setAuthData } from "../../app/slices/auth.data";
import { useDispatch } from "react-redux";
import { useAppSelector } from "../../app/store";
import { useMagicToken } from "./index";
interface AuthForm {
name?: string,
@@ -27,22 +28,21 @@ export default function Register() {
const serverName = useAppSelector(store => store.server.name);
const { t } = useTranslation("auth");
const { t: ct } = useTranslation();
let [searchParams] = useSearchParams();
const [sendRegMagicLink, { isLoading: signingUp, data, isSuccess }] =
useSendRegMagicLinkMutation();
const dispatch = useDispatch();
const { token: magic_token } = useMagicToken();
const [register, { isLoading: registering, data: regData, isSuccess: regSuccess }] = useRegisterMutation();
const [checkEmail, { isLoading: checkingEmail }] = useLazyCheckEmailQuery();
const { data: loginConfig, isSuccess: loginConfigSuccess } = useGetLoginConfigQuery();
// const navigateTo = useNavigate();
const navigateTo = useNavigate();
const [input, setInput] = useState<AuthForm>({
name: "",
email: "",
password: "",
confirmPassword: ""
});
const magic_token = searchParams.get("magic_token") ?? undefined;
if (magic_token) {
//本地存一下 magic token 后续oauth流程用到
localStorage.setItem(KEY_LOCAL_MAGIC_TOKEN, magic_token);
@@ -53,7 +53,7 @@ export default function Register() {
const { new_magic_token, mail_is_sent } = data;
if (!mail_is_sent && new_magic_token) {
// 直接进入set_name流程
location.href = `?magic_token=${new_magic_token}#/register/set_name`;
navigateTo(`/register/set_name?magic_token=${new_magic_token}`);
}
}
}, [isSuccess, data]);
+14 -3
View File
@@ -1,12 +1,23 @@
import { Outlet } from "react-router-dom";
import { useEffect, useState } from "react";
import { Outlet, useOutletContext, useSearchParams } from "react-router-dom";
type ContextType = { token: string };
export default function RegContainer() {
const [token, setToken] = useState("");
let [searchParams] = useSearchParams(new URLSearchParams(location.search));
const magic_token = searchParams.get("magic_token") ?? "";
useEffect(() => {
setToken(magic_token);
}, [magic_token]);
return (
<div className="flex-center h-screen overflow-x-hidden overflow-y-auto dark:bg-gray-700">
<div className="py-8 px-10 shadow-md rounded-xl">
<Outlet />
<Outlet context={{ token }} />
</div>
</div>
);
}
export function useMagicToken() {
return useOutletContext<ContextType>();
}