From 67d5f52aca9399b0c195faa22efc5cba705a8592 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Thu, 13 Jul 2023 19:56:49 -0400 Subject: [PATCH] extract correct params after git app install --- frontend/src/pages/secret-scanning/index.tsx | 8 ++++---- secret-engine/src/index.ts | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/pages/secret-scanning/index.tsx b/frontend/src/pages/secret-scanning/index.tsx index e5ca8ed89..867f35a39 100644 --- a/frontend/src/pages/secret-scanning/index.tsx +++ b/frontend/src/pages/secret-scanning/index.tsx @@ -10,7 +10,7 @@ import { RiskStatus } from "../api/secret-scanning/updateRiskStatus"; export default function SecretScanning() { const router = useRouter() - const { state, installationId} = router.query + const queryParams = router.query const [integrationEnabled, setIntegrationStatus] = useState(false) const [gitRisks, setGitRisks] = useState([]); const [selectedRiskStatus, setSelectedRiskStatus] = useState(""); @@ -28,9 +28,9 @@ export default function SecretScanning() { } const linkInstallation = async () => { - if (typeof state === "string" && typeof installationId === "string"){ + if (typeof queryParams.state === "string" && typeof queryParams.installation_id === "string"){ try { - await linkGitAppInstallationWithOrganization(installationId as string, state as string) + await linkGitAppInstallationWithOrganization(queryParams.installation_id as string, queryParams.state as string) console.log("installation verification complete") }catch (e){ console.log("app installation is stale, start new session", e) @@ -46,7 +46,7 @@ export default function SecretScanning() { fetchInstallationStatus() linkInstallation() fetchRisks() - },[state, installationId]) + },[queryParams.state, queryParams.installation_id]) const generateNewIntegrationSession = async () => { const session = await createNewIntegrationSession(String(localStorage.getItem("orgData.id"))) diff --git a/secret-engine/src/index.ts b/secret-engine/src/index.ts index 09dfedd44..00c7d2eb0 100644 --- a/secret-engine/src/index.ts +++ b/secret-engine/src/index.ts @@ -61,6 +61,7 @@ export = async (app: Probot) => { const { commits, repository, installation, pusher } = payload; const [owner, repo] = repository.full_name.split('/'); + console.log(payload) const installationLinkToOrgExists = await GitAppOrganizationInstallation.findOne({ installationId: installation.id }).lean() if (!installationLinkToOrgExists) { return