From 93246f80c4155063380f53e883898635e6cc40c3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Sat, 27 Aug 2022 07:46:54 +0000
Subject: [PATCH] fix: pr deployments + remove public gits

---
 apps/api/src/routes/api/v1/applications/handlers.ts | 1 +
 apps/api/src/routes/api/v1/sources/handlers.ts      | 2 +-
 apps/api/src/routes/webhooks/github/handlers.ts     | 2 +-
 apps/ui/src/routes/applications/[id]/_Secret.svelte | 5 +++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts
index 26b0d2bb9..cb0bf38fe 100644
--- a/apps/api/src/routes/api/v1/applications/handlers.ts
+++ b/apps/api/src/routes/api/v1/applications/handlers.ts
@@ -451,6 +451,7 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
                 data: {
                     id: buildId,
                     applicationId: id,
+                    sourceBranch: branch,
                     branch: application.branch,
                     pullmergeRequestId,
                     forceRebuild,
diff --git a/apps/api/src/routes/api/v1/sources/handlers.ts b/apps/api/src/routes/api/v1/sources/handlers.ts
index 8a1c19987..f363b6ff9 100644
--- a/apps/api/src/routes/api/v1/sources/handlers.ts
+++ b/apps/api/src/routes/api/v1/sources/handlers.ts
@@ -9,7 +9,7 @@ export async function listSources(request: FastifyRequest) {
     try {
         const teamId = request.user?.teamId;
         const sources = await prisma.gitSource.findMany({
-            where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } },
+            where: { teams: { some: { id: teamId === '0' ? undefined : teamId } }, githubApp: { gitSource: { forPublic: false } } },
             include: { teams: true, githubApp: true, gitlabApp: true }
         });
         return {
diff --git a/apps/api/src/routes/webhooks/github/handlers.ts b/apps/api/src/routes/webhooks/github/handlers.ts
index 275a72979..106311c5c 100644
--- a/apps/api/src/routes/webhooks/github/handlers.ts
+++ b/apps/api/src/routes/webhooks/github/handlers.ts
@@ -146,7 +146,7 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promi
                     message: 'Queued. Thank you!'
                 };
             } else if (githubEvent === 'pull_request') {
-                const pullmergeRequestId = body.number;
+                const pullmergeRequestId = body.number.toString();
                 const pullmergeRequestAction = body.action;
                 const sourceBranch = body.pull_request.head.ref.includes('/') ? body.pull_request.head.ref.split('/')[2] : body.pull_request.head.ref;
                 if (!allowedActions.includes(pullmergeRequestAction)) {
diff --git a/apps/ui/src/routes/applications/[id]/_Secret.svelte b/apps/ui/src/routes/applications/[id]/_Secret.svelte
index 12d69db19..780dea726 100644
--- a/apps/ui/src/routes/applications/[id]/_Secret.svelte
+++ b/apps/ui/src/routes/applications/[id]/_Secret.svelte
@@ -57,11 +57,12 @@
 					message: 'Secret added.',
 					type: 'success'
 				});
-			}
-			addToast({
+			} else {
+				addToast({
 				message: 'Secret updated.',
 				type: 'success'
 			});
+			}
 			dispatch('refresh');
 		} catch (error) {
 			console.log(error);