Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

try fix auth

Carl-Gerhard Lindesvärde05d8bdca1b6
diff --git a/apps/web/src/app/(app)/[organizationId]/[projectId]/events/page.tsx b/apps/web/src/app/(app)/[organizationId]/[projectId]/events/page.tsx
index 90759dd0c..406cfa0ba 100644
--- a/apps/web/src/app/(app)/[organizationId]/[projectId]/events/page.tsx
+++ b/apps/web/src/app/(app)/[organizationId]/[projectId]/events/page.tsx
@@ -109,7 +109,6 @@ export default async function Page({
}),
getExists(organizationId, projectId),
]);
- console.log(events[0]);
return (
<PageLayout title="Events" organizationSlug={organizationId}>
diff --git a/apps/web/src/app/api/trpc/[trpc]/route.ts b/apps/web/src/app/api/trpc/[trpc]/route.ts
index 66c121049..c0b27472b 100644
--- a/apps/web/src/app/api/trpc/[trpc]/route.ts
+++ b/apps/web/src/app/api/trpc/[trpc]/route.ts
@@ -1,5 +1,6 @@
import { appRouter } from '@/server/api/root';
-import { auth } from '@clerk/nextjs';
+import { getSession } from '@/server/auth';
+import { getAuth } from '@clerk/nextjs/server';
import { fetchRequestHandler } from '@trpc/server/adapters/fetch';
const handler = (req: Request) =>
@@ -7,12 +8,10 @@ const handler = (req: Request) =>
endpoint: '/api/trpc',
req,
router: appRouter,
- createContext: () => {
+ async createContext({ req }) {
console.log('------- createContext --------');
- const session = auth();
- console.log('session', session);
+ const session = getAuth(req as any);
console.log('session', JSON.stringify(session, null, 2));
-
return {
session,
};
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 68bdefb58..a9af39afd 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -8,5 +8,11 @@ export default authMiddleware({
});
export const config = {
- matcher: ['/((?!.+\\.[\\w]+$|_next).*)', '/', '/(api)(.*)'],
+ matcher: [
+ '/((?!.+\\.[\\w]+$|_next).*)',
+ '/',
+ '/(api)(.*)',
+ '/(api|trpc)(.*)',
+ '/api/trpc(.*)',
+ ],
};
diff --git a/apps/web/src/server/api/routers/chart.helpers.ts b/apps/web/src/server/api/routers/chart.helpers.ts
index 170b58da0..1c03b8a42 100644
--- a/apps/web/src/server/api/routers/chart.helpers.ts
+++ b/apps/web/src/server/api/routers/chart.helpers.ts
@@ -61,7 +61,6 @@ function fillEmptySpotsInTimeline(
clonedStartDate.getTime() <= clonedEndDate.getTime()
) {
if (prev === clonedStartDate.getTime()) {
- console.log('GET OUT NOW!');
break;
}
prev = clonedStartDate.getTime();
diff --git a/apps/web/src/server/api/trpc.ts b/apps/web/src/server/api/trpc.ts
index c27d3b5a3..df7673cdf 100644
--- a/apps/web/src/server/api/trpc.ts
+++ b/apps/web/src/server/api/trpc.ts
@@ -1,10 +1,11 @@
-import type { auth } from '@clerk/nextjs';
+import { clerkClient } from '@clerk/nextjs';
+import type { getAuth } from '@clerk/nextjs/server';
import { initTRPC, TRPCError } from '@trpc/server';
import superjson from 'superjson';
import { ZodError } from 'zod';
interface CreateContextOptions {
- session: ReturnType<typeof auth> | null;
+ session: ReturnType<typeof getAuth> | null;
}
const t = initTRPC.context<CreateContextOptions>().create({
@@ -25,15 +26,24 @@ export const createTRPCRouter = t.router;
export const publicProcedure = t.procedure;
-const enforceUserIsAuthed = t.middleware(({ ctx, next }) => {
+const enforceUserIsAuthed = t.middleware(async ({ ctx, next }) => {
if (!ctx.session?.userId) {
- throw new TRPCError({ code: 'UNAUTHORIZED' });
+ throw new TRPCError({ code: 'UNAUTHORIZED', message: 'Not authenticated' });
+ }
+ try {
+ const user = await clerkClient.users.getUser(ctx.session.userId);
+ return next({
+ ctx: {
+ session: { ...ctx.session, user },
+ },
+ });
+ } catch (error) {
+ console.error('Failes to get user', error);
+ throw new TRPCError({
+ code: 'UNAUTHORIZED',
+ message: 'Failed to get user',
+ });
}
- return next({
- ctx: {
- session: { ...ctx.session, user: ctx.session.user },
- },
- });
});
export const protectedProcedure = t.procedure.use(enforceUserIsAuthed);