feat: Improve user authorization and navigation flow

This commit is contained in:
wood chen 2025-02-09 18:58:49 +08:00
parent f604046aa4
commit a9a5d2d59a
2 changed files with 29 additions and 5 deletions

View File

@ -1,7 +1,9 @@
"use client"; "use client";
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";
import { useRouter } from "next/navigation";
import { signIn } from "@/actions/user-authorize"; import { signIn } from "@/actions/user-authorize";
import { useSession } from "next-auth/react";
interface UserAuthorizeProps extends React.HTMLAttributes<HTMLDivElement> { interface UserAuthorizeProps extends React.HTMLAttributes<HTMLDivElement> {
data: Record<string, any>; data: Record<string, any>;
@ -14,6 +16,8 @@ export function UserAuthorize({
}: UserAuthorizeProps) { }: UserAuthorizeProps) {
const [isLoading, setIsLoading] = useState<boolean>(false); const [isLoading, setIsLoading] = useState<boolean>(false);
const [error, setError] = useState<Error | unknown>(null); const [error, setError] = useState<Error | unknown>(null);
const { update } = useSession();
const router = useRouter();
const signInCallback = useCallback(async () => { const signInCallback = useCallback(async () => {
if (isLoading) { if (isLoading) {
@ -22,19 +26,22 @@ export function UserAuthorize({
setIsLoading(true); setIsLoading(true);
try { try {
await signIn({ ...data, redirectTo: "/dashboard" }); await signIn({ ...data, redirectTo: "/dashboard" });
// 更新 session
await update();
router.push("/dashboard");
setIsLoading(false); setIsLoading(false);
} catch (error) { } catch (error) {
setError(error); setError(error);
setIsLoading(false); setIsLoading(false);
} }
}, []); }, [data, isLoading, update, router]);
useEffect(() => { useEffect(() => {
const timer = setTimeout(signInCallback, 5); const timer = setTimeout(signInCallback, 5);
return () => { return () => {
clearTimeout(timer); clearTimeout(timer);
}; };
}, []); }, [signInCallback]);
return ( return (
<> <>

View File

@ -1,7 +1,9 @@
"use client"; "use client";
import { useEffect } from "react";
import Image from "next/image"; import Image from "next/image";
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/navigation";
import { User } from "lucide-react"; import { User } from "lucide-react";
import { signOut, useSession } from "next-auth/react"; import { signOut, useSession } from "next-auth/react";
@ -18,9 +20,15 @@ import {
} from "../ui/dropdown-menu"; } from "../ui/dropdown-menu";
export function NavBar() { export function NavBar() {
const { data: session } = useSession(); const { data: session, status } = useSession();
const router = useRouter();
const user = session?.user; const user = session?.user;
const handleSignOut = async () => {
await signOut({ redirect: false });
router.push("/");
};
return ( return (
<nav className="sticky top-0 z-10 bg-white shadow-md dark:bg-gray-800"> <nav className="sticky top-0 z-10 bg-white shadow-md dark:bg-gray-800">
<div className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8"> <div className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
@ -36,7 +44,16 @@ export function NavBar() {
<div className="flex items-center space-x-4"> <div className="flex items-center space-x-4">
<ThemeToggle /> <ThemeToggle />
{user ? ( {status === "loading" ? (
<Button
variant="outline"
size="icon"
className="relative h-9 w-9 overflow-hidden rounded-full"
disabled
>
<User className="h-5 w-5" />
</Button>
) : user ? (
<DropdownMenu> <DropdownMenu>
<DropdownMenuTrigger asChild> <DropdownMenuTrigger asChild>
<Button <Button
@ -75,7 +92,7 @@ export function NavBar() {
<DropdownMenuSeparator /> <DropdownMenuSeparator />
<DropdownMenuItem <DropdownMenuItem
className="text-red-600 dark:text-red-400" className="text-red-600 dark:text-red-400"
onClick={() => signOut()} onClick={handleSignOut}
> >
退 退
</DropdownMenuItem> </DropdownMenuItem>