Merge remote-tracking branch 'origin' into gitlab-integration-selfhosted

.gitignore

@@ -57,3 +57,6 @@ yarn-error.log*
 
 # Infisical init
 .infisical.json
+
+# Editor specific
+.vscode/*

backend/Dockerfile

@@ -23,7 +23,7 @@ COPY --from=build /app .
 
 RUN apk add --no-cache bash curl && curl -1sLf \
   'https://dl.cloudsmith.io/public/infisical/infisical-cli/setup.alpine.sh' | bash \
-  && apk add infisical=0.8.1
+  && apk add infisical=0.8.1 && apk add --no-cache git
 
 HEALTHCHECK --interval=10s --timeout=3s --start-period=10s \  
   CMD node healthcheck.js

backend/src/controllers/v1/secretScanningController.ts

@@ -5,7 +5,10 @@ import { Types } from "mongoose";
 import { UnauthorizedRequestError } from "../../utils/errors";
 import GitAppOrganizationInstallation from "../../ee/models/gitAppOrganizationInstallation";
 import { MembershipOrg } from "../../models";
+import { scanGithubFullRepoForSecretLeaks  } from "../../queues/secret-scanning/githubScanFullRepository"
+import { getSecretScanningGitAppId, getSecretScanningPrivateKey } from "../../config";
 import GitRisks, { STATUS_RESOLVED_FALSE_POSITIVE, STATUS_RESOLVED_NOT_REVOKED, STATUS_RESOLVED_REVOKED } from "../../ee/models/gitRisks";
+import { ProbotOctokit } from "probot";
 
 export const createInstallationSession = async (req: Request, res: Response) => {
   const sessionId = crypto.randomBytes(16).toString("hex");
@@ -47,6 +50,18 @@ export const linkInstallationToOrganization = async (req: Request, res: Response
     upsert: true
   }).lean()
 
+  const octokit = new ProbotOctokit({
+    auth: {
+      appId: await getSecretScanningGitAppId(),
+      privateKey: await getSecretScanningPrivateKey(),
+      installationId: installationId.toString()
+    },
+  });
+
+  const { data: { repositories }}= await octokit.apps.listReposAccessibleToInstallation()
+  for (const repository of repositories) {
+    scanGithubFullRepoForSecretLeaks({organizationId: installationSession.organization.toString(), installationId, repository: {id: repository.id, fullName: repository.full_name}})
+  }
   res.json(installationLink)
 }
 

backend/src/ee/services/GithubSecretScanning/helper.ts

@@ -3,7 +3,21 @@ import { mkdir, readFile, rm, writeFile } from "fs";
 import { tmpdir } from "os";
 import { join } from "path"
 import { SecretMatch } from "./types";
-import { Octokit } from "@octokit/rest";
+
+export async function scanFullRepoContentAndGetFindings(octokit: any, installationId: number, repositoryFullName: string): Promise<SecretMatch[]> {
+  const tempFolder = await createTempFolder();
+  const findingsPath = join(tempFolder, "findings.json");
+  const repoPath = join(tempFolder, "repo.git")
+  try {
+    const { data: { token }} = await octokit.apps.createInstallationAccessToken({installation_id: installationId})
+    await cloneRepo(token, repositoryFullName, repoPath)
+    await runInfisicalScanOnRepo(repoPath, findingsPath);
+    const findingsData = await readFindingsFile(findingsPath);
+    return JSON.parse(findingsData);
+  } finally {
+    await deleteTempFolder(tempFolder);
+  }
+}
 
 export async function scanContentAndGetFindings(textContent: string): Promise<SecretMatch[]> {
   const tempFolder = await createTempFolder();
@@ -36,6 +50,8 @@ export function createTempFolder(): Promise<string> {
   });
 }
 
+
+
 export function writeTextToFile(filePath: string, content: string): Promise<void> {
   return new Promise((resolve, reject) => {
     writeFile(filePath, content, (err) => {
@@ -48,6 +64,33 @@ export function writeTextToFile(filePath: string, content: string): Promise<void
   });
 }
 
+export async function cloneRepo(installationAcccessToken: string, repositoryFullName: string, repoPath: string): Promise<void> {
+  const cloneUrl = `https://x-access-token:${installationAcccessToken}@github.com/${repositoryFullName}.git`;
+  const command = `git clone ${cloneUrl} ${repoPath} --bare`
+  return new Promise((resolve, reject) => {
+    exec(command, (error) => {
+      if (error) {
+        reject(error);
+      } else {
+        resolve();
+      }
+    });
+  }) 
+}
+
+export function runInfisicalScanOnRepo(repoPath: string, outputPath: string): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const command = `cd ${repoPath} && infisical scan --exit-code=77 -r "${outputPath}"`;
+    exec(command, (error) => {
+      if (error && error.code != 77) {
+        reject(error);
+      } else {
+        resolve();
+      }
+    });
+  });
+}
+
 export function runInfisicalScan(inputPath: string, outputPath: string): Promise<void> {
   return new Promise((resolve, reject) => {
     const command = `cat "${inputPath}" | infisical scan --exit-code=77 --pipe -r "${outputPath}"`;
@@ -96,30 +139,4 @@ export function convertKeysToLowercase<T>(obj: T): T {
   }
 
   return convertedObj;
-}
-
-export async function getCommits(octokit: Octokit, owner: string, repo: string) {
-  let commits: { sha: string }[] = [];
-  let page = 1;
-  while (true) {
-    const response = await octokit.repos.listCommits({
-      owner,
-      repo,
-      per_page: 100,
-      page,
-    });
-
-    commits = commits.concat(response.data);
-    if (response.data.length == 0) break;
-    page++;
-  }
-  return commits;
-}
-
-export async function getFilesFromCommit(octokit: any, owner: string, repo: string, sha: string) {
-  const response = await octokit.repos.getCommit({
-    owner,
-    repo,
-    ref: sha,
-  });
 }

backend/src/queues/secret-scanning/githubScanFullRepository.ts

@@ -1,201 +1,103 @@
-// import Queue, { Job } from "bull";
+import Queue, { Job } from "bull";
-// import { ProbotOctokit } from "probot"
+import { ProbotOctokit } from "probot"
-// import { Commit, Committer, Repository } from "@octokit/webhooks-types";
+import TelemetryService from "../../services/TelemetryService";
-// import TelemetryService from "../../services/TelemetryService";
+import { sendMail } from "../../helpers";
-// import { sendMail } from "../../helpers";
+import GitRisks from "../../ee/models/gitRisks";
-// import GitRisks from "../../ee/models/gitRisks";
+import { MembershipOrg, User } from "../../models";
-// import { MembershipOrg, User } from "../../models";
+import { ADMIN, OWNER } from "../../variables";
-// import { OWNER, ADMIN } from "../../variables";
+import { convertKeysToLowercase, scanFullRepoContentAndGetFindings } from "../../ee/services/GithubSecretScanning/helper";
-// import { convertKeysToLowercase, getFilesFromCommit, scanContentAndGetFindings } from "../../ee/services/GithubSecretScanning/helper";
+import { getSecretScanningGitAppId, getSecretScanningPrivateKey } from "../../config";
-// import { getSecretScanningGitAppId, getSecretScanningPrivateKey } from "../../config";
+import { SecretMatch } from "../../ee/services/GithubSecretScanning/types";
 
-// const githubFullRepositoryScan = new Queue('github-historical-secret-scanning', 'redis://redis:6379');
+export const githubFullRepositorySecretScan = new Queue("github-full-repository-secret-scanning", "redis://redis:6379");
 
-// type TScanFullRepositoryDetails = {
+type TScanPushEventQueueDetails = {
-//   organizationId: string,
+  organizationId: string,
-//   repositories: {
+  installationId: number, 
-//     id: number;
+  repository: {
-//     node_id: string;
+    id: number,
-//     name: string;
+    fullName: string,
-//     full_name: string;
+  },
-//     private: boolean;
+}
-//   }[] | undefined
-//   installationId: number
-// }
 
-// type SecretMatch = {
+githubFullRepositorySecretScan.process(async (job: Job, done: Queue.DoneCallback) => {
-//   Description: string;
+  const { organizationId, repository, installationId }: TScanPushEventQueueDetails = job.data
-//   StartLine: number;
+  try {
-//   EndLine: number;
+    const octokit = new ProbotOctokit({
-//   StartColumn: number;
+        auth: {
-//   EndColumn: number;
+        appId: await getSecretScanningGitAppId(),
-//   Match: string;
+        privateKey: await getSecretScanningPrivateKey(),
-//   Secret: string;
+        installationId: installationId
-//   File: string;
+        },
-//   SymlinkFile: string;
+    });
-//   Commit: string;
+    const findings : SecretMatch[] = await scanFullRepoContentAndGetFindings(octokit, installationId, repository.fullName)
-//   Entropy: number;
+    for (const finding of findings) {
-//   Author: string;
+      await GitRisks.findOneAndUpdate({ fingerprint: finding.Fingerprint}, 
-//   Email: string;
+        {
-//   Date: string;
+        ...convertKeysToLowercase(finding),
-//   Message: string;
+        installationId: installationId,
-//   Tags: string[];
+        organization: organizationId,
-//   RuleID: string;
+        repositoryFullName: repository.fullName,
-//   Fingerprint: string;
+        repositoryId: repository.id
-//   FingerPrintWithoutCommitId: string
+      }, {
-// };
+        upsert: true
+      }).lean()
+    }
 
-// type Helllo = {
+    // get emails of admins
-//   url: string;
+    const adminsOfWork = await MembershipOrg.find({
-//   sha: string;
+      organization: organizationId,
-//   node_id: string;
+      $or: [
-//   html_url: string;
+        { role: OWNER },
-//   comments_url: string;
+        { role: ADMIN }
-//   commit: {
+      ]
-//     url: string;
+    }).lean()
-//     author: {
-//       name?: string | undefined;
-//       email?: string | undefined;
-//       date?: string | undefined;
-//     } | null;
-//     verification?: {
-//     } | undefined;
-//   };
-//   files?: {}[] | undefined;
-// }[]
 
+    const userEmails = await User.find({
+      _id: {
+        $in: [adminsOfWork.map(orgMembership => orgMembership.user)]
+      }
+    }).select("email").lean()
 
-// githubFullRepositoryScan.process(async (job: Job, done: Queue.DoneCallback) => {
+    const usersToNotify = userEmails.map(userObject => userObject.email)
-//   const { organizationId, repositories, installationId }: TScanFullRepositoryDetails = job.data
-//   const repositoryFullNamesList = repositories ? repositories.map(repoDetails => repoDetails.full_name) : []
-//   const octokit = new ProbotOctokit({
-//     auth: {
-//       appId: await getSecretScanningGitAppId(),
-//       privateKey: await getSecretScanningPrivateKey(),
-//       installationId: installationId
-//     },
-//   });
 
-//   for (const repositoryFullName of repositoryFullNamesList) {
+    if (findings.length) {
-//     const [owner, repo] = repositoryFullName.split("/");
+      await sendMail({
+        template: "historicalSecretLeakIncident.handlebars",
+        subjectLine: `Incident alert: leaked secrets found in Github repository ${repository.fullName}`,
+        recipients: usersToNotify,
+        substitutions: {
+          numberOfSecrets: findings.length,
+        }
+      });
+    }
 
-//     let page = 1;
+    const postHogClient = await TelemetryService.getPostHogClient();
-//     while (true) {
+    if (postHogClient) {
-//       // octokit.repos.getco
+      postHogClient.capture({
-//       const { data } = await octokit.repos.listCommits({
+        event: "historical cloud secret scan",
-//         owner,
+        distinctId: repository.fullName,
-//         repo,
+        properties: {
-//         per_page: 100,
+          numberOfRisksFound: findings.length,
-//         page
+        }
-//       });
+      });
-
+    }
-
+    done(null, findings)
-//       await getFilesFromCommit(octokit, owner, repo, "646b386605177ed0a2cc0a596eeee0cf57666342")
+  } catch (error) {
-
+    done(new Error(`gitHubHistoricalScanning.process: an error occurred ${error}`), null)
-
+  }
-//       page++;
+})
-//     }
-
-//   }
-
-//   done()
-
-//   // const allFindingsByFingerprint: { [key: string]: SecretMatch; } = {}
-//   // for (const commit of commits) {
-//   //   for (const filepath of [...commit.added, ...commit.modified]) {
-//   //     try {
-//   //       const fileContentsResponse = await octokit.repos.getContent({
-//   //         owner,
-//   //         repo,
-//   //         path: filepath,
-//   //       });
-
-//   //       const data: any = fileContentsResponse.data;
-//   //       const fileContent = Buffer.from(data.content, "base64").toString();
-
-//   //       const findings = await scanContentAndGetFindings(`\n${fileContent}`) // extra line to count lines correctly
-
-//   //       for (const finding of findings) {
-//   //         const fingerPrintWithCommitId = `${commit.id}:${filepath}:${finding.RuleID}:${finding.StartLine}`
-//   //         const fingerPrintWithoutCommitId = `${filepath}:${finding.RuleID}:${finding.StartLine}`
-//   //         finding.Fingerprint = fingerPrintWithCommitId
-//   //         finding.FingerPrintWithoutCommitId = fingerPrintWithoutCommitId
-//   //         finding.Commit = commit.id
-//   //         finding.File = filepath
-//   //         finding.Author = commit.author.name
-//   //         finding.Email = commit?.author?.email ? commit?.author?.email : ""
-
-//   //         allFindingsByFingerprint[fingerPrintWithCommitId] = finding
-//   //       }
-
-//   //     } catch (error) {
-//   //       done(new Error(`gitHubHistoricalScanning.process: unable to fetch content for [filepath=${filepath}] because [error=${error}]`), null)
-//   //     }
-//   //   }
-//   // }
-
-//   // // change to update
-//   // for (const key in allFindingsByFingerprint) {
-//   //   await GitRisks.findOneAndUpdate({ fingerprint: allFindingsByFingerprint[key].Fingerprint },
-//   //     {
-//   //       ...convertKeysToLowercase(allFindingsByFingerprint[key]),
-//   //       installationId: installationId,
-//   //       organization: organizationId,
-//   //       repositoryFullName: repository.fullName,
-//   //       repositoryId: repository.id
-//   //     }, {
-//   //     upsert: true
-//   //   }).lean()
-//   // }
-//   // // get emails of admins
-//   // const adminsOfWork = await MembershipOrg.find({
-//   //   organization: organizationId,
-//   //   $or: [
-//   //     { role: OWNER },
-//   //     { role: ADMIN }
-//   //   ]
-//   // }).lean()
-
-//   // const userEmails = await User.find({
-//   //   _id: {
-//   //     $in: [adminsOfWork.map(orgMembership => orgMembership.user)]
-//   //   }
-//   // }).select("email").lean()
-
-//   // const adminOrOwnerEmails = userEmails.map(userObject => userObject.email)
-
-//   // const usersToNotify = pusher?.email ? [pusher.email, ...adminOrOwnerEmails] : [...adminOrOwnerEmails]
-//   // if (Object.keys(allFindingsByFingerprint).length) {
-//   //   await sendMail({
-//   //     template: "secretLeakIncident.handlebars",
-//   //     subjectLine: `Incident alert: leaked secrets found in Github repository ${repository.fullName}`,
-//   //     recipients: usersToNotify,
-//   //     substitutions: {
-//   //       numberOfSecrets: Object.keys(allFindingsByFingerprint).length,
-//   //       pusher_email: pusher.email,
-//   //       pusher_name: pusher.name
-//   //     }
-//   //   });
-//   // }
-
-//   // const postHogClient = await TelemetryService.getPostHogClient();
-//   // if (postHogClient) {
-//   //   postHogClient.capture({
-//   //     event: "cloud secret scan",
-//   //     distinctId: pusher.email,
-//   //     properties: {
-//   //       numberOfCommitsScanned: commits.length,
-//   //       numberOfRisksFound: Object.keys(allFindingsByFingerprint).length,
-//   //     }
-//   //   });
-//   // }
-
-//   // done(null, allFindingsByFingerprint)
-
-// })
-
-// export const scanGithubFullRepositoryForSecretLeaks = (scanFullRepositoryDetails: TScanFullRepositoryDetails) => {
-//   console.log("full repo scan started")
-//   githubFullRepositoryScan.add(scanFullRepositoryDetails)
-// }
 
+export const scanGithubFullRepoForSecretLeaks = (pushEventPayload: TScanPushEventQueueDetails) => {
+  githubFullRepositorySecretScan.add(pushEventPayload, {
+    attempts: 3,
+    backoff: {
+      type: "exponential",
+      delay: 5000
+    },
+    removeOnComplete: true,
+    removeOnFail: {
+      count: 20 // keep the most recent 20 jobs
+    }
+  })
+}

backend/src/templates/historicalSecretLeakIncident.handlebars

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="x-ua-compatible" content="ie=edge">
+  <title>Incident alert: secrets potentially leaked</title>
+</head>
+
+<body>
+  <h3>Infisical has uncovered {{numberOfSecrets}} secret(s) from historical commits to your repo</h3>
+  <p><a href="https://app.infisical.com/secret-scanning"><strong>View leaked secrets</strong></a></p>
+
+  <p>If these are production secrets, please rotate them immediately.</p>
+
+  <p>Once you have taken action, be sure to update the status of the risk in your <a
+      href="https://app.infisical.com/">Infisical
+      dashboard</a>.</p>
+</body>
+
+</html>

frontend/src/hooks/api/integrations/queries.tsx

@@ -46,8 +46,8 @@ export const useCreateIntegration = () => {
       integrationAuthId: string;
       isActive: boolean;
       secretPath: string;
-      app?: string | null;
+      app?: string;
-      appId?: string | null;
+      appId?: string;
       sourceEnvironment: string;
       targetEnvironment: string | null;
       targetEnvironmentId: string | null;

frontend/src/pages/integrations/aws-parameter-store/create.tsx

@@ -97,8 +97,6 @@ export default function AWSParameterStoreCreateIntegrationPage() {
       await mutateAsync({
         integrationAuthId: integrationAuth?._id,
         isActive: true,
-        app: null,
-        appId: null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/aws-secret-manager/create.tsx

@@ -97,7 +97,6 @@ export default function AWSSecretManagerCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetSecretName.trim(),
-        appId: null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/azure-key-vault/create.tsx

@@ -60,7 +60,6 @@ export default function AzureKeyVaultCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: vaultBaseUrl,
-        appId: null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/circleci/create.tsx

@@ -66,9 +66,7 @@ export default function CircleCICreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId:
+        appId: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)?.appId,
-          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
-            ?.appId ?? null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/cloud-66/create.tsx

@@ -64,9 +64,7 @@ export default function Cloud66CreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId:
+        appId: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)?.appId,
-          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
-            ?.appId ?? null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/codefresh/create.tsx

@@ -64,9 +64,7 @@ export default function CodefreshCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId:
+        appId: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)?.appId,
-          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
-            ?.appId ?? null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/digital-ocean-app-platform/create.tsx

@@ -64,9 +64,7 @@ export default function DigitalOceanAppPlatformCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId:
+        appId: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)?.appId,
-          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
-            ?.appId ?? null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/flyio/create.tsx

@@ -67,7 +67,6 @@ export default function FlyioCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId: null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/gcp-secret-manager/create.tsx

@@ -64,7 +64,7 @@ export default function GCPSecretManagerCreateIntegrationPage() {
       await mutateAsync({
         integrationAuthId: integrationAuth?._id,
         isActive: true,
-        app: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.appId === targetAppId)?.name ?? null,
+        app: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.appId === targetAppId)?.name,
         appId: targetAppId,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,

frontend/src/pages/integrations/gcp-secret-manager/pat/create.tsx

@@ -60,7 +60,7 @@ export default function GCPSecretManagerCreateIntegrationPage() {
       await mutateAsync({
         integrationAuthId: integrationAuth?._id,
         isActive: true,
-        app: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.appId === targetAppId)?.name ?? null,
+        app: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.appId === targetAppId)?.name,
         appId: targetAppId,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,

frontend/src/pages/integrations/github/create.tsx

@@ -71,7 +71,6 @@ export default function GitHubCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp.name,
-        appId: null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/gitlab/create.tsx

@@ -94,10 +94,7 @@ export default function GitLabCreateIntegrationPage() {
       await mutateAsync({
         integrationAuthId: integrationAuth?._id,
         isActive: true,
-        app:
+        app: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.appId === targetAppId)?.name,
-          integrationAuthApps?.find(
-            (integrationAuthApp) => integrationAuthApp.appId === targetAppId
-          )?.name ?? null,
         appId: targetAppId,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: targetEnvironment === "" ? "*" : targetEnvironment,

frontend/src/pages/integrations/hashicorp-vault/create.tsx

@@ -65,7 +65,6 @@ export default function HashiCorpVaultCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: vaultEnginePath,
-        appId: null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/heroku/create.tsx

@@ -65,7 +65,6 @@ export default function HerokuCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId: null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/laravel-forge/create.tsx

@@ -64,9 +64,7 @@ export default function LaravelForgeCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId:
+        appId: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)?.appId,
-          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
-            ?.appId ?? null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/netlify/create.tsx

@@ -73,9 +73,7 @@ export default function NetlifyCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId:
+        appId: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)?.appId,
-          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
-            ?.appId ?? null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment,
         targetEnvironmentId: null,

frontend/src/pages/integrations/northflank/create.tsx

@@ -85,9 +85,7 @@ export default function NorthflankCreateIntegrationPage() {
       await mutateAsync({
         integrationAuthId: integrationAuth?._id,
         isActive: true,
-        app: integrationAuthApps?.find(
+        app: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.appId === targetAppId)?.name,
-            (integrationAuthApp) => integrationAuthApp.appId === targetAppId
-          )?.name ?? null,
         appId: targetAppId,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,

frontend/src/pages/integrations/render/create.tsx

@@ -64,9 +64,7 @@ export default function RenderCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId:
+        appId: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)?.appId,
-          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
-            ?.appId ?? null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/supabase/create.tsx

@@ -65,9 +65,7 @@ export default function SupabaseCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId:
+        appId: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)?.appId,
-          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
-            ?.appId ?? null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/teamcity/create.tsx

@@ -74,7 +74,7 @@ export default function TeamCityCreateIntegrationPage() {
       await mutateAsync({
         integrationAuthId: integrationAuth?._id,
         isActive: true,
-        app: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.appId === targetAppId)?.name ?? null,
+        app: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.appId === targetAppId)?.name,
         appId: targetAppId,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: targetEnvironment ? targetEnvironment.name : null,

frontend/src/pages/integrations/terraform-cloud/create.tsx

@@ -76,9 +76,7 @@ export default function TerraformCloudCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId:
+        appId: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)?.appId,
-          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
-            ?.appId ?? null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/travisci/create.tsx

@@ -64,9 +64,7 @@ export default function TravisCICreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId:
+        appId: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)?.appId,
-          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
-            ?.appId ?? null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,

frontend/src/pages/integrations/windmill/create.tsx

@@ -65,9 +65,7 @@ export default function WindmillCreateIntegrationPage() {
         integrationAuthId: integrationAuth?._id,
         isActive: true,
         app: targetApp,
-        appId:
+        appId: integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)?.appId,
-          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
-            ?.appId ?? null,
         sourceEnvironment: selectedSourceEnvironment,
         targetEnvironment: null,
         targetEnvironmentId: null,