refactor: update role and validation handling across multiple pages

apps/dokploy/components/dashboard/settings/users/add-user.tsx

@@ -58,7 +58,7 @@ export const AddUser = () => {
 	const onSubmit = async (data: AddUser) => {
 		const result = await authClient.organization.inviteMember({
 			email: data.email.toLowerCase(),
-			role: "user",
+			role: "member",
 			organizationId: activeOrganization?.id,
 		});
 		console.log(result);

apps/dokploy/pages/dashboard/project/[projectId].tsx

@@ -674,8 +674,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

apps/dokploy/pages/dashboard/settings/certificates.tsx

@@ -24,7 +24,7 @@ export async function getServerSideProps(
 	ctx: GetServerSidePropsContext<{ serviceId: string }>,
 ) {
 	const { req, res } = ctx;
-	const { user, session } = await validateRequest(req, res);
+	const { user, session } = await validateRequest(req);
 	if (!user || user.role === "member") {
 		return {
 			redirect: {
@@ -40,8 +40,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

apps/dokploy/pages/dashboard/settings/cluster.tsx

@@ -33,7 +33,7 @@ export async function getServerSideProps(
 			},
 		};
 	}
-	const { user, session } = await validateRequest(ctx.req, ctx.res);
+	const { user, session } = await validateRequest(ctx.req);
 	if (!user || user.role === "member") {
 		return {
 			redirect: {
@@ -48,8 +48,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

apps/dokploy/pages/dashboard/settings/destinations.tsx

@@ -25,7 +25,7 @@ export async function getServerSideProps(
 	ctx: GetServerSidePropsContext<{ serviceId: string }>,
 ) {
 	const { req, res } = ctx;
-	const { user, session } = await validateRequest(req, res);
+	const { user, session } = await validateRequest(req);
 	if (!user || user.role === "member") {
 		return {
 			redirect: {
@@ -41,8 +41,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

apps/dokploy/pages/dashboard/settings/git-providers.tsx

@@ -24,7 +24,7 @@ Page.getLayout = (page: ReactElement) => {
 export async function getServerSideProps(
 	ctx: GetServerSidePropsContext<{ serviceId: string }>,
 ) {
-	const { user, session } = await validateRequest(ctx.req, ctx.res);
+	const { user, session } = await validateRequest(ctx.req);
 	if (!user) {
 		return {
 			redirect: {
@@ -40,8 +40,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});
@@ -49,14 +49,12 @@ export async function getServerSideProps(
 	try {
 		await helpers.project.all.prefetch();
 		await helpers.settings.isCloud.prefetch();
-		const auth = await helpers.auth.get.fetch();
-
-		if (auth.role === "member") {
-			const user = await helpers.user.byAuthId.fetch({
-				authId: auth.id,
+		if (user.role === "member") {
+			const userR = await helpers.user.get.fetch({
+				userId: user.id,
 			});
 
-			if (!user.canAccessToGitProviders) {
+			if (!userR.canAccessToGitProviders) {
 				return {
 					redirect: {
 						permanent: true,

apps/dokploy/pages/dashboard/settings/index.tsx

@@ -181,7 +181,7 @@ export async function getServerSideProps(
 	ctx: GetServerSidePropsContext<{ serviceId: string }>,
 ) {
 	const { req, res } = ctx;
-	const { user, session } = await validateRequest(ctx.req, ctx.res);
+	const { user, session } = await validateRequest(ctx.req);
 	if (!user) {
 		return {
 			redirect: {
@@ -205,8 +205,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

apps/dokploy/pages/dashboard/settings/notifications.tsx

@@ -25,7 +25,7 @@ export async function getServerSideProps(
 	ctx: GetServerSidePropsContext<{ serviceId: string }>,
 ) {
 	const { req, res } = ctx;
-	const { user, session } = await validateRequest(req, res);
+	const { user, session } = await validateRequest(req);
 	if (!user || user.role === "member") {
 		return {
 			redirect: {
@@ -41,8 +41,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

apps/dokploy/pages/dashboard/settings/profile.tsx

@@ -14,12 +14,12 @@ import superjson from "superjson";
 
 const Page = () => {
 	const { data } = api.auth.get.useQuery();
-	const { data: user } = api.user.byAuthId.useQuery(
+	const { data: user } = api.user.get.useQuery(
 		{
 			authId: data?.id || "",
 		},
 		{
-			enabled: !!data?.id && data?.role === "user",
+			enabled: !!data?.id && data?.role === "member",
 		},
 	);
 
@@ -46,7 +46,7 @@ export async function getServerSideProps(
 ) {
 	const { req, res } = ctx;
 	const locale = getLocale(req.cookies);
-	const { user, session } = await validateRequest(req, res);
+	const { user, session } = await validateRequest(req);
 
 	const helpers = createServerSideHelpers({
 		router: appRouter,
@@ -54,18 +54,21 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});
 
 	await helpers.settings.isCloud.prefetch();
 	await helpers.auth.get.prefetch();
-	if (user?.role === "user") {
-		await helpers.user.byAuthId.prefetch({
-			authId: user.authId,
-		});
+	if (user?.role === "member") {
+		// const userR = await helpers.user.get.fetch({
+		// 	userId: user.id,
+		// });
+		// await helpers.user.byAuthId.prefetch({
+		// 	authId: user.authId,
+		// });
 	}
 
 	if (!user) {

apps/dokploy/pages/dashboard/settings/registry.tsx

@@ -25,7 +25,7 @@ export async function getServerSideProps(
 	ctx: GetServerSidePropsContext<{ serviceId: string }>,
 ) {
 	const { req, res } = ctx;
-	const { user, session } = await validateRequest(req, res);
+	const { user, session } = await validateRequest(req);
 	if (!user || user.role === "member") {
 		return {
 			redirect: {
@@ -40,8 +40,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

apps/dokploy/pages/dashboard/settings/server.tsx

@@ -98,7 +98,7 @@ export async function getServerSideProps(
 			},
 		};
 	}
-	const { user, session } = await validateRequest(ctx.req, ctx.res);
+	const { user, session } = await validateRequest(ctx.req);
 	if (!user) {
 		return {
 			redirect: {
@@ -122,8 +122,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

apps/dokploy/pages/dashboard/settings/servers.tsx

@@ -27,7 +27,7 @@ export async function getServerSideProps(
 ) {
 	const { req, res } = ctx;
 	const locale = await getLocale(req.cookies);
-	const { user, session } = await validateRequest(req, res);
+	const { user, session } = await validateRequest(req);
 	if (!user) {
 		return {
 			redirect: {
@@ -51,8 +51,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

apps/dokploy/pages/dashboard/settings/ssh-keys.tsx

@@ -24,7 +24,7 @@ Page.getLayout = (page: ReactElement) => {
 export async function getServerSideProps(
 	ctx: GetServerSidePropsContext<{ serviceId: string }>,
 ) {
-	const { user, session } = await validateRequest(ctx.req, ctx.res);
+	const { user, session } = await validateRequest(ctx.req);
 	if (!user) {
 		return {
 			redirect: {
@@ -40,23 +40,22 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});
 
 	try {
 		await helpers.project.all.prefetch();
-		const auth = await helpers.auth.get.fetch();
 		await helpers.settings.isCloud.prefetch();
 
-		if (auth.role === "member") {
-			const user = await helpers.user.byAuthId.fetch({
-				authId: auth.id,
+		if (user.role === "member") {
+			const userR = await helpers.user.get.fetch({
+				userId: user.id,
 			});
 
-			if (!user.canAccessToSSHKeys) {
+			if (!userR.canAccessToSSHKeys) {
 				return {
 					redirect: {
 						permanent: true,

apps/dokploy/pages/dashboard/settings/users.tsx

@@ -25,7 +25,7 @@ export async function getServerSideProps(
 	ctx: GetServerSidePropsContext<{ serviceId: string }>,
 ) {
 	const { req, res } = ctx;
-	const { user, session } = await validateRequest(req, res);
+	const { user, session } = await validateRequest(req);
 	if (!user || user.role === "member") {
 		return {
 			redirect: {
@@ -41,8 +41,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

apps/dokploy/pages/register.tsx

@@ -274,7 +274,7 @@ Register.getLayout = (page: ReactElement) => {
 };
 export async function getServerSideProps(context: GetServerSidePropsContext) {
 	if (IS_CLOUD) {
-		const { user } = await validateRequest(context.req, context.res);
+		const { user } = await validateRequest(context.req);
 
 		if (user) {
 			return {

apps/dokploy/server/wss/drawer-logs.ts

@@ -1,9 +1,9 @@
 import type http from "node:http";
+import { validateRequest } from "@dokploy/server/index";
 import { applyWSSHandler } from "@trpc/server/adapters/ws";
 import { WebSocketServer } from "ws";
 import { appRouter } from "../api/root";
 import { createTRPCContext } from "../api/trpc";
-import { validateRequest } from "@dokploy/server/index";
 
 export const setupDrawerLogsWebSocketServer = (
 	server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>,