fix: simplify session user check in protected procedures (#2044)

Co-authored-by: Julius Marminge <[email protected]>
t3-oss · Jan 12, 2025 · cd4cf33 · cd4cf33
1 parent d22a0bf
commit cd4cf33
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 18 deletions.
diff --git a/.changeset/itchy-apricots-compare.md b/.changeset/itchy-apricots-compare.md
@@ -0,0 +1,5 @@
+---
+"create-t3-app": patch
+---
+
+fix: simplify session user check in protected procedures
diff --git a/cli/template/extras/src/server/api/trpc-app/with-auth-db.ts b/cli/template/extras/src/server/api/trpc-app/with-auth-db.ts
@@ -121,7 +121,7 @@ export const publicProcedure = t.procedure.use(timingMiddleware);
 export const protectedProcedure = t.procedure
   .use(timingMiddleware)
   .use(({ ctx, next }) => {
-    if (!ctx.session || !ctx.session.user) {
+    if (!ctx.session?.user) {
       throw new TRPCError({ code: "UNAUTHORIZED" });
     }
     return next({

diff --git a/cli/template/extras/src/server/api/trpc-app/with-auth.ts b/cli/template/extras/src/server/api/trpc-app/with-auth.ts
@@ -118,7 +118,7 @@ export const publicProcedure = t.procedure.use(timingMiddleware);
 export const protectedProcedure = t.procedure
   .use(timingMiddleware)
   .use(({ ctx, next }) => {
-    if (!ctx.session || !ctx.session.user) {
+    if (!ctx.session?.user) {
       throw new TRPCError({ code: "UNAUTHORIZED" });
     }
     return next({

diff --git a/cli/template/extras/src/server/api/trpc-pages/with-auth-db.ts b/cli/template/extras/src/server/api/trpc-pages/with-auth-db.ts
@@ -148,7 +148,7 @@ export const publicProcedure = t.procedure.use(timingMiddleware);
 export const protectedProcedure = t.procedure
   .use(timingMiddleware)
   .use(({ ctx, next }) => {
-    if (!ctx.session || !ctx.session.user) {
+    if (!ctx.session?.user) {
       throw new TRPCError({ code: "UNAUTHORIZED" });
     }
     return next({

diff --git a/cli/template/extras/src/server/api/trpc-pages/with-auth.ts b/cli/template/extras/src/server/api/trpc-pages/with-auth.ts
@@ -146,7 +146,7 @@ export const publicProcedure = t.procedure.use(timingMiddleware);
 export const protectedProcedure = t.procedure
   .use(timingMiddleware)
   .use(({ ctx, next }) => {
-    if (!ctx.session || !ctx.session.user) {
+    if (!ctx.session?.user) {
       throw new TRPCError({ code: "UNAUTHORIZED" });
     }
     return next({

diff --git a/www/src/pages/ar/usage/next-auth.md b/www/src/pages/ar/usage/next-auth.md
@@ -100,7 +100,7 @@ export const createContext = async (opts: CreateNextContextOptions) => {
 
 ```ts:server/trpc/trpc.ts
 export const protectedProcedure = t.procedure.use(({ ctx, next }) => {
-  if (!ctx.session || !ctx.session.user) {
+  if (!ctx.session?.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
   return next({

diff --git a/www/src/pages/en/usage/next-auth-app-router.mdx b/www/src/pages/en/usage/next-auth-app-router.mdx
@@ -77,7 +77,7 @@ export const createTRPCContext = async (opts: { headers: Headers }) => {
 ```ts:server/api/trpc.ts
 export const protectedProcedure = t.procedure
   .use(({ ctx, next }) => {
-    if (!ctx.session || !ctx.session.user) {
+    if (!ctx.session?.user) {
       throw new TRPCError({ code: "UNAUTHORIZED" });
     }
     return next({

diff --git a/www/src/pages/en/usage/next-auth-pages.mdx b/www/src/pages/en/usage/next-auth-pages.mdx
@@ -116,7 +116,7 @@ export const createContext = async (opts: CreateNextContextOptions) => {
 
 ```ts:server/api/trpc.ts
 export const protectedProcedure = t.procedure.use(({ ctx, next }) =>  {
-  if (!ctx.session || !ctx.session.user) {
+  if (!ctx.session?.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
   return next({
@@ -175,8 +175,8 @@ Usage of NextAuth.js with Next.js middleware [requires the use of the JWT sessio
   issues.
 </Callout>
 
-After switching to the JWT session strategy. Make sure to update the `session` callback in `src/server/auth.ts`.  
-The `user` object will be `undefined`. Instead, retrieve the user's ID from the `token` object.  
+After switching to the JWT session strategy. Make sure to update the `session` callback in `src/server/auth.ts`.
+The `user` object will be `undefined`. Instead, retrieve the user's ID from the `token` object.
 I.e.:
 
 ```diff:server/auth.ts

diff --git a/www/src/pages/es/usage/next-auth.md b/www/src/pages/es/usage/next-auth.md
@@ -100,7 +100,7 @@ export const createContext = async (opts: CreateNextContextOptions) => {
 
 ```ts:server/trpc/trpc.ts
 export const protectedProcedure = t.procedure.use(({ ctx, next }) =>  {
-  if (!ctx.session || !ctx.session.user) {
+  if (!ctx.session?.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
   return next({

diff --git a/www/src/pages/fr/usage/next-auth.mdx b/www/src/pages/fr/usage/next-auth.mdx
@@ -126,7 +126,7 @@ export const createContext = async (opts: CreateNextContextOptions) => {
 
 ```ts:server/api/trpc.ts
 export const protectedProcedure = t.procedure.use(({ ctx, next }) =>  {
-  if (!ctx.session || !ctx.session.user) {
+  if (!ctx.session?.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
   return next({

diff --git a/www/src/pages/ja/usage/next-auth.md b/www/src/pages/ja/usage/next-auth.md
@@ -123,7 +123,7 @@ export const createContext = async (opts: CreateNextContextOptions) => {
 
 ```ts:server/api/trpc.ts
 export const protectedProcedure = t.procedure.use(({ ctx, next }) =>  {
-  if (!ctx.session || !ctx.session.user) {
+  if (!ctx.session?.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
   return next({

diff --git a/www/src/pages/no/usage/next-auth.md b/www/src/pages/no/usage/next-auth.md
@@ -120,7 +120,7 @@ export const createContext = async (opts: CreateNextContextOptions) => {
 
 ```ts:server/api/trpc.ts
 export const protectedProcedure = t.procedure.use(({ ctx, next }) => {
-  if (!ctx.session || !ctx.session.user) {
+  if (!ctx.session?.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
   return next({

diff --git a/www/src/pages/pl/usage/next-auth.md b/www/src/pages/pl/usage/next-auth.md
@@ -120,7 +120,7 @@ export const createContext = async (opts: CreateNextContextOptions) => {
 
 ```ts:server/api/trpc.ts
 export const protectedProcedure = t.procedure.use(({ ctx, next }) => {
-  if (!ctx.session || !ctx.session.user) {
+  if (!ctx.session?.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
   return next({

diff --git a/www/src/pages/pt/usage/next-auth.md b/www/src/pages/pt/usage/next-auth.md
@@ -123,7 +123,7 @@ export const createContext = async (opts: CreateNextContextOptions) => {
 
 ```ts:server/trpc/trpc.ts
 export const protectedProcedure = t.procedure.use(({ ctx, next }) => {
-  if (!ctx.session || !ctx.session.user) {
+  if (!ctx.session?.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
   return next({

diff --git a/www/src/pages/ru/usage/next-auth.md b/www/src/pages/ru/usage/next-auth.md
@@ -123,7 +123,7 @@ export const createContext = async (opts: CreateNextContextOptions) => {
 
 ```ts:server/api/trpc.ts
 export const protectedProcedure = t.procedure.use(({ ctx, next }) =>  {
-  if (!ctx.session || !ctx.session.user) {
+  if (!ctx.session?.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
   return next({

diff --git a/www/src/pages/uk/usage/next-auth.mdx b/www/src/pages/uk/usage/next-auth.mdx
@@ -126,7 +126,7 @@ export const createContext = async (opts: CreateNextContextOptions) => {
 
 ```ts:server/api/trpc.ts
 export const protectedProcedure = t.procedure.use(({ ctx, next }) =>  {
-  if (!ctx.session || !ctx.session.user) {
+  if (!ctx.session?.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
   return next({

diff --git a/www/src/pages/zh-hans/usage/next-auth.mdx b/www/src/pages/zh-hans/usage/next-auth.mdx
@@ -126,7 +126,7 @@ export const createContext = async (opts: CreateNextContextOptions) => {
 
 ```ts:server/api/trpc.ts
 export const protectedProcedure = t.procedure.use(({ ctx, next }) => {
-  if (!ctx.session || !ctx.session.user) {
+  if (!ctx.session?.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
   }
   return next({