diff --git a/server/config.ts b/server/config.ts index 13c684a5..dc7aaa00 100644 --- a/server/config.ts +++ b/server/config.ts @@ -100,5 +100,6 @@ process.env.NEXT_PUBLIC_INTERNAL_API_BASE_URL = new URL( "/api/v1", `http://${parsedConfig.data.server.internal_hostname}:${parsedConfig.data.server.external_port}`, ).href; +process.env.NEXT_PUBLIC_APP_NAME = parsedConfig.data.app.name; export default parsedConfig.data; diff --git a/src/app/layout.tsx b/src/app/layout.tsx index a7a57eb9..5bb52ea2 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -3,7 +3,7 @@ import "./globals.css"; import { Roboto } from "next/font/google"; export const metadata: Metadata = { - title: "Pangolin", + title: process.env.NEXT_PUBLIC_APP_NAME, description: "", }; diff --git a/src/app/page.tsx b/src/app/page.tsx index 0de05fec..aa37a67c 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -9,10 +9,12 @@ export default async function Page() { redirect("/auth/login"); } + console.log(user); + return ( <> -

You are logged in!

+

Logged in as {user.email}

); diff --git a/src/contexts/userContext.ts b/src/contexts/userContext.ts index 7c46ffc1..97389c1c 100644 --- a/src/contexts/userContext.ts +++ b/src/contexts/userContext.ts @@ -1,3 +1,4 @@ +import { GetUserResponse } from "@server/routers/user"; import { createContext } from "react"; -export const UserContext = createContext(null); +export const UserContext = createContext(null); diff --git a/src/lib/verifySession.ts b/src/lib/verifySession.ts index f6914a14..13319bde 100644 --- a/src/lib/verifySession.ts +++ b/src/lib/verifySession.ts @@ -1,17 +1,23 @@ import { internal } from "@app/api"; +import { GetUserResponse } from "@server/routers/user"; +import { AxiosResponse } from "axios"; import { cookies } from "next/headers"; -export async function verifySession() { +export async function verifySession(): Promise { const sessionId = cookies().get("session")?.value ?? null; try { - await internal.get("/user", { - headers: { - Cookie: `session=${sessionId}` - } - }); - return true; + const res = await internal.get>( + "/user", + { + headers: { + Cookie: `session=${sessionId}`, + }, + }, + ); + + return res.data.data; } catch { - return false + return null; } } diff --git a/src/providers/LandingProvider.tsx b/src/providers/LandingProvider.tsx index de71fea8..fa745e53 100644 --- a/src/providers/LandingProvider.tsx +++ b/src/providers/LandingProvider.tsx @@ -1,10 +1,11 @@ "use client"; import { UserContext } from "@app/contexts/userContext"; +import { GetUserResponse } from "@server/routers/user"; import { ReactNode } from "react"; type LandingProviderProps = { - user: boolean ; + user: GetUserResponse; children: ReactNode; };