Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: clean up conditional checks in Bitbucket and Gitea routers for improved readability

Browse Source
This commit is contained in:
ayham291
2025-05-31 01:52:24 +02:00
parent 39af44daef
commit 0627b6fd3a
3 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dokploy/components/layouts/dashboard-layout.tsx
View File

@@ -1,7 +1,7 @@
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { ImpersonationBar } from "../dashboard/impersonation/impersonation-bar"; import { ImpersonationBar } from "../dashboard/impersonation/impersonation-bar";
import Page from "./side";
import { ChatwootWidget } from "../shared/ChatwootWidget"; import { ChatwootWidget } from "../shared/ChatwootWidget";
import Page from "./side";
interface Props { interface Props {
children: React.ReactNode; children: React.ReactNode;

27
apps/dokploy/server/api/routers/bitbucket.ts
View File

@@ -40,9 +40,9 @@ export const bitbucketRouter = createTRPCRouter({
.query(async ({ input, ctx }) => { .query(async ({ input, ctx }) => {
const bitbucketProvider = await findBitbucketById(input.bitbucketId); const bitbucketProvider = await findBitbucketById(input.bitbucketId);
if ( if (
(bitbucketProvider.gitProvider.organizationId !== bitbucketProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
bitbucketProvider.gitProvider.userId !== ctx.session.userId) bitbucketProvider.gitProvider.userId !== ctx.session.userId
) { ) {
throw new TRPCError({ throw new TRPCError({
code: "UNAUTHORIZED", code: "UNAUTHORIZED",
@@ -63,7 +63,8 @@ export const bitbucketRouter = createTRPCRouter({
result = result.filter((provider) => { result = result.filter((provider) => {
return ( return (
provider.gitProvider.organizationId === ctx.session.activeOrganizationId && provider.gitProvider.organizationId ===
ctx.session.activeOrganizationId &&
provider.gitProvider.userId === ctx.session.userId provider.gitProvider.userId === ctx.session.userId
); );
}); });
@@ -80,9 +81,9 @@ export const bitbucketRouter = createTRPCRouter({
}); });
const bitbucketProvider = await findBitbucketById(input.bitbucketId); const bitbucketProvider = await findBitbucketById(input.bitbucketId);
if ( if (
(bitbucketProvider.gitProvider.organizationId !== bitbucketProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
bitbucketProvider.gitProvider.userId !== ctx.session.userId) bitbucketProvider.gitProvider.userId !== ctx.session.userId
) { ) {
throw new TRPCError({ throw new TRPCError({
code: "UNAUTHORIZED", code: "UNAUTHORIZED",
@@ -94,11 +95,13 @@ export const bitbucketRouter = createTRPCRouter({
getBitbucketBranches: protectedProcedure getBitbucketBranches: protectedProcedure
.input(apiFindBitbucketBranches) .input(apiFindBitbucketBranches)
.query(async ({ input, ctx }) => { .query(async ({ input, ctx }) => {
const bitbucketProvider = await findBitbucketById(input.bitbucketId || ""); const bitbucketProvider = await findBitbucketById(
input.bitbucketId || "",
);
if ( if (
(bitbucketProvider.gitProvider.organizationId !== bitbucketProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
bitbucketProvider.gitProvider.userId !== ctx.session.userId) bitbucketProvider.gitProvider.userId !== ctx.session.userId
) { ) {
throw new TRPCError({ throw new TRPCError({
code: "UNAUTHORIZED", code: "UNAUTHORIZED",
@@ -113,9 +116,9 @@ export const bitbucketRouter = createTRPCRouter({
try { try {
const bitbucketProvider = await findBitbucketById(input.bitbucketId); const bitbucketProvider = await findBitbucketById(input.bitbucketId);
if ( if (
(bitbucketProvider.gitProvider.organizationId !== bitbucketProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
bitbucketProvider.gitProvider.userId !== ctx.session.userId) bitbucketProvider.gitProvider.userId !== ctx.session.userId
) { ) {
throw new TRPCError({ throw new TRPCError({
code: "UNAUTHORIZED", code: "UNAUTHORIZED",
@@ -137,9 +140,9 @@ export const bitbucketRouter = createTRPCRouter({
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
const bitbucketProvider = await findBitbucketById(input.bitbucketId); const bitbucketProvider = await findBitbucketById(input.bitbucketId);
if ( if (
(bitbucketProvider.gitProvider.organizationId !== bitbucketProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
bitbucketProvider.gitProvider.userId !== ctx.session.userId) bitbucketProvider.gitProvider.userId !== ctx.session.userId
) { ) {
throw new TRPCError({ throw new TRPCError({
code: "UNAUTHORIZED", code: "UNAUTHORIZED",

28
apps/dokploy/server/api/routers/gitea.ts
View File

@@ -45,9 +45,9 @@ export const giteaRouter = createTRPCRouter({
.query(async ({ input, ctx }) => { .query(async ({ input, ctx }) => {
const giteaProvider = await findGiteaById(input.giteaId); const giteaProvider = await findGiteaById(input.giteaId);
if ( if (
(giteaProvider.gitProvider.organizationId !== giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId) giteaProvider.gitProvider.userId !== ctx.session.userId
) { ) {
throw new TRPCError({ throw new TRPCError({
code: "UNAUTHORIZED", code: "UNAUTHORIZED",
@@ -66,9 +66,9 @@ export const giteaRouter = createTRPCRouter({
result = result.filter( result = result.filter(
(provider) => (provider) =>
(provider.gitProvider.organizationId === provider.gitProvider.organizationId ===
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
provider.gitProvider.userId === ctx.session.userId) provider.gitProvider.userId === ctx.session.userId,
); );
const filtered = result const filtered = result
@@ -99,9 +99,9 @@ export const giteaRouter = createTRPCRouter({
const giteaProvider = await findGiteaById(giteaId); const giteaProvider = await findGiteaById(giteaId);
if ( if (
(giteaProvider.gitProvider.organizationId !== giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId) giteaProvider.gitProvider.userId !== ctx.session.userId
) { ) {
throw new TRPCError({ throw new TRPCError({
code: "UNAUTHORIZED", code: "UNAUTHORIZED",
@@ -136,9 +136,9 @@ export const giteaRouter = createTRPCRouter({
const giteaProvider = await findGiteaById(giteaId); const giteaProvider = await findGiteaById(giteaId);
if ( if (
(giteaProvider.gitProvider.organizationId !== giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId) giteaProvider.gitProvider.userId !== ctx.session.userId
) { ) {
throw new TRPCError({ throw new TRPCError({
code: "UNAUTHORIZED", code: "UNAUTHORIZED",
@@ -169,9 +169,9 @@ export const giteaRouter = createTRPCRouter({
try { try {
const giteaProvider = await findGiteaById(giteaId); const giteaProvider = await findGiteaById(giteaId);
if ( if (
(giteaProvider.gitProvider.organizationId !== giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId) giteaProvider.gitProvider.userId !== ctx.session.userId
) { ) {
throw new TRPCError({ throw new TRPCError({
code: "UNAUTHORIZED", code: "UNAUTHORIZED",
@@ -198,9 +198,9 @@ export const giteaRouter = createTRPCRouter({
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
const giteaProvider = await findGiteaById(input.giteaId); const giteaProvider = await findGiteaById(input.giteaId);
if ( if (
(giteaProvider.gitProvider.organizationId !== giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId) giteaProvider.gitProvider.userId !== ctx.session.userId
) { ) {
throw new TRPCError({ throw new TRPCError({
code: "UNAUTHORIZED", code: "UNAUTHORIZED",
@@ -240,9 +240,9 @@ export const giteaRouter = createTRPCRouter({
const giteaProvider = await findGiteaById(giteaId); const giteaProvider = await findGiteaById(giteaId);
if ( if (
(giteaProvider.gitProvider.organizationId !== giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId && ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId) giteaProvider.gitProvider.userId !== ctx.session.userId
) { ) {
throw new TRPCError({ throw new TRPCError({
code: "UNAUTHORIZED", code: "UNAUTHORIZED",