awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-08 03:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved gitlab integration creation issue regarding groups

Browse Source
This commit is contained in:
Sheen Capadngan
2024-05-28 19:43:00 +08:00
parent c638caede5
commit a618e0ebf2
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/server/routes/v1/integration-auth-router.ts
+1 -1
View File
@@ -330,7 +330,7 @@ export const registerIntegrationAuthRouter = async (server: FastifyZodProvider)
teams: z teams: z
.object({ .object({
name: z.string(), name: z.string(),
id: z.string().optional() id: z.string()
}) })
.array() .array()
}) })
backend/src/services/integration-auth/integration-team.ts
+2 -2
View File
@@ -5,7 +5,7 @@ import { Integrations, IntegrationUrls } from "./integration-list";
type Team = { type Team = {
name: string; name: string;
teamId: string; id: string;
}; };
const getTeamsGitLab = async ({ url, accessToken }: { url: string; accessToken: string }) => { const getTeamsGitLab = async ({ url, accessToken }: { url: string; accessToken: string }) => {
const gitLabApiUrl = url ? `${url}/api` : IntegrationUrls.GITLAB_API_URL; const gitLabApiUrl = url ? `${url}/api` : IntegrationUrls.GITLAB_API_URL;
@@ -22,7 +22,7 @@ const getTeamsGitLab = async ({ url, accessToken }: { url: string; accessToken:
teams = res.map((t) => ({ teams = res.map((t) => ({
name: t.name, name: t.name,
teamId: t.id id: t.id.toString()
})); }));
return teams; return teams;
frontend/src/hooks/api/integrationAuth/types.ts
+1 -1
View File
@@ -30,7 +30,7 @@ export type HerokuPipelineCoupling = {
export type Team = { export type Team = {
name: string; name: string;
teamId: string; id: string;
}; };
export type Environment = { export type Environment = {
frontend/src/pages/integrations/gitlab/create.tsx
+3 -3
View File
@@ -121,7 +121,7 @@ export default function GitLabCreateIntegrationPage() {
if (integrationAuthTeams) { if (integrationAuthTeams) {
if (integrationAuthTeams.length > 0) { if (integrationAuthTeams.length > 0) {
// case: user is part of at least 1 group in GitLab // case: user is part of at least 1 group in GitLab
setValue("targetTeamId", String(integrationAuthTeams[0].teamId)); setValue("targetTeamId", String(integrationAuthTeams[0].id));
} else { } else {
// case: user is not part of any groups in GitLab // case: user is not part of any groups in GitLab
setValue("targetTeamId", "none"); setValue("targetTeamId", "none");
@@ -312,8 +312,8 @@ export default function GitLabCreateIntegrationPage() {
{integrationAuthTeams.length > 0 ? ( {integrationAuthTeams.length > 0 ? (
integrationAuthTeams.map((integrationAuthTeam) => ( integrationAuthTeams.map((integrationAuthTeam) => (
<SelectItem <SelectItem
value={String(integrationAuthTeam.teamId as string)} value={String(integrationAuthTeam.id as string)}
key={`target-team-${String(integrationAuthTeam.teamId)}`} key={`target-team-${String(integrationAuthTeam.id)}`}
> >
{integrationAuthTeam.name} {integrationAuthTeam.name}
</SelectItem> </SelectItem>