extract correct params after git app install

This commit is contained in:
Maidul Islam
2023-07-13 19:56:49 -04:00
parent f022f6d3ee
commit 67d5f52aca
2 changed files with 5 additions and 4 deletions

View File

@@ -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<GitRisks[]>([]);
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")))

View File

@@ -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