fix(template,stackoverflow): fix clerk user types

xiaosen7 · Jul 30, 2024 · f926faa · f926faa
1 parent cfa46d3
commit f926faa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/apps/stackoverflow/src/libs/actions/user.ts b/apps/stackoverflow/src/libs/actions/user.ts
@@ -4,15 +4,20 @@ import { prisma } from "@/prisma";
 import { IUser, toast } from "@/shared";
 import { auth, currentUser } from "@clerk/nextjs/server";
 
+async function getClerkId() {
+  const clerkUser = await currentUser();
+  return clerkUser?.id;
+}
+
 export async function getCurrent() {
-  const { clerkUser: userId } = auth();
-  if (!userId) {
+  const clerkId = await getClerkId();
+  if (!clerkId) {
     return null;
   }
 
   const user = await prisma.user.findUnique({
     where: {
-      clerkId: userId,
+      clerkId,
     },
   });
   return user;

diff --git a/apps/template/src/libs/actions/user.ts b/apps/template/src/libs/actions/user.ts
@@ -1,11 +1,11 @@
 "use server";
 
 import { prisma } from "@/libs/prisma/client";
-import { auth } from "@clerk/nextjs/server";
+import { currentUser } from "@clerk/nextjs/server";
 
 export async function createUserIfNeeded() {
   try {
-    const { clerkUser: clerkId } = auth();
+    const clerkId = (await currentUser())?.id;
 
     if (!clerkId) {
       return;