diff --git a/src/lib/components/collapsibleItem.svelte b/src/lib/components/collapsibleItem.svelte index 5caa6caf3..bbdd9e22e 100644 --- a/src/lib/components/collapsibleItem.svelte +++ b/src/lib/components/collapsibleItem.svelte @@ -1,3 +1,7 @@ + +
  • @@ -7,8 +11,14 @@ -
    +
  • + + diff --git a/src/lib/constants.ts b/src/lib/constants.ts index db195e23c..f2f483edc 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -32,7 +32,11 @@ export enum Dependencies { WEBHOOKS = 'webhooks' } -export const scopes = [ +export const scopes: { + scope: string; + description: string; + category: string; +}[] = [ { scope: 'users.read', description: "Access to read your project's users", diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts index e897255ed..64b254b00 100644 --- a/src/lib/stores/oauth-providers.ts +++ b/src/lib/stores/oauth-providers.ts @@ -26,7 +26,6 @@ const setProviders = (project: Models.Project): Provider[] => { switch (n.name.toLowerCase()) { case 'amazon': - console.log(n); docs = 'https://developer.amazon.com/apps-and-games/services-and-apis'; break; case 'apple': diff --git a/src/routes/console/project-[project]/functions/createFunction.svelte b/src/routes/console/project-[project]/functions/createFunction.svelte index e2402afb3..10d04101b 100644 --- a/src/routes/console/project-[project]/functions/createFunction.svelte +++ b/src/routes/console/project-[project]/functions/createFunction.svelte @@ -15,11 +15,9 @@ import { Dependencies } from '$lib/constants'; async function onFinish() { - console.log(2); await invalidate(Dependencies.FUNCTIONS); } async function create() { - console.log(1); try { const response = await sdkForProject.functions.create( $createFunction.id ?? 'unique()', diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index c76947b11..92681887a 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -12,7 +12,6 @@ $: projectId = $page.params.project; $: path = `/console/project-${projectId}/overview`; - $: console.log($stats.get(projectId)); let period: UsagePeriods = '30d'; let showPeriodBandwidth = false; let showPeriodRequests = false; diff --git a/src/routes/console/project-[project]/overview/keys/+page.svelte b/src/routes/console/project-[project]/overview/keys/+page.svelte index c75cc7ec9..cba2e3ed9 100644 --- a/src/routes/console/project-[project]/overview/keys/+page.svelte +++ b/src/routes/console/project-[project]/overview/keys/+page.svelte @@ -10,16 +10,21 @@ TableRowLink } from '$lib/elements/table'; import { toLocaleDateTime } from '$lib/helpers/date'; + import { wizard } from '$lib/stores/wizard'; import type { PageData } from './$types'; - import Create from './create.svelte'; + import Wizard from './wizard.svelte'; + export let data: PageData; - let show = false; + + function create() { + wizard.start(Wizard); + }
    API Keys - @@ -32,7 +37,7 @@ Name last accessed expiration date - clients + scopes {#each data.keys.keys as key} @@ -44,15 +49,17 @@ {key.accessedAt ? toLocaleDateTime(key.accessedAt) : 'never'} - {toLocaleDateTime(key.$updatedAt)} + {key.expire ? toLocaleDateTime(key.expire) : 'never'} + + + {key.scopes.length} Scopes - {/each} {:else} - (show = true)}> +

    Create your first API Key to get started

    Need a hand? Check out our documentation.

    @@ -63,5 +70,3 @@
    {/if} - - diff --git a/src/routes/console/project-[project]/overview/keys/create.svelte b/src/routes/console/project-[project]/overview/keys/create.svelte deleted file mode 100644 index dea215fe2..000000000 --- a/src/routes/console/project-[project]/overview/keys/create.svelte +++ /dev/null @@ -1,42 +0,0 @@ - - - - Create API Key - - - - - - - - - diff --git a/src/routes/console/project-[project]/overview/keys/scopes.svelte b/src/routes/console/project-[project]/overview/keys/scopes.svelte index d60f14730..da649acfb 100644 --- a/src/routes/console/project-[project]/overview/keys/scopes.svelte +++ b/src/routes/console/project-[project]/overview/keys/scopes.svelte @@ -7,6 +7,14 @@ export let scopes: string[]; + enum Category { + Authentication = 'Authentication', + Database = 'Database', + Functions = 'Functions', + Storage = 'Storage', + Other = 'Other' + } + let mounted = false; onMount(() => { @@ -28,6 +36,29 @@ } } + function categoryState(category: string, s: string[]): boolean | null { + const scopesByCategory = allScopes.filter((n) => n.category === category); + const filtered = scopesByCategory.filter((n) => s.includes(n.scope)); + if (filtered.length === 0) { + return false; + } else if (filtered.length === scopesByCategory.length) { + return true; + } else { + return null; + } + } + + function onCategoryChange( + event: Event & { currentTarget: EventTarget & HTMLInputElement }, + category: Category + ) { + allScopes.forEach((s) => { + if (s.category === category) { + activeScopes[s.scope] = event.currentTarget.checked; + } + }); + } + const activeScopes = allScopes.reduce((prev, next) => { prev[next.scope] = false; @@ -54,9 +85,21 @@
    - {#each ['Authentication', 'Database', 'Functions', 'Storage', 'Other'] as category} - - {category} + {#each [Category.Authentication, Category.Database, Category.Functions, Category.Storage, Category.Other] as category} + + + {@const checked = categoryState(category, scopes)} + onCategoryChange(e, category)} /> + {category} + + + ({allScopes.filter((n) => n.category === category && scopes.includes(n.scope)) + .length} Scopes) + {#each allScopes.filter((s) => s.category === category) as scope} + import { Wizard } from '$lib/layout'; + import { beforeNavigate, goto } from '$app/navigation'; + import { wizard } from '$lib/stores/wizard'; + import type { WizardStepsType } from '$lib/layout/wizard.svelte'; + import Step1 from './wizard/step1.svelte'; + import Step2 from './wizard/step2.svelte'; + import { key } from './wizard/store'; + import { sdkForConsole } from '$lib/stores/sdk'; + import { page } from '$app/stores'; + import { addNotification } from '$lib/stores/notifications'; + + async function onFinish() { + try { + const { $id } = await sdkForConsole.projects.createKey( + $page.params.project, + $key.name, + $key.scopes, + $key.expire ?? undefined + ); + key.reset(); + goto(`/console/project-${$page.params.project}/overview/keys/${$id}`); + } catch (error) { + addNotification({ + type: 'error', + message: error.message + }); + } + } + + beforeNavigate(() => { + wizard.hide(); + }); + + const stepsComponents: WizardStepsType = new Map(); + stepsComponents.set(1, { + label: 'Details', + component: Step1 + }); + stepsComponents.set(2, { + label: 'Scopes', + component: Step2 + }); + + + diff --git a/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte b/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte new file mode 100644 index 000000000..3637cd145 --- /dev/null +++ b/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte @@ -0,0 +1,19 @@ + + + + Create an API Key + Let's create an API Key. + + + + + diff --git a/src/routes/console/project-[project]/overview/keys/wizard/step2.svelte b/src/routes/console/project-[project]/overview/keys/wizard/step2.svelte new file mode 100644 index 000000000..56638e8a0 --- /dev/null +++ b/src/routes/console/project-[project]/overview/keys/wizard/step2.svelte @@ -0,0 +1,17 @@ + + + + Add Scopes + + Choose which permission scopes to grant your application. It is best practice to allow only + the permissions you need to meet your project goals. + + + + + diff --git a/src/routes/console/project-[project]/overview/keys/wizard/store.ts b/src/routes/console/project-[project]/overview/keys/wizard/store.ts new file mode 100644 index 000000000..148e58193 --- /dev/null +++ b/src/routes/console/project-[project]/overview/keys/wizard/store.ts @@ -0,0 +1,25 @@ +import { writable } from 'svelte/store'; +import type { Models } from '@aw-labs/appwrite-console'; + +function createKeyStore() { + const { subscribe, update, set } = writable>({ + name: null, + expire: null, + scopes: [] + }); + + return { + subscribe, + update, + set, + reset() { + set({ + name: null, + expire: null, + scopes: [] + }); + } + }; +} + +export const key = createKeyStore();