From f9b931ba6a3d6e35d9c31340fe2c97a5dadefc17 Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Thu, 10 Aug 2023 01:57:45 +0100 Subject: [PATCH 1/2] Add OAuth Reports --- package-lock.json | 8 ++++---- .../console/(migration-wizard)/resource-form.svelte | 9 ++++++++- src/routes/console/(migration-wizard)/wizard.svelte | 2 +- .../settings/migrations/(import)/step1.svelte | 5 +---- .../settings/migrations/(import)/wizard.svelte | 7 ++++++- .../project-[project]/settings/migrations/+page.ts | 2 +- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8276179cd8..1830cd1b81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "name": "@appwrite/console", "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/console": "^0.1.1", + "@appwrite.io/console": "github:PineappleIOnic/sdk-for-console#feat-migrations", "@appwrite.io/pink": "^0.0.6-rc.14", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.44.2", @@ -158,9 +158,9 @@ "integrity": "sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==" }, "node_modules/@appwrite.io/console": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.1.1.tgz", - "integrity": "sha512-7aBh/8QxKmaMsP9tVJgNsrOBstuikKasSUoSyRNxblK3J/OdPXnQRInZELT9uaK+vqjZaCYspA3B+5UH+DZ9Dw==", + "version": "0.1.0", + "resolved": "git+ssh://git@github.com/PineappleIOnic/sdk-for-console.git#87ca5652bdc887fd61e4fd7b51dfed6f3163dd03", + "license": "BSD-3-Clause", "dependencies": { "cross-fetch": "3.1.5", "isomorphic-form-data": "2.0.0" diff --git a/src/routes/console/(migration-wizard)/resource-form.svelte b/src/routes/console/(migration-wizard)/resource-form.svelte index 07c7c5ec93..6956aba237 100644 --- a/src/routes/console/(migration-wizard)/resource-form.svelte +++ b/src/routes/console/(migration-wizard)/resource-form.svelte @@ -15,6 +15,7 @@ resourcesToMigrationForm } from '$lib/stores/migration'; import { addNotification } from '$lib/stores/notifications'; + import { wizard } from '$lib/stores/wizard'; export let formData: ReturnType; export let provider: ReturnType; @@ -100,6 +101,12 @@ case 'firebase': { if ($provider.projectId) { // OAuth + const res = await sdk.forProject.migrations.getFirebaseReportOAuth( + providerResources.firebase, + $provider.projectId + ); + + report = res; } else if ($provider.serviceAccount) { // Manual auth const res = await sdk.forProject.migrations.getFirebaseReport( @@ -139,7 +146,7 @@ $: resources = providerResources[$provider.provider]; - // $: wizard.setNextDisabled(!report); + $: wizard.setNextDisabled(!report);
diff --git a/src/routes/console/(migration-wizard)/wizard.svelte b/src/routes/console/(migration-wizard)/wizard.svelte index 397fae0e5b..73697d657e 100644 --- a/src/routes/console/(migration-wizard)/wizard.svelte +++ b/src/routes/console/(migration-wizard)/wizard.svelte @@ -20,7 +20,7 @@ const resources = migrationFormToResources($formData); if ($provider.provider !== 'appwrite') return; - await getSdkForProject($selectedProject).migrations.migrateAppwrite( + await getSdkForProject($selectedProject).migrations.createAppwriteMigration( resources, $provider.endpoint, $provider.projectID, 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 2800ff2498..46d6ca3045 100644 --- a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte +++ b/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte @@ -135,10 +135,7 @@ }))} />

- Signed in - +

{/if} {:else if $provider.provider === 'supabase'} diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte index 2003dbb64d..2c6486bd7b 100644 --- a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte +++ b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte @@ -49,9 +49,14 @@ break; } case 'firebase': { - console.log('firebase', $provider.serviceAccount); if ($provider.projectId) { // OAuth + const res = await sdk.forProject.migrations.createFirebaseOAuthMigration( + resources, + $provider.projectId + ); + + console.log('Firebase', res); } else if ($provider.serviceAccount) { // Manual auth const res = await sdk.forProject.migrations.createFirebaseMigration( diff --git a/src/routes/console/project-[project]/settings/migrations/+page.ts b/src/routes/console/project-[project]/settings/migrations/+page.ts index cad26bcbf2..89af9aa914 100644 --- a/src/routes/console/project-[project]/settings/migrations/+page.ts +++ b/src/routes/console/project-[project]/settings/migrations/+page.ts @@ -6,7 +6,7 @@ async function getFirebaseProjects() { const res = await sdk.forProject.migrations.listFirebaseProjects(); return res.projects; } catch (e) { - if (e.code === 401) { + if (e.type === 'user_identity_not_found') { return []; } else { throw e; From 0b4aa7876e84bdf198e2d2307f0c56ba65207ac3 Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Thu, 10 Aug 2023 14:05:40 +0100 Subject: [PATCH 2/2] Update src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte Co-authored-by: Christy Jacob --- .../project-[project]/settings/migrations/(import)/wizard.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte index 9ed7d2eb24..f2b0e5eefb 100644 --- a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte +++ b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte @@ -56,7 +56,6 @@ $provider.projectId ); - console.log('Firebase', res); } else if ($provider.serviceAccount) { // Manual auth await sdk.forProject.migrations.createFirebaseMigration(