From 0f0755d719139296c8c6171aaa159a3470aed774 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Wed, 30 Aug 2023 14:08:56 -0400 Subject: [PATCH 1/2] Fix calls to internal github authorize relying on public scope --- src/lib/wizards/functions/components/repositories.svelte | 3 ++- src/lib/wizards/functions/steps/createRepository.svelte | 3 ++- .../project-[project]/settings/GitInstallationModal.svelte | 3 ++- .../settings/migrations/(import)/step1.svelte | 3 ++- .../project-[project]/settings/updateInstallations.svelte | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/lib/wizards/functions/components/repositories.svelte b/src/lib/wizards/functions/components/repositories.svelte index 88a4c05c0b..a1fcd6c134 100644 --- a/src/lib/wizards/functions/components/repositories.svelte +++ b/src/lib/wizards/functions/components/repositories.svelte @@ -62,9 +62,10 @@ }); } const target = new URL(`${sdk.forProject.client.config.endpoint}/vcs/github/authorize`); - target.searchParams.set('projectId', $page.params.project); + target.searchParams.set('project', $page.params.project); target.searchParams.set('success', redirect.toString()); target.searchParams.set('failure', redirect.toString()); + target.searchParams.set('mode', 'admin'); return target; } diff --git a/src/lib/wizards/functions/steps/createRepository.svelte b/src/lib/wizards/functions/steps/createRepository.svelte index ac4f05fb40..2b8247a321 100644 --- a/src/lib/wizards/functions/steps/createRepository.svelte +++ b/src/lib/wizards/functions/steps/createRepository.svelte @@ -61,9 +61,10 @@ }); } const target = new URL(`${sdk.forProject.client.config.endpoint}/vcs/github/authorize`); - target.searchParams.set('projectId', $page.params.project); + target.searchParams.set('project', $page.params.project); target.searchParams.set('success', redirect.toString()); target.searchParams.set('failure', redirect.toString()); + target.searchParams.set('mode', 'admin'); return target; } diff --git a/src/routes/console/project-[project]/settings/GitInstallationModal.svelte b/src/routes/console/project-[project]/settings/GitInstallationModal.svelte index ced76dbe25..8fc2e5c3e8 100644 --- a/src/routes/console/project-[project]/settings/GitInstallationModal.svelte +++ b/src/routes/console/project-[project]/settings/GitInstallationModal.svelte @@ -11,9 +11,10 @@ const redirect = new URL($page.url); redirect.searchParams.append('alert', 'installation-created'); const target = new URL(`${sdk.forProject.client.config.endpoint}/vcs/github/authorize`); - target.searchParams.set('projectId', $page.params.project); + target.searchParams.set('project', $page.params.project); target.searchParams.set('success', redirect.toString()); target.searchParams.set('failure', redirect.toString()); + target.searchParams.set('mode', 'admin'); goto(target); } diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte b/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte index b881ba155c..ca28f9d993 100644 --- a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte +++ b/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte @@ -29,7 +29,8 @@ // `${sdk.forProject.client.config.endpoint}/migrations/firebase/connect` // ); // target.searchParams.set('redirect', redirect.toString()); - // target.searchParams.set('projectId', $page.params.project); + // target.searchParams.set('project', $page.params.project); + // target.searchParams.set('mode', 'admin'); // return target; // } diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte index 919377a40c..364ccdb29d 100644 --- a/src/routes/console/project-[project]/settings/updateInstallations.svelte +++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte @@ -63,9 +63,10 @@ const redirect = new URL($page.url); redirect.searchParams.append('alert', 'installation-updated'); const target = new URL(`${sdk.forProject.client.config.endpoint}/vcs/github/authorize`); - target.searchParams.set('projectId', $page.params.project); + target.searchParams.set('project', $page.params.project); target.searchParams.set('success', redirect.toString()); target.searchParams.set('failure', redirect.toString()); + target.searchParams.set('mode', 'admin'); return target?.toString(); } From a063d86858746961e6905fc9a542c494f8e1b9c5 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Wed, 30 Aug 2023 14:18:16 -0400 Subject: [PATCH 2/2] Add mode header to assistant --- src/lib/commandCenter/panels/ai.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/commandCenter/panels/ai.svelte b/src/lib/commandCenter/panels/ai.svelte index e940248165..f2887239b1 100644 --- a/src/lib/commandCenter/panels/ai.svelte +++ b/src/lib/commandCenter/panels/ai.svelte @@ -15,6 +15,7 @@ const { input, handleSubmit, completion, isLoading, complete, error } = useCompletion({ api: endpoint + '/console/assistant', headers: { + 'x-appwrite-mode': 'admin', 'content-type': 'application/json' } });