chore: include user.id on session

src/installers/next-auth.ts

@@ -38,8 +38,12 @@ export const nextAuthInstaller: Installer = async ({
     "src/pages/api/restricted.ts",
   );
 
+  const nextAuthDefinitionSrc = path.join(nextAuthAssetDir, "next-auth.d.ts");
+  const nextAuthDefinitionDest = path.join(projectDir, "next-auth.d.ts");
+
   await Promise.all([
     fs.copy(apiHandlerSrc, apiHandlerDest),
     fs.copy(restrictedApiSrc, restrictedApiDest),
+    fs.copy(nextAuthDefinitionSrc, nextAuthDefinitionDest),
   ]);
 };

template/addons/next-auth/api-handler-prisma.ts

@@ -8,6 +8,15 @@ import { prisma } from "../../../server/db/client";
 import { env } from "../../../server/env";
 
 export const authOptions: NextAuthOptions = {
+  // Include user.id on session
+  callbacks: {
+    session({ session, user }) {
+      if (session.user) {
+        session.user.id = user.id;
+      }
+      return session;
+    },
+  },
   // Configure one or more authentication providers
   adapter: PrismaAdapter(prisma),
   providers: [

template/addons/next-auth/api-handler.ts

@@ -4,6 +4,15 @@ import CredentialsProvider from "next-auth/providers/credentials";
 import { env } from "../../../server/env";
 
 export const authOptions: NextAuthOptions = {
+  // Include user.id on session
+  callbacks: {
+    session({ session, user }) {
+      if (session.user) {
+        session.user.id = user.id;
+      }
+      return session;
+    },
+  },
   // Configure one or more authentication providers
   providers: [
     DiscordProvider({

template/addons/next-auth/next-auth.d.ts

@@ -0,0 +1,12 @@
+import { DefaultSession } from "next-auth";
+
+declare module "next-auth" {
+  /**
+   * Returned by `useSession`, `getSession` and received as a prop on the `SessionProvider` React Context
+   */
+  interface Session {
+    user?: {
+      id?: string;
+    } & DefaultSession["user"];
+  }
+}

template/base/tsconfig.json

@@ -16,6 +16,12 @@
     "incremental": true,
     "noUncheckedIndexedAccess": true
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.js"],
+  "include": [
+    "next-env.d.ts",
+    "next-auth.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    "**/*.js"
+  ],
   "exclude": ["node_modules"]
 }