re-implemented JWT auth

app/client/hooks/auth.tsx

@@ -0,0 +1,83 @@
+import { gql } from '@apollo/client';
+import { Session } from '@generated/types';
+import { createContext, useContext } from 'react';
+import { sessionFragment } from '../fragments';
+import { useToastMutation } from '../hooks/useToastMutation';
+import { url } from '../main';
+
+interface AuthContextProps {
+  headers: Session | null;
+  setHeaders: (session: Session) => void;
+}
+
+export const AuthContext = createContext<AuthContextProps | null>(null);
+export const AuthProvider = AuthContext.Provider;
+
+interface UseAuthOutput extends AuthContextProps {
+  isAuthenticated: boolean;
+  login: (value: { email: string; password: string }) => Promise<Session | null | undefined>;
+}
+
+export function useAuth(): UseAuthOutput {
+  const authContext = useContext(AuthContext);
+  const { update: login } = useToastMutation<{ login: Session }>({
+    mutation: loginMutation,
+    successMsg: 'Logged in successfully.'
+  });
+
+  if (!authContext) throw new Error('useAuth must be used within an AuthProvider');
+
+  return {
+    ...authContext,
+    isAuthenticated: authContext.headers != null,
+    login: async ({ email, password }: { email: string; password: string }) => {
+      const { data } = await login({
+        variables: {
+          input: {
+            email,
+            password
+          }
+        }
+      });
+
+      if (data != null) {
+        authContext.setHeaders(data.login);
+        return data.login;
+      }
+      return data;
+    }
+  };
+}
+
+interface UseRestAuthOutput {
+  refreshToken: () => Promise<Session | null | undefined>;
+}
+
+export function useRestAuth(): UseRestAuthOutput {
+  return {
+    refreshToken: async () => {
+      try {
+        const response = await fetch(`${url}/api/refreshAccessToken`, {
+          credentials: 'include'
+        });
+        if (!response.ok) {
+          throw new Error(`[error]: ${response.status}`);
+        }
+        const session = await response.json();
+        return session;
+      } catch (error) {
+        console.error(error);
+      }
+    }
+  };
+}
+
+const loginMutation = gql`
+  mutation AuthLogin($input: LoginInput!) {
+    login(input: $input) {
+      ...Session
+    }
+  }
+
+  ${sessionFragment}
+`;

app/client/hooks/useToastMutation.tsx

@@ -32,7 +32,5 @@ export function useToastMutation<T>(props: UseToastMutationProps): UseToastMutat
     }
   });
 
-  return {
-    update
-  };
+  return { update };
 }

app/client/main.tsx

@@ -1,19 +1,24 @@
 import { ApolloClient, ApolloProvider, HttpLink, InMemoryCache, from } from '@apollo/client';
+import { loadDevMessages, loadErrorMessages } from '@apollo/client/dev';
 import { onError } from '@apollo/client/link/error';
+import { Skeleton } from '@chakra-ui/react';
 import '@client/assets/styles/index.css';
 import '@client/assets/styles/nerd-fonts-icons.css';
-import { Provider } from '@client/components/ui/provider';
+import { Provider as ChakraProvider } from '@client/components/ui/provider';
 import { Toaster } from '@client/components/ui/toaster';
 import { RouterProvider, createRouter } from '@tanstack/react-router';
-import { StrictMode, createContext, useState } from 'react';
+import { StrictMode, useEffect, useState } from 'react';
 import ReactDOM from 'react-dom/client';
+import { AuthProvider, useRestAuth } from './hooks/auth';
 
 // TanStackRouter - Import the generated route tree
-import { Session } from 'inspector';
+import { Session } from '@generated/types';
 import { routeTree } from './routeTree.gen';
 
 // Create a new router instance
-const router = createRouter({ routeTree });
+const router = createRouter({
+  routeTree
+});
 
 // Register the router instance for type safety
 declare module '@tanstack/react-router' {
@@ -28,35 +33,63 @@ const isProd = MODE === 'prod';
 
 const HOST = import.meta.env.VITE_HOST || 'localhost';
 const PORT = import.meta.env.VITE_PORT || '3000';
-const uri = `https://${HOST}:${PORT}/graphql`;
-
-// Auth context
-export const AuthContext = createContext<any>(null);
+export const url = `https://${HOST}:${PORT}`;
+const graphql_uri = `${url}/graphql`;
 
 function App() {
   const [authHeaders, setAuthHeaders] = useState<Session | null>(null);
-  const AuthProvider = AuthContext.Provider;
+  const [initialLoading, setInitialLoading] = useState<boolean>(true);
+  const { refreshToken } = useRestAuth();
 
-  // if (authHeaders == null) refreshToken();
+  useEffect(() => {
+    const getPreviousSession = async () => {
+      const session = await refreshToken();
+      if (session !== undefined) setAuthHeaders(session);
+      setInitialLoading(false);
+    };
+    if (initialLoading) getPreviousSession();
+  }, []);
+
+  if (initialLoading)
+    return (
+      <StrictMode>
+        <ChakraProvider>
+          <Skeleton />
+        </ChakraProvider>
+      </StrictMode>
+    );
 
   const httpLink = new HttpLink({
-    uri,
+    uri: graphql_uri,
     credentials: 'include',
     headers: authHeaders != null ? { authorization: JSON.stringify(authHeaders) } : undefined
   });
 
-  const errorLink = onError(({ graphQLErrors, networkError }) => {
-    if (graphQLErrors)
-      graphQLErrors.forEach(({ message, locations, path }) =>
-        console.error(`[GraphQL error]: Message: ${message}, Location: ${locations}, Path: ${path}`)
+  const errorLink = onError(({ graphQLErrors, networkError, operation, forward }) => {
+    if (graphQLErrors != null && graphQLErrors.length > 0)
+      graphQLErrors.map(async error => {
+        if (error.message.includes('jwt expired')) {
+          const session = await refreshToken();
+          if (session != undefined) setAuthHeaders(session);
+          return forward(operation);
+        }
+        if (!isProd)
+          console.error(
+            `[GraphQlError]: Message: ${error.message}, Location: ${JSON.stringify(error.locations)}, Path: ${error.path}`
           );
-
-    if (networkError) console.error(`[Network error]: ${networkError}`);
       });
 
+    if (networkError != null && graphQLErrors == null) console.error(networkError);
+  });
+
+  if (!isProd) {
+    loadDevMessages();
+    loadErrorMessages();
+  }
+
   const client = new ApolloClient({
-    uri,
-    link: isProd ? undefined : from([errorLink, httpLink]),
+    uri: graphql_uri,
+    link: from([errorLink, httpLink]),
     cache: new InMemoryCache(),
     connectToDevTools: !isProd,
     credentials: 'include'
@@ -66,17 +99,17 @@ function App() {
     <StrictMode>
       <AuthProvider
         value={{
-          authHeaders,
+          headers: authHeaders,
           setHeaders: (session: Session) => {
             setAuthHeaders(session);
           }
         }}
       >
         <ApolloProvider client={client}>
-          <Provider>
+          <ChakraProvider>
             <Toaster />
             <RouterProvider router={router} />
-          </Provider>
+          </ChakraProvider>
         </ApolloProvider>
       </AuthProvider>
     </StrictMode>

app/client/pages/index.tsx

@@ -1,4 +1,4 @@
-import { Stack, Text } from '@chakra-ui/react';
+import { Box, Button, Stack, Text } from '@chakra-ui/react';
 import { createFileRoute } from '@tanstack/react-router';
 
 import { gql, useQuery } from '@apollo/client';
@@ -10,7 +10,7 @@ export const Route = createFileRoute('/')({
 });
 
 function Index() {
-  const { data } = useQuery<BooksManyQuery>(getBooksQuery);
+  const { data, refetch } = useQuery<BooksManyQuery>(getBooksQuery);
 
   return (
     <Stack>
@@ -27,6 +27,9 @@ function Index() {
             ))}
           </>
         )}
+        <Box>
+          <Button onClick={async () => refetch()}>Refetch</Button>
+        </Box>
       </Stack>
     </Stack>
   );

app/client/pages/login.tsx

@@ -1,17 +1,12 @@
-import { gql } from '@apollo/client';
 import { Heading, Input, Stack } from '@chakra-ui/react';
 import { Button } from '@client/components/ui/button';
 import { Field } from '@client/components/ui/field';
 import { valibotResolver } from '@hookform/resolvers/valibot';
 import { createFileRoute, useNavigate } from '@tanstack/react-router';
-import { Session } from 'inspector';
-import { useContext } from 'react';
 import { useForm } from 'react-hook-form';
 import * as v from 'valibot';
 import { PasswordInput } from '../components/ui/password-input';
-import { sessionFragment } from '../fragments';
-import { useToastMutation } from '../hooks/useToastMutation';
-import { AuthContext } from '../main';
+import { useAuth } from '../hooks/auth';
 
 export const Route = createFileRoute('/login')({
   component: LoginComponent
@@ -33,10 +28,6 @@ interface FormValues {
 
 function LoginForm() {
   const navigate = useNavigate();
-  const { update: login } = useToastMutation<{ login: Session }>({
-    mutation,
-    successMsg: 'Logged in successfully.'
-  });
 
   const schema = v.pipe(
     v.object({
@@ -51,24 +42,16 @@ function LoginForm() {
     formState: { errors }
   } = useForm<FormValues>({ resolver: valibotResolver(schema) });
 
-  const { header, setHeaders } = useContext(AuthContext);
-  if (header != null) navigate({ to: '/' });
+  const { login } = useAuth();
 
   return (
     <form
       onSubmit={handleSubmit(async values => {
-        const { data } = await login({
-          variables: {
-            input: {
+        const session = await login({
           email: values.email,
           password: values.password
-            }
-          }
         });
-        if (data != null) {
-          setHeaders(data.login);
-          navigate({ to: '/' });
-        }
+        if (session != null) navigate({ to: '/' });
       })}
     >
       <Stack>
@@ -87,13 +70,3 @@ function LoginForm() {
     </form>
   );
 }
-
-const mutation = gql`
-  mutation AuthLogin($input: LoginInput!) {
-    login(input: $input) {
-      ...Session
-    }
-  }
-
-  ${sessionFragment}
-`;

app/server/config.ts

@@ -0,0 +1,74 @@
+import cors from 'cors';
+import 'dotenv/config';
+
+interface AppConfig {
+  readonly isProd: boolean;
+  readonly host: string;
+  readonly port: number;
+  readonly limit: { readonly limit: string };
+  readonly origin: string[];
+  readonly corsOptions: cors.CorsOptions;
+  readonly greeting: string;
+  readonly accessToken: TokenConfig;
+  readonly refreshToken: RefreshTokenConfig;
+}
+
+interface TokenConfig {
+  readonly secret: string;
+  readonly expiresIn: number;
+}
+
+interface RefreshTokenConfig extends TokenConfig {
+  readonly maxAge: number;
+}
+
+export function toAppConfig(): AppConfig {
+  const MODE = process.env.VITE_MODE || 'prod';
+  const isProd = MODE === 'prod';
+
+  const host = process.env.VITE_HOST || 'localhost';
+  const port = parseInt(process.env.VITE_PORT || '3000');
+
+  const urlRemote = `https://${host}:${port}`;
+  const urlLocal = host !== 'localhost' ? `https://localhost:${port}` : undefined;
+
+  const limit = { limit: '50mb' };
+
+  const origin = urlLocal != null ? [urlLocal, urlRemote] : [urlRemote];
+  const corsOptions: cors.CorsOptions = {
+    origin,
+    credentials: true
+  };
+
+  const accessTokenExpiresIn = 24 * 60 * 60;
+  const refreshTokenExpiresIn = 15 * 24 * 60 * 60;
+
+  const accessTokenSecret = process.env.ACCESS_TOKEN_SECRET;
+  const refreshTokenSecret = process.env.REFRESH_TOKEN_SECRET;
+  if (accessTokenSecret == null || refreshTokenSecret == null) throw new Error('No secrets found');
+
+  const accessToken: TokenConfig = {
+    secret: accessTokenSecret,
+    expiresIn: accessTokenExpiresIn
+  };
+
+  const refreshToken: RefreshTokenConfig = {
+    secret: refreshTokenSecret,
+    expiresIn: refreshTokenExpiresIn,
+    maxAge: refreshTokenExpiresIn * 1000
+  };
+
+  const greeting = `\n\n\n\x1b[35m-server is listening at...-\x1b[0m\n\n${urlRemote}\n${urlLocal}\n\n\n`;
+
+  return {
+    isProd,
+    host,
+    port,
+    limit,
+    origin,
+    corsOptions,
+    accessToken,
+    refreshToken,
+    greeting
+  };
+}

app/server/express/auth/refreshToken.ts

@@ -0,0 +1,51 @@
+import { config } from '@app/server/main';
+import { prisma } from '@app/server/prisma/client';
+import { Session } from '@generated/types';
+import 'dotenv/config';
+import { Request, Response } from 'express';
+import jwt from 'jsonwebtoken';
+
+export async function refreshTokenController(req: Request, res: Response) {
+  try {
+    const cookie: { jwt?: string | null } = req.cookies;
+
+    if (cookie == null || cookie.jwt == null) {
+      res.sendStatus(401);
+      return;
+    }
+
+    const refreshToken = cookie.jwt;
+
+    const user = await prisma.user.findUnique({
+      where: { refreshToken },
+      select: { id: true }
+    });
+
+    if (user == null) {
+      res.statusMessage = 'User not found.';
+      res.status(401).end();
+      return;
+    }
+
+    const decoded = jwt.verify(refreshToken, config.refreshToken.secret) as {
+      userId: string;
+      iat: number;
+      exp: number;
+    };
+
+    if (user.id !== decoded.userId) {
+      res.statusMessage = 'Invalid token.';
+      res.status(401).end();
+      return;
+    }
+
+    const accessToken = jwt.sign({ userId: user.id }, config.accessToken.secret, {
+      expiresIn: config.accessToken.expiresIn
+    });
+
+    const session: Session = { accessToken };
+    res.json(session);
+  } catch (error) {
+    console.error(error);
+  }
+}

app/server/graphql/graphql.ts

@@ -1,22 +1,24 @@
 /* gql imports */
-import { QueryResolvers } from '@generated/types';
+import { MutationResolvers, QueryResolvers } from '@generated/types';
 
 /* Query */
 import { BooksManyResolver } from './resolvers/booksManyResolver';
 import { BookOneResolver } from './resolvers/bookOneResolver';
 
 /* Mutation */
-import { LoginResolver } from './resolvers/auth/login';
 import { SignUpResolver } from './resolvers/auth/signUp';
+import { LoginResolver } from './resolvers/auth/login';
+import { LogoutResolver } from './resolvers/auth/logout';
 
 export const Query: QueryResolvers = {
   booksMany: BooksManyResolver,
   bookOne: BookOneResolver
 };
 
-export const Mutation = {
+export const Mutation: MutationResolvers = {
+  signUp: SignUpResolver,
   login: LoginResolver,
-  signUp: SignUpResolver
+  logout: LogoutResolver
 };
 
 export const Subscription = {};

app/server/graphql/resolvers/auth/login.ts

@@ -3,6 +3,7 @@ import { prisma } from '@app/server/prisma/client';
 import { MutationLoginArgs, Session } from '@generated/types';
 import bcrypt from 'bcrypt';
 import jwt from 'jsonwebtoken';
+import { config } from '@app/server/main';
 
 export async function LoginResolver(
   _: any,
@@ -19,16 +20,11 @@ export async function LoginResolver(
   const match = await bcrypt.compare(input.password, user.password);
   if (!match) throw new Error(error);
 
-  const accessTokenSecret = process.env.ACCESS_TOKEN_SECRET;
-  const refreshTokenSecret = process.env.REFRESH_TOKEN_SECRET;
-
-  if (accessTokenSecret == null || refreshTokenSecret == null) throw new Error('No secrets found');
-
-  const accessToken = jwt.sign({ userId: user.id }, accessTokenSecret, {
-    expiresIn: '30s'
+  const accessToken = jwt.sign({ userId: user.id }, config.accessToken.secret, {
+    expiresIn: config.accessToken.expiresIn
   });
-  const refreshToken = jwt.sign({ userId: user.id }, refreshTokenSecret, {
-    expiresIn: '1d'
+  const refreshToken = jwt.sign({ userId: user.id }, config.refreshToken.secret, {
+    expiresIn: config.refreshToken.expiresIn
   });
 
   await prisma.user.update({
@@ -40,17 +36,10 @@ export async function LoginResolver(
     httpOnly: true,
     sameSite: 'none',
     secure: true,
-    maxAge: 24 * 60 * 60 * 1000
+    maxAge: config.refreshToken.maxAge
   });
 
   return {
     accessToken
-    // refreshToken: {
-    //   token: refreshToken,
-    //   httpOnly: true,
-    //   secure: true,
-    //   maxAge: 24 * 60 * 60 * 1000,
-    //   sameSite: 'None'
-    // }
   };
 }

app/server/graphql/resolvers/auth/logout.ts

@@ -0,0 +1,32 @@
+import { IdentityContext } from '@app/server/identity';
+import { prisma } from '@app/server/prisma/client';
+
+export async function LogoutResolver(
+  _: any,
+  __: any,
+  { req, res, identity }: IdentityContext
+): Promise<void> {
+  const cookie: { jwt?: string | null } = req.cookies;
+  if (cookie == null || cookie.jwt == null) return;
+
+  const refreshToken = cookie.jwt;
+
+  const user = await prisma.user.findUnique({
+    where: { refreshToken },
+    select: { id: true }
+  });
+
+  if (user == null) {
+    res.clearCookie('jwt', { httpOnly: true });
+    return;
+  }
+
+  await prisma.user.update({
+    where: {
+      id: user.id
+    },
+    data: { refreshToken: null }
+  });
+
+  res.clearCookie('jwt', { httpOnly: true });
+}

app/server/graphql/resolvers/auth/refreshToken.ts

@@ -1,36 +0,0 @@
-import { IdentityContext } from '@app/server/identity';
-import { prisma } from '@app/server/prisma/client';
-import { Session } from '@generated/types';
-import jwt from 'jsonwebtoken';
-
-export async function RefreshTokenResolver(
-  _: any,
-  { req, res, identity }: IdentityContext
-): Promise<Session> {
-  const accessTokenSecret = process.env.ACCESS_TOKEN_SECRET;
-  const refreshTokenSecret = process.env.REFRESH_TOKEN_SECRET;
-  if (accessTokenSecret == null || refreshTokenSecret == null) throw new Error('No secrets found.');
-
-  const cookie: { jwt?: string | null } = req.cookies;
-  if (cookie == null || cookie.jwt == null) throw new Error('Unauthorized.');
-
-  const refreshToken = cookie.jwt;
-
-  const user = await prisma.user.findUniqueOrThrow({
-    where: { refreshToken },
-    select: { id: true }
-  });
-
-  const decoded = jwt.verify(refreshToken, accessTokenSecret) as {
-    userId: string;
-    iat: number;
-    exp: number;
-  };
-
-  if (user.id !== decoded.userId) throw new Error('Invalid token.');
-  const accessToken = jwt.sign({ userId: user.id }, accessTokenSecret, {
-    expiresIn: '30s'
-  });
-
-  return { accessToken };
-}

app/server/graphql/resolvers/auth/signUp.ts

@@ -6,7 +6,7 @@ import bcrypt from 'bcrypt';
 export async function SignUpResolver(
   _: any,
   { input }: MutationSignUpArgs,
-  { identity }: IdentityContext
+  { req, res, identity }: IdentityContext
 ): Promise<void> {
   const existingUsername = await prisma.user.findUnique({
     where: { username: input.username },

app/server/graphql/resolvers/booksManyResolver.ts

@@ -17,8 +17,9 @@ export const books = [
 export async function BooksManyResolver(
   _: any,
   __: any,
-  { identity }: IdentityContext
+  { req, res, identity }: IdentityContext
 ): Promise<Book[]> {
   if (identity == null) throw new Error('Unauthorized');
+
   return books;
 }

app/server/graphql/schema.graphql

@@ -6,13 +6,9 @@ type Query {
 }
 
 type Mutation {
-  login(input: LoginInput!): Session!
   signUp(input: SignUpInput!): Void
-}
-
-input LoginInput {
-  email: String!
-  password: String!
+  login(input: LoginInput!): Session!
+  logout: Void
 }
 
 input SignUpInput {
@@ -21,16 +17,13 @@ input SignUpInput {
   password: String!
 }
 
-type Session {
-  accessToken: String!
+input LoginInput {
+  email: String!
+  password: String!
 }
 
-type RefreshToken {
-  token: String!
-  maxAge: Int!
-  secure: Boolean!
-  httpOnly: Boolean!
-  sameSite: String!
+type Session {
+  accessToken: String!
 }
 
 type Book {

app/server/identity.ts

@@ -1,8 +1,10 @@
+import { Session } from '@generated/types';
 import 'dotenv/config';
 import { Request, Response } from 'express';
 import jwt from 'jsonwebtoken';
+import { config } from './main';
 import { prisma } from './prisma/client';
-import { Session } from '@generated/types';
+import { GraphQLError } from 'graphql';
 
 export interface IdentityContext {
   req: Request;
@@ -20,16 +22,14 @@ export async function getIdentityContext({
   req: Request;
   res: Response;
 }): Promise<IdentityContext> {
+  try {
     const authHeaders = req.headers.authorization;
     if (authHeaders == null) return { req, res };
 
     const session: Session = JSON.parse(authHeaders);
     const { accessToken } = session;
 
-  const accessTokenSecret = process.env.ACCESS_TOKEN_SECRET;
-  if (accessTokenSecret == null) throw new Error('No `accessToken`.');
-
-  const decoded = jwt.verify(accessToken, accessTokenSecret) as {
+    const decoded = jwt.verify(accessToken, config.accessToken.secret) as {
       userId: string;
       iat: number;
       exp: number;
@@ -45,13 +45,19 @@ export async function getIdentityContext({
     });
     if (identity == null) throw new Error("Couldn't find the user.");
     return { req, res, identity };
-}
-
-/*     throw new GraphQLError('User is not authenticated', {
+  } catch (error) {
+    if (error instanceof Error)
+      throw new GraphQLError(error.message, {
         extensions: {
           code: 'UNAUTHENTICATED',
           http: { status: 401 }
         }
-    }); */
-
-// throw new GraphQLError(`${error}`);
+      });
+    throw new GraphQLError(typeof error === 'string' ? error : 'Unknown error', {
+      extensions: {
+        code: 'UNAUTHENTICATED',
+        http: { status: 401 }
+      }
+    });
+  }
+}

app/server/main.ts

@@ -1,6 +1,7 @@
 import { ApolloServer } from '@apollo/server';
 import { expressMiddleware } from '@apollo/server/express4';
 import { ApolloServerPluginDrainHttpServer } from '@apollo/server/plugin/drainHttpServer';
+import cookies from 'cookie-parser';
 import cors from 'cors';
 import 'dotenv/config';
 import express from 'express';
@@ -8,17 +9,14 @@ import fs from 'fs';
 import https from 'https';
 import path from 'path';
 import ViteExpress from 'vite-express';
+import { toAppConfig } from './config';
+import { refreshTokenController } from './express/auth/refreshToken';
 import { Mutation, Query } from './graphql/graphql';
 import { getIdentityContext, IdentityContext } from './identity';
 
-const MODE = process.env.VITE_MODE || 'prod';
-const isProd = MODE === 'prod';
+export const config = toAppConfig();
 
 const __dirname = import.meta.dirname;
-const HOST = process.env.VITE_HOST || 'localhost';
-const PORT = parseInt(process.env.VITE_PORT || '3000');
-const MOTD = `\n\n\n\x1b[35m-server is listening at...-\x1b[0m\n\nhttp://${HOST}:${PORT}\nhttp://localhost:${PORT}\n\n\n`;
-
 const key = fs.readFileSync(path.join(__dirname + '../../../certs/selfsigned.key'));
 const cert = fs.readFileSync(path.join(__dirname + '../../../certs/selfsigned.crt'));
 
@@ -36,7 +34,7 @@ const resolvers = {
 const apollo = new ApolloServer<IdentityContext>({
   typeDefs,
   resolvers,
-  introspection: !isProd,
+  introspection: !config.isProd,
   plugins: [ApolloServerPluginDrainHttpServer({ httpServer: server })],
   formatError: formattedError => {
     process.stdout.write('\n```\n');
@@ -48,17 +46,21 @@ const apollo = new ApolloServer<IdentityContext>({
 
 await apollo.start();
 
+app.use(cors<cors.CorsRequest>(config.corsOptions));
+app.use(express.json(config.limit));
+app.use(cookies());
+app.get('/api/refreshAccessToken', refreshTokenController);
 app.use(
   '/graphql',
-  cors<cors.CorsRequest>(),
-  express.json(),
   expressMiddleware(apollo, {
     context: getIdentityContext
   })
 );
 
-await new Promise<void>(resolve => server.listen({ hostname: HOST, port: PORT }, resolve));
+await new Promise<void>(resolve =>
+  server.listen({ hostname: config.host, port: config.port }, resolve)
+);
 
-process.stdout.write(MOTD);
+process.stdout.write(config.greeting);
 
 ViteExpress.bind(app, server);

package-lock.json

@@ -48,6 +48,7 @@
         "@tanstack/router-devtools": "^1.85.0",
         "@tanstack/router-plugin": "^1.84.4",
         "@types/bcrypt": "^5.0.2",
+        "@types/cookie-parser": "^1.4.8",
         "@types/express": "^4.17.21",
         "@types/jsonwebtoken": "^9.0.9",
         "@types/node": "^20.9.3",
@@ -5770,6 +5771,16 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/cookie-parser": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.8.tgz",
+      "integrity": "sha512-l37JqFrOJ9yQfRQkljb41l0xVphc7kg5JTjjr+pLRZ0IyZ49V4BQ8vbF4Ut2C2e+WH4al3xD3ZwYwIUfnbT4NQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/express": "*"
+      }
+    },
     "node_modules/@types/cors": {
       "version": "2.8.17",
       "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",

package.json

@@ -24,7 +24,6 @@
     "@prisma/client": "^6.4.1",
     "@tanstack/react-router": "^1.85.0",
     "@tanstack/router-vite-plugin": "^1.84.4",
-    "@types/cors": "^2.8.17",
     "apollo-link-logger": "^2.0.1",
     "bcrypt": "^5.1.1",
     "cookie-parser": "^1.4.7",
@@ -54,6 +53,8 @@
     "@tanstack/router-devtools": "^1.85.0",
     "@tanstack/router-plugin": "^1.84.4",
     "@types/bcrypt": "^5.0.2",
+    "@types/cors": "^2.8.17",
+    "@types/cookie-parser": "^1.4.8",
     "@types/express": "^4.17.21",
     "@types/jsonwebtoken": "^9.0.9",
     "@types/node": "^20.9.3",