perf: init auth client

packages/api/src/trpc.ts

@@ -7,7 +7,7 @@ import superjson from "superjson";
 import { ZodError } from "zod";
 
 import type { dbClient } from "@kan/db/client";
-// import { auth } from "@kan/auth";
+import { initAuth } from "@kan/auth";
 import { createDrizzleClient } from "@kan/db/client";
 
 export interface User {
@@ -26,16 +26,6 @@ interface CreateContextOptions {
   db: dbClient;
 }
 
-// dummy user for testing edge speed
-const user = {
-  id: "2b97d1f4-82db-415c-8be8-b6b1c1c13cbf",
-  name: "John Doe",
-  email: "john.doe@example.com",
-  emailVerified: true,
-  createdAt: new Date(),
-  updatedAt: new Date(),
-};
-
 export const createInnerTRPCContext = (opts: CreateContextOptions) => {
   return {
     user: opts.user,
@@ -46,23 +36,25 @@ export const createInnerTRPCContext = (opts: CreateContextOptions) => {
 export const createTRPCContext = async ({
   req,
 }: FetchCreateContextFnOptions) => {
-  // const session = await auth.api.getSession({
-  //   headers: req.headers,
-  // });
-
   const db = createDrizzleClient();
+  const auth = initAuth(db);
 
-  return createInnerTRPCContext({ db, user });
+  const session = await auth.api.getSession({
+    headers: req.headers,
+  });
+
+  return createInnerTRPCContext({ db, user: session?.user });
 };
 
 export const createNextApiContext = async (req: NextRequest) => {
-  // const session = await auth.api.getSession({
-  //   headers: req.headers,
-  // });
-
   const db = createDrizzleClient();
+  const auth = initAuth(db);
 
-  return createInnerTRPCContext({ db, user: user });
+  const session = await auth.api.getSession({
+    headers: req.headers,
+  });
+
+  return createInnerTRPCContext({ db, user: session?.user });
 };
 
 export const createRESTContext = async ({ req }: CreateNextContextOptions) => {
@@ -72,17 +64,18 @@ export const createRESTContext = async ({ req }: CreateNextContextOptions) => {
     : null;
 
   const db = createDrizzleClient();
+  const auth = initAuth(db);
 
   if (!accessToken) {
     return createInnerTRPCContext({ db, user: null });
   }
 
-  // const session = await auth.api.getSession({
+  const session = await auth.api.getSession({
-  //   // @ts-expect-error
+    // @ts-expect-error
-  //   headers: new Headers(req.headers),
+    headers: new Headers(req.headers),
-  // });
+  });
 
-  return createInnerTRPCContext({ db, user });
+  return createInnerTRPCContext({ db, user: session?.user });
 };
 
 const t = initTRPC

packages/auth/src/auth.ts

@@ -4,14 +4,14 @@ import { createAuthMiddleware } from "better-auth/api";
 import { apiKey } from "better-auth/plugins";
 import { magicLink } from "better-auth/plugins/magic-link";
 
-import { createDrizzleClient } from "@kan/db/client";
+import type { dbClient } from "@kan/db/client";
 import * as userRepo from "@kan/db/repository/user.repo";
 import * as schema from "@kan/db/schema";
 import { sendEmail } from "@kan/email";
 import { createStripeClient } from "@kan/stripe";
 
-const db = createDrizzleClient();
+export const initAuth = (db: dbClient) => {
-export const auth = betterAuth({
+  return betterAuth({
     secret: process.env.BETTER_AUTH_SECRET!,
     baseURL: process.env.BETTER_AUTH_BASE_URL!,
     trustedOrigins: process.env.BETTER_AUTH_TRUSTED_ORIGINS
@@ -79,4 +79,5 @@ export const auth = betterAuth({
         generateId: false,
       },
     },
-});
+  });
+};

packages/auth/src/index.ts

@@ -1,6 +1,6 @@
-import { auth } from "./auth";
+import { initAuth } from "./auth";
 import { authClient } from "./clients";
 
 export const name = "auth";
 
-export { auth, authClient };
+export { initAuth, authClient };