feat: adjust roles

apps/dokploy/server/api/routers/auth.ts

@@ -7,6 +7,7 @@ import {
 	apiVerify2FA,
 	apiVerifyLogin2FA,
 	auth,
+	member,
 } from "@/server/db/schema";
 import { WEBSITE_URL } from "@/server/utils/stripe";
 import {
@@ -32,7 +33,7 @@ import {
 import { TRPCError } from "@trpc/server";
 import * as bcrypt from "bcrypt";
 import { isBefore } from "date-fns";
-import { eq } from "drizzle-orm";
+import { and, eq } from "drizzle-orm";
 import { nanoid } from "nanoid";
 import { z } from "zod";
 import { db } from "../../db";
@@ -170,8 +171,14 @@ export const authRouter = createTRPCRouter({
 	}),
 
 	get: protectedProcedure.query(async ({ ctx }) => {
-		const auth = await findAuthById(ctx.user.id);
-		return auth;
+		const memberResult = await db.query.member.findFirst({
+			where: and(
+				eq(member.userId, ctx.user.id),
+				eq(member.organizationId, ctx.session?.activeOrganizationId || ""),
+			),
+		});
+
+		return memberResult;
 	}),
 
 	logout: protectedProcedure.mutation(async ({ ctx }) => {

apps/dokploy/server/api/trpc.ts

@@ -32,7 +32,7 @@ import { ZodError } from "zod";
 
 interface CreateContextOptions {
 	user: (User & { rol: "admin" | "user"; ownerId: string }) | null;
-	session: Session | null;
+	session: (Session & { activeOrganizationId: string }) | null;
 	req: CreateNextContextOptions["req"];
 	res: CreateNextContextOptions["res"];
 }
@@ -75,12 +75,15 @@ export const createTRPCContext = async (opts: CreateNextContextOptions) => {
 		user = cookieResult.user;
 	}
 
+	console.log("session", { session, user });
+
 	return createInnerTRPCContext({
 		req,
 		res,
 		session: session,
 		...((user && {
 			user: {
+				...user,
 				email: user.email,
 				rol: user.role,
 				id: user.id,