From 92a2be06dc22ebfcfc3500891bb5ba68ffa7145d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sun, 31 Aug 2025 13:59:22 +0530
Subject: [PATCH] cleanup.

---
 src/routes/(authenticated)/git/+layout.ts     | 22 ++++++++++++++++---
 .../git/authorize-contributor/+page.svelte    | 14 ++++++------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/routes/(authenticated)/git/+layout.ts b/src/routes/(authenticated)/git/+layout.ts
index efd98b286..cd35d7478 100644
--- a/src/routes/(authenticated)/git/+layout.ts
+++ b/src/routes/(authenticated)/git/+layout.ts
@@ -2,10 +2,26 @@ import { redirect } from '@sveltejs/kit';
 import { base } from '$app/paths';
 import type { LayoutLoad } from './$types';
 
-export const load: LayoutLoad = async ({ parent }) => {
+export const load: LayoutLoad = async ({ parent, url }) => {
     const { account } = await parent();
 
-    if (!account) {
-        redirect(303, base);
+    const projectId = url.searchParams.get('projectId');
+    const repositoryId = url.searchParams.get('repositoryId');
+    const installationId = url.searchParams.get('installationId');
+    const providerPullRequestId = url.searchParams.get('providerPullRequestId');
+
+    if (!installationId || !repositoryId || !providerPullRequestId) {
+        redirect(303, `${base}`);
     }
+
+    if (!account) {
+        redirect(303, `${base}`);
+    }
+
+    return {
+        projectId,
+        repositoryId,
+        installationId,
+        providerPullRequestId
+    };
 };
diff --git a/src/routes/(authenticated)/git/authorize-contributor/+page.svelte b/src/routes/(authenticated)/git/authorize-contributor/+page.svelte
index 9a5d8e99e..23c1b34d5 100644
--- a/src/routes/(authenticated)/git/authorize-contributor/+page.svelte
+++ b/src/routes/(authenticated)/git/authorize-contributor/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-    import { page } from '$app/state';
     import { app } from '$lib/stores/app';
     import AppwriteLogoDark from '$lib/images/appwrite-logo-dark.svg';
     import AppwriteLogoLight from '$lib/images/appwrite-logo-light.svg';
@@ -7,6 +6,8 @@
     import { onMount } from 'svelte';
     import { getApiEndpoint } from '$lib/stores/sdk';
 
+    export let data;
+
     const endpoint = getApiEndpoint();
     const client = new Client();
     const vcs = new Vcs(client);
@@ -15,17 +16,16 @@
     let repositoryId: string;
     let providerPullRequestId: string;
 
-    let loading = false;
     let error = '';
     let success = '';
+    let loading = false;
 
     onMount(async () => {
-        const projectId = page.url.searchParams.get('projectId');
-        client.setEndpoint(endpoint).setProject(projectId).setMode('admin');
+        repositoryId = data.repositoryId;
+        installationId = data.installationId;
+        providerPullRequestId = data.providerPullRequestId;
 
-        installationId = page.url.searchParams.get('installationId');
-        repositoryId = page.url.searchParams.get('repositoryId');
-        providerPullRequestId = page.url.searchParams.get('providerPullRequestId') + '';
+        client.setEndpoint(endpoint).setProject(data.projectId).setMode('admin');
     });
 
     async function approveDeployment() {