fix: create a new object for the session callback (#1330)

* spread new object * whoops * Create .changeset/itchy-cooks-sell.md --------- Co-authored-by: Christopher Ehrlich <[email protected]>
t3-oss · Apr 5, 2023 · 85997e0 · 85997e0
1 parent ee55a02
commit 85997e0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/.changeset/itchy-cooks-sell.md b/.changeset/itchy-cooks-sell.md
@@ -0,0 +1,5 @@
+---
+"create-t3-app": patch
+---
+
+fix: create a new object for the session callback
diff --git a/cli/src/installers/dependencyVersionMap.ts b/cli/src/installers/dependencyVersionMap.ts
@@ -4,7 +4,7 @@
  */
 export const dependencyVersionMap = {
  // NextAuth.js
- "next-auth": "4.20.1", // TODO: undo after https://github.com/nextauthjs/next-auth/issues/7132 is fixed
+ "next-auth": "^4.21.0",
  "@next-auth/prisma-adapter": "^1.0.5",
 
  // Prisma

diff --git a/cli/template/extras/src/server/auth/base.ts b/cli/template/extras/src/server/auth/base.ts
@@ -35,13 +35,13 @@ declare module "next-auth" {
  */
 export const authOptions: NextAuthOptions = {
  callbacks: {
- session({ session, user }) {
- if (session.user) {
-  session.user.id = user.id;
- // session.user.role = user.role; <-- put other properties on the session here
- }
- return session;
- },
+ session: ({ session, user }) => ({
+ ...session,
+ user: {
+ ...session.user,
+  id: user.id,
+ },
+ }),
  },
  providers: [
  DiscordProvider({

diff --git a/cli/template/extras/src/server/auth/with-prisma.ts b/cli/template/extras/src/server/auth/with-prisma.ts
@@ -37,13 +37,13 @@ declare module "next-auth" {
  */
 export const authOptions: NextAuthOptions = {
  callbacks: {
- session({ session, user }) {
- if (session.user) {
-  session.user.id = user.id;
- // session.user.role = user.role; <-- put other properties on the session here
- }
- return session;
- },
+ session: ({ session, user }) => ({
+ ...session,
+ user: {
+ ...session.user,
+  id: user.id,
+ },
+ }),
  },
  adapter: PrismaAdapter(prisma),
  providers: [