Skip to content

Add OAuth Reports and Fix Firebase SDK Calls #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christyjacob4 merged 3 commits into from
Aug 10, 2023
Merged

Add OAuth Reports and Fix Firebase SDK Calls #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9b931b
Add OAuth Reports
PineappleIOnic Aug 10, 2023
5e58cd5
Merge branch 'command-center-and-migrations' of https://github.com/ap…
PineappleIOnic Aug 10, 2023
0b4aa78
Update src/routes/console/project-[project]/settings/migrations/(impo…
PineappleIOnic Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/routes/console/(migration-wizard)/resource-form.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<typeof createMigrationFormStore>;
export let provider: ReturnType<typeof createMigrationProviderStore>;
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -139,7 +146,7 @@

$: resources = providerResources[$provider.provider];

// $: wizard.setNextDisabled(!report);
$: wizard.setNextDisabled(!report);
</script>

<div class="box" style:border-radius="0.5rem">
Expand Down
2 changes: 1 addition & 1 deletion src/routes/console/(migration-wizard)/wizard.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 1 addition & 4 deletions src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,7 @@
}))} />
</FormList>
<p class="u-text-center u-margin-block-start-24">
Signed in
Copy link
Contributor

@christyjacob4 christyjacob4 Aug 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about this text ?

<button class="u-bold" on:click|preventDefault={deauthorizeGoogle}>
Sign Out?
</button>
<button class="u-bold" on:click|preventDefault={deauthorizeGoogle}>Sign Out</button>
</p>
{/if}
{:else if $provider.provider === 'supabase'}
Expand Down
5 changes: 5 additions & 0 deletions src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@
case 'firebase': {
if ($provider.projectId) {
// OAuth
const res = await sdk.forProject.migrations.createFirebaseOAuthMigration(
resources,
$provider.projectId
);

} else if ($provider.serviceAccount) {
// Manual auth
await sdk.forProject.migrations.createFirebaseMigration(
Expand Down
2 changes: 1 addition & 1 deletion src/routes/console/project-[project]/settings/migrations/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down