From d8d77762d9ae8e0fd7a07dce7745f729225d9cad Mon Sep 17 00:00:00 2001 From: lee Date: Thu, 29 May 2025 21:56:29 +0800 Subject: [PATCH] buildsec1 --- apps/api/src/server/auth/api.ts | 7 +++++-- apps/web/.gitignore | 1 + apps/web/src/app/_components/auth/login-form.tsx | 2 ++ apps/web/src/app/_components/auth/register-form.tsx | 6 ++---- apps/web/src/app/_components/auth/service.ts | 1 + 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/api/src/server/auth/api.ts b/apps/api/src/server/auth/api.ts index e01128f..9a06d27 100644 --- a/apps/api/src/server/auth/api.ts +++ b/apps/api/src/server/auth/api.ts @@ -1,8 +1,9 @@ +import jwt from "jsonwebtoken"; +import { isNil } from "lodash"; + import db from "@/libs/db/prismaClient"; import { generateAccessToken } from "@/libs/token"; import { zValidator } from "@/middleware/zValidator.middleware"; -import jwt from "jsonwebtoken"; -import { isNil } from "lodash"; import { createErrorResult, createHonoApp } from "../common/utils"; import { authLoginRequestSchema, createUserSchema } from "./schema"; @@ -51,6 +52,8 @@ export const authApi = app updatedAt: true, }, }); + console.log("user-api", user); + if (isNil(user)) return c.json({ result: false, data: null, code: 3 }, 200); return c.json({ result: true, data: user, code: 4 }, 200); }); diff --git a/apps/web/.gitignore b/apps/web/.gitignore index fd3dbb5..a84107a 100644 --- a/apps/web/.gitignore +++ b/apps/web/.gitignore @@ -26,6 +26,7 @@ yarn-debug.log* yarn-error.log* # local env files +.env .env*.local # vercel diff --git a/apps/web/src/app/_components/auth/login-form.tsx b/apps/web/src/app/_components/auth/login-form.tsx index 01b4c86..09f2582 100644 --- a/apps/web/src/app/_components/auth/login-form.tsx +++ b/apps/web/src/app/_components/auth/login-form.tsx @@ -45,6 +45,8 @@ export function LoginForm({ const { token } = await loginApi(data); setAccessToken(token); const user = await getUser(); + console.log(user); + if (user) { setauth(user); } diff --git a/apps/web/src/app/_components/auth/register-form.tsx b/apps/web/src/app/_components/auth/register-form.tsx index 8f62a15..de3e0bf 100644 --- a/apps/web/src/app/_components/auth/register-form.tsx +++ b/apps/web/src/app/_components/auth/register-form.tsx @@ -37,15 +37,13 @@ export function RegisterForm({ const setauth = useAuthStore((state) => state.setAuth); const useloginHandler = async (data: createUserType) => { const { token } = await userFetchApi(data); - console.log(token); - setAccessToken(token); const user = await getUser(); if (user) { + console.log("user", user); + setauth(user); } - - console.log(token); }; return (
diff --git a/apps/web/src/app/_components/auth/service.ts b/apps/web/src/app/_components/auth/service.ts index 873c27b..aec9410 100644 --- a/apps/web/src/app/_components/auth/service.ts +++ b/apps/web/src/app/_components/auth/service.ts @@ -31,5 +31,6 @@ export const getUser = async () => { const result = await fetchApi(async (c) => c.api.auth.profile.$get()); const user = await result.json(); + console.log(user, "getUser"); return user.result ? user.data : null; };