diff --git a/apps/dokploy/components/layouts/dashboard-layout.tsx b/apps/dokploy/components/layouts/dashboard-layout.tsx index 4e2e15b3..b4832b4b 100644 --- a/apps/dokploy/components/layouts/dashboard-layout.tsx +++ b/apps/dokploy/components/layouts/dashboard-layout.tsx @@ -1,7 +1,7 @@ import { api } from "@/utils/api"; import { ImpersonationBar } from "../dashboard/impersonation/impersonation-bar"; -import Page from "./side"; import { ChatwootWidget } from "../shared/ChatwootWidget"; +import Page from "./side"; interface Props { children: React.ReactNode; diff --git a/apps/dokploy/server/api/routers/bitbucket.ts b/apps/dokploy/server/api/routers/bitbucket.ts index e4a150c5..2647f2b2 100644 --- a/apps/dokploy/server/api/routers/bitbucket.ts +++ b/apps/dokploy/server/api/routers/bitbucket.ts @@ -40,9 +40,9 @@ export const bitbucketRouter = createTRPCRouter({ .query(async ({ input, ctx }) => { const bitbucketProvider = await findBitbucketById(input.bitbucketId); if ( - (bitbucketProvider.gitProvider.organizationId !== + bitbucketProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId && - bitbucketProvider.gitProvider.userId !== ctx.session.userId) + bitbucketProvider.gitProvider.userId !== ctx.session.userId ) { throw new TRPCError({ code: "UNAUTHORIZED", @@ -63,7 +63,8 @@ export const bitbucketRouter = createTRPCRouter({ result = result.filter((provider) => { return ( - provider.gitProvider.organizationId === ctx.session.activeOrganizationId && + provider.gitProvider.organizationId === + ctx.session.activeOrganizationId && provider.gitProvider.userId === ctx.session.userId ); }); @@ -80,9 +81,9 @@ export const bitbucketRouter = createTRPCRouter({ }); const bitbucketProvider = await findBitbucketById(input.bitbucketId); if ( - (bitbucketProvider.gitProvider.organizationId !== + bitbucketProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId && - bitbucketProvider.gitProvider.userId !== ctx.session.userId) + bitbucketProvider.gitProvider.userId !== ctx.session.userId ) { throw new TRPCError({ code: "UNAUTHORIZED", @@ -94,11 +95,13 @@ export const bitbucketRouter = createTRPCRouter({ getBitbucketBranches: protectedProcedure .input(apiFindBitbucketBranches) .query(async ({ input, ctx }) => { - const bitbucketProvider = await findBitbucketById(input.bitbucketId || ""); + const bitbucketProvider = await findBitbucketById( + input.bitbucketId || "", + ); if ( - (bitbucketProvider.gitProvider.organizationId !== + bitbucketProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId && - bitbucketProvider.gitProvider.userId !== ctx.session.userId) + bitbucketProvider.gitProvider.userId !== ctx.session.userId ) { throw new TRPCError({ code: "UNAUTHORIZED", @@ -113,9 +116,9 @@ export const bitbucketRouter = createTRPCRouter({ try { const bitbucketProvider = await findBitbucketById(input.bitbucketId); if ( - (bitbucketProvider.gitProvider.organizationId !== + bitbucketProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId && - bitbucketProvider.gitProvider.userId !== ctx.session.userId) + bitbucketProvider.gitProvider.userId !== ctx.session.userId ) { throw new TRPCError({ code: "UNAUTHORIZED", @@ -137,9 +140,9 @@ export const bitbucketRouter = createTRPCRouter({ .mutation(async ({ input, ctx }) => { const bitbucketProvider = await findBitbucketById(input.bitbucketId); if ( - (bitbucketProvider.gitProvider.organizationId !== + bitbucketProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId && - bitbucketProvider.gitProvider.userId !== ctx.session.userId) + bitbucketProvider.gitProvider.userId !== ctx.session.userId ) { throw new TRPCError({ code: "UNAUTHORIZED", diff --git a/apps/dokploy/server/api/routers/gitea.ts b/apps/dokploy/server/api/routers/gitea.ts index 75c855ee..2c7a49bd 100644 --- a/apps/dokploy/server/api/routers/gitea.ts +++ b/apps/dokploy/server/api/routers/gitea.ts @@ -45,9 +45,9 @@ export const giteaRouter = createTRPCRouter({ .query(async ({ input, ctx }) => { const giteaProvider = await findGiteaById(input.giteaId); if ( - (giteaProvider.gitProvider.organizationId !== + giteaProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId && - giteaProvider.gitProvider.userId !== ctx.session.userId) + giteaProvider.gitProvider.userId !== ctx.session.userId ) { throw new TRPCError({ code: "UNAUTHORIZED", @@ -66,9 +66,9 @@ export const giteaRouter = createTRPCRouter({ result = result.filter( (provider) => - (provider.gitProvider.organizationId === + provider.gitProvider.organizationId === ctx.session.activeOrganizationId && - provider.gitProvider.userId === ctx.session.userId) + provider.gitProvider.userId === ctx.session.userId, ); const filtered = result @@ -99,9 +99,9 @@ export const giteaRouter = createTRPCRouter({ const giteaProvider = await findGiteaById(giteaId); if ( - (giteaProvider.gitProvider.organizationId !== + giteaProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId && - giteaProvider.gitProvider.userId !== ctx.session.userId) + giteaProvider.gitProvider.userId !== ctx.session.userId ) { throw new TRPCError({ code: "UNAUTHORIZED", @@ -136,9 +136,9 @@ export const giteaRouter = createTRPCRouter({ const giteaProvider = await findGiteaById(giteaId); if ( - (giteaProvider.gitProvider.organizationId !== + giteaProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId && - giteaProvider.gitProvider.userId !== ctx.session.userId) + giteaProvider.gitProvider.userId !== ctx.session.userId ) { throw new TRPCError({ code: "UNAUTHORIZED", @@ -169,9 +169,9 @@ export const giteaRouter = createTRPCRouter({ try { const giteaProvider = await findGiteaById(giteaId); if ( - (giteaProvider.gitProvider.organizationId !== + giteaProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId && - giteaProvider.gitProvider.userId !== ctx.session.userId) + giteaProvider.gitProvider.userId !== ctx.session.userId ) { throw new TRPCError({ code: "UNAUTHORIZED", @@ -198,9 +198,9 @@ export const giteaRouter = createTRPCRouter({ .mutation(async ({ input, ctx }) => { const giteaProvider = await findGiteaById(input.giteaId); if ( - (giteaProvider.gitProvider.organizationId !== + giteaProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId && - giteaProvider.gitProvider.userId !== ctx.session.userId) + giteaProvider.gitProvider.userId !== ctx.session.userId ) { throw new TRPCError({ code: "UNAUTHORIZED", @@ -240,9 +240,9 @@ export const giteaRouter = createTRPCRouter({ const giteaProvider = await findGiteaById(giteaId); if ( - (giteaProvider.gitProvider.organizationId !== + giteaProvider.gitProvider.organizationId !== ctx.session.activeOrganizationId && - giteaProvider.gitProvider.userId !== ctx.session.userId) + giteaProvider.gitProvider.userId !== ctx.session.userId ) { throw new TRPCError({ code: "UNAUTHORIZED",