Skip to content

fix(git-provider): allow all organization members to see git integrations #3509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vtomasr5 wants to merge 1 commit into
base: canary
Choose a base branch
from
+33 −64
Open

fix(git-provider): allow all organization members to see git integrations #3509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions apps/dokploy/server/api/routers/bitbucket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ export const bitbucketRouter = createTRPCRouter({
const bitbucketProvider = await findBitbucketById(input.bitbucketId);
if (
bitbucketProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
bitbucketProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -61,13 +60,11 @@ export const bitbucketRouter = createTRPCRouter({
},
});

result = result.filter((provider) => {
return (
result = result.filter(
(provider) =>
provider.gitProvider.organizationId ===
ctx.session.activeOrganizationId &&
provider.gitProvider.userId === ctx.session.userId
);
});
ctx.session.activeOrganizationId,
);
return result;
}),

Expand All @@ -77,8 +74,7 @@ export const bitbucketRouter = createTRPCRouter({
const bitbucketProvider = await findBitbucketById(input.bitbucketId);
if (
bitbucketProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
bitbucketProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -95,8 +91,7 @@ export const bitbucketRouter = createTRPCRouter({
);
if (
bitbucketProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
bitbucketProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -112,8 +107,7 @@ export const bitbucketRouter = createTRPCRouter({
const bitbucketProvider = await findBitbucketById(input.bitbucketId);
if (
bitbucketProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
bitbucketProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -136,8 +130,7 @@ export const bitbucketRouter = createTRPCRouter({
const bitbucketProvider = await findBitbucketById(input.bitbucketId);
if (
bitbucketProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
bitbucketProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand Down
7 changes: 2 additions & 5 deletions apps/dokploy/server/api/routers/git-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { findGitProviderById, removeGitProvider } from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { and, desc, eq } from "drizzle-orm";
import { desc, eq } from "drizzle-orm";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { apiRemoveGitProvider, gitProvider } from "@/server/db/schema";
Expand All @@ -15,10 +15,7 @@ export const gitProviderRouter = createTRPCRouter({
gitea: true,
},
orderBy: desc(gitProvider.createdAt),
where: and(
eq(gitProvider.userId, ctx.session.userId),
eq(gitProvider.organizationId, ctx.session.activeOrganizationId),
),
where: eq(gitProvider.organizationId, ctx.session.activeOrganizationId),
});
}),
remove: protectedProcedure
Expand Down
21 changes: 7 additions & 14 deletions apps/dokploy/server/api/routers/gitea.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ export const giteaRouter = createTRPCRouter({
const giteaProvider = await findGiteaById(input.giteaId);
if (
giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -65,8 +64,7 @@ export const giteaRouter = createTRPCRouter({
result = result.filter(
(provider) =>
provider.gitProvider.organizationId ===
ctx.session.activeOrganizationId &&
provider.gitProvider.userId === ctx.session.userId,
ctx.session.activeOrganizationId,
);

const filtered = result
Expand Down Expand Up @@ -98,8 +96,7 @@ export const giteaRouter = createTRPCRouter({
const giteaProvider = await findGiteaById(giteaId);
if (
giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand Down Expand Up @@ -135,8 +132,7 @@ export const giteaRouter = createTRPCRouter({
const giteaProvider = await findGiteaById(giteaId);
if (
giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand Down Expand Up @@ -168,8 +164,7 @@ export const giteaRouter = createTRPCRouter({
const giteaProvider = await findGiteaById(giteaId);
if (
giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand Down Expand Up @@ -197,8 +192,7 @@ export const giteaRouter = createTRPCRouter({
const giteaProvider = await findGiteaById(input.giteaId);
if (
giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand Down Expand Up @@ -239,8 +233,7 @@ export const giteaRouter = createTRPCRouter({
const giteaProvider = await findGiteaById(giteaId);
if (
giteaProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
giteaProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand Down
19 changes: 6 additions & 13 deletions apps/dokploy/server/api/routers/github.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ export const githubRouter = createTRPCRouter({
const githubProvider = await findGithubById(input.githubId);
if (
githubProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
githubProvider.gitProvider.userId === ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -38,8 +37,7 @@ export const githubRouter = createTRPCRouter({
const githubProvider = await findGithubById(input.githubId);
if (
githubProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
githubProvider.gitProvider.userId === ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -54,10 +52,8 @@ export const githubRouter = createTRPCRouter({
const githubProvider = await findGithubById(input.githubId || "");
if (
githubProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
githubProvider.gitProvider.userId === ctx.session.userId
ctx.session.activeOrganizationId
) {
//TODO: Remove this line when the cloud version is ready
throw new TRPCError({
code: "UNAUTHORIZED",
message: "You are not allowed to access this github provider",
Expand All @@ -75,8 +71,7 @@ export const githubRouter = createTRPCRouter({
result = result.filter(
(provider) =>
provider.gitProvider.organizationId ===
ctx.session.activeOrganizationId &&
provider.gitProvider.userId === ctx.session.userId,
ctx.session.activeOrganizationId,
);

const filtered = result
Expand All @@ -100,8 +95,7 @@ export const githubRouter = createTRPCRouter({
const githubProvider = await findGithubById(input.githubId);
if (
githubProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
githubProvider.gitProvider.userId === ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -123,8 +117,7 @@ export const githubRouter = createTRPCRouter({
const githubProvider = await findGithubById(input.githubId);
if (
githubProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
githubProvider.gitProvider.userId === ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand Down
25 changes: 9 additions & 16 deletions apps/dokploy/server/api/routers/gitlab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ export const gitlabRouter = createTRPCRouter({
const gitlabProvider = await findGitlabById(input.gitlabId);
if (
gitlabProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
gitlabProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -60,13 +59,11 @@ export const gitlabRouter = createTRPCRouter({
},
});

result = result.filter((provider) => {
return (
result = result.filter(
(provider) =>
provider.gitProvider.organizationId ===
ctx.session.activeOrganizationId &&
provider.gitProvider.userId === ctx.session.userId
);
});
ctx.session.activeOrganizationId,
);
const filtered = result
.filter((provider) => haveGitlabRequirements(provider))
.map((provider) => {
Expand All @@ -87,8 +84,7 @@ export const gitlabRouter = createTRPCRouter({
const gitlabProvider = await findGitlabById(input.gitlabId);
if (
gitlabProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
gitlabProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -104,8 +100,7 @@ export const gitlabRouter = createTRPCRouter({
const gitlabProvider = await findGitlabById(input.gitlabId || "");
if (
gitlabProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
gitlabProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -121,8 +116,7 @@ export const gitlabRouter = createTRPCRouter({
const gitlabProvider = await findGitlabById(input.gitlabId || "");
if (
gitlabProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
gitlabProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand All @@ -145,8 +139,7 @@ export const gitlabRouter = createTRPCRouter({
const gitlabProvider = await findGitlabById(input.gitlabId);
if (
gitlabProvider.gitProvider.organizationId !==
ctx.session.activeOrganizationId &&
gitlabProvider.gitProvider.userId !== ctx.session.userId
ctx.session.activeOrganizationId
) {
throw new TRPCError({
code: "UNAUTHORIZED",
Expand Down