diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 865a0bd9e..a0490076e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,13 +1,8 @@ name: Tests on: - push: - branches: [main] - paths-ignore: - - '**/*.md' - - 'static/**/*' pull_request: - branches: [main] + branches: ['**'] paths-ignore: - '**/*.md' - 'static/**/*' @@ -23,9 +18,9 @@ jobs: - name: Use Node.js uses: actions/setup-node@v3 with: - node-version: 18 - # - name: Audit dependencies - # run: npm audit --audit-level low + node-version: 20 + - name: Audit dependencies + run: npm audit --audit-level critical - name: Install dependencies run: npm ci - name: Svelte Diagnostics diff --git a/src/hooks.client.ts b/src/hooks.client.ts new file mode 100644 index 000000000..2345ffb2c --- /dev/null +++ b/src/hooks.client.ts @@ -0,0 +1,13 @@ +import { AppwriteException } from '@appwrite.io/console'; +import type { HandleClientError } from '@sveltejs/kit'; + +export const handleError: HandleClientError = async ({ error, message, status }) => { + if (error instanceof AppwriteException && error.code === 0) { + status = undefined; + message = error.message; + } + return { + message, + status + }; +}; diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 181592ef0..2c1d4d119 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -264,6 +264,7 @@ export enum Submit { PaymentMethodUpdate = 'submit_payment_method_update', PaymentMethodDelete = 'submit_payment_method_delete', RetryPayment = 'submit_retry_payment', + VerifyPayment = 'submit_verify_payment', BillingAddressCreate = 'submit_billing_address_create', BillingAddressUpdate = 'submit_billing_address_update', BillingAddressDelete = 'submit_billing_address_delete', diff --git a/src/lib/components/billing/alerts/paymentMandate.svelte b/src/lib/components/billing/alerts/paymentMandate.svelte new file mode 100644 index 000000000..9799ddcc3 --- /dev/null +++ b/src/lib/components/billing/alerts/paymentMandate.svelte @@ -0,0 +1,26 @@ + + +{#if $paymentMissingMandate && $paymentMissingMandate.country === 'in' && $paymentMissingMandate.mandateId === null && !$page.url.pathname.includes('/console/account')} + + The payment method for {$organization.name} needs to be verified. + + + + +{/if} diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte index 5056e1186..e8d900df2 100644 --- a/src/lib/components/permissions/team.svelte +++ b/src/lib/components/permissions/team.svelte @@ -6,6 +6,8 @@ import { AvatarInitials, EmptySearch, Modal, PaginationInline } from '..'; import type { Writable } from 'svelte/store'; import type { Permission } from './permissions.svelte'; + import Table from '$lib/elements/table/table.svelte'; + import { TableBody, TableCell, TableRow } from '$lib/elements/table'; export let show: boolean; export let groups: Writable>; @@ -77,13 +79,13 @@ bind:value={search} /> {#if results?.teams?.length}
- - +
+ {#each results.teams as team (team.$id)} {@const role = `team:${team.$id}`} {@const exists = $groups.has(role)} - - - - + + {/each} - -
+ + onSelection(event, role)} /> - + + -
+ +

Total results: {results?.total}

diff --git a/src/lib/elements/table/table.svelte b/src/lib/elements/table/table.svelte index 81df3e41a..a9bd44acf 100644 --- a/src/lib/elements/table/table.svelte +++ b/src/lib/elements/table/table.svelte @@ -3,10 +3,14 @@ export let noStyles = false; export let style = ''; export let transparent = false; + export let isAutoLayout = false; + export let tag: 'div' | 'table' = 'div'; -
-
+ diff --git a/src/lib/elements/table/tableScroll.svelte b/src/lib/elements/table/tableScroll.svelte index b586b58f5..9a8c4d1d8 100644 --- a/src/lib/elements/table/tableScroll.svelte +++ b/src/lib/elements/table/tableScroll.svelte @@ -5,6 +5,8 @@ export let noMargin = false; export let style = ''; export let transparent = false; + export let noStyles = false; + let isOverflowing = false; const hasOverflow: Action = (node) => { @@ -44,6 +46,7 @@
(isOverflowing = v)}> diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte index 80585507e..3a22c3c58 100644 --- a/src/lib/layout/containerHeader.svelte +++ b/src/lib/layout/containerHeader.svelte @@ -113,19 +113,18 @@ {#if hasProjectLimitation} (showDropdown = !showDropdown)}> - {total}/{limit} - {title} used + {total}/{limit} created {:else} (showDropdown = !showDropdown)}> - {title} limited + Limits applied {/if} {#if hasProjectLimitation}

- Your are limited to {limit} + You are limited to {limit} {title.toLocaleLowerCase()} per project on the {tier} plan. {#if $organization?.billingPlan === BillingPlan.STARTER} - for addtional {title.toLocaleLowerCase()}. + for additional {title.toLocaleLowerCase()}. {/if}

{:else if hasUsageFees} diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index 66bab7a38..60165d453 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -18,6 +18,7 @@ export type PaymentMethodData = { clientSecret: string; failed: boolean; name: string; + mandateId?: string; }; export type PaymentList = { @@ -865,6 +866,26 @@ export class Billing { ); } + async setupPaymentMandate( + organizationId: string, + paymentMethodId: string + ): Promise { + const path = `/account/payment-methods/${paymentMethodId}/setup`; + const params = { + organizationId, + paymentMethodId + }; + const uri = new URL(this.client.config.endpoint + path); + return await this.client.call( + 'post', + uri, + { + 'content-type': 'application/json' + }, + params + ); + } + async listAddresses(queries: Query[] = []): Promise { const path = `/account/billing-addresses`; const params = { diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts index 141b31f93..c213a7147 100644 --- a/src/lib/stores/billing.ts +++ b/src/lib/stores/billing.ts @@ -2,7 +2,14 @@ import { page } from '$app/stores'; import { derived, get, writable } from 'svelte/store'; import { sdk } from './sdk'; import { organization, type Organization } from './organization'; -import type { InvoiceList, AddressesList, Invoice, PaymentList, PlansMap } from '$lib/sdk/billing'; +import type { + InvoiceList, + AddressesList, + Invoice, + PaymentList, + PlansMap, + PaymentMethodData +} from '$lib/sdk/billing'; import { isCloud } from '$lib/system'; import { cachedStore } from '$lib/helpers/cache'; import { Query } from '@appwrite.io/console'; @@ -14,6 +21,7 @@ import { base } from '$app/paths'; import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/console/store'; import MarkedForDeletion from '$lib/components/billing/alerts/markedForDeletion.svelte'; import { BillingPlan } from '$lib/constants'; +import PaymentMandate from '$lib/components/billing/alerts/paymentMandate.svelte'; import MissingPaymentMethod from '$lib/components/billing/alerts/missingPaymentMethod.svelte'; export type Tier = 'tier-0' | 'tier-1' | 'tier-2'; @@ -262,11 +270,29 @@ export function checkForMarkedForDeletion(org: Organization) { id: 'markedForDeletion', component: MarkedForDeletion, show: true, - importance: 5 + importance: 10 }); } } +export const paymentMissingMandate = writable(null); + +export async function checkForMandate(org: Organization) { + const paymentId = org.paymentMethodId ?? org.backupPaymentMethodId; + if (!paymentId) return; + const paymentMethod = await sdk.forConsole.billing.getPaymentMethod(paymentId); + if (paymentMethod.mandateId === null && paymentMethod.country === 'in') { + headerAlert.add({ + id: 'paymentMandate', + component: PaymentMandate, + show: true, + importance: 8 + }); + activeHeaderAlert.set(headerAlert.get()); + paymentMissingMandate.set(paymentMethod); + } +} + export async function checkForMissingPaymentMethod() { const orgs = await sdk.forConsole.billing.listOrganization([ Query.notEqual('billingPlan', BillingPlan.STARTER), diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts index c5752e8ac..09c5bf539 100644 --- a/src/lib/stores/oauth-providers.ts +++ b/src/lib/stores/oauth-providers.ts @@ -1,15 +1,15 @@ import type { Models } from '@appwrite.io/console'; import type { SvelteComponent } from 'svelte'; import { writable } from 'svelte/store'; -import Apple from '../../routes/console/project-[project]/auth/appleOAuth.svelte'; -import Auth0 from '../../routes/console/project-[project]/auth/auth0OAuth.svelte'; -import Authentik from '../../routes/console/project-[project]/auth/authentikOAuth.svelte'; -import GitLab from '../../routes/console/project-[project]/auth/gitlabOAuth.svelte'; -import Google from '../../routes/console/project-[project]/auth/googleOAuth.svelte'; -import Main from '../../routes/console/project-[project]/auth/mainOAuth.svelte'; -import Microsoft from '../../routes/console/project-[project]/auth/microsoftOAuth.svelte'; -import Oidc from '../../routes/console/project-[project]/auth/oidcOAuth.svelte'; -import Okta from '../../routes/console/project-[project]/auth/oktaOAuth.svelte'; +import Apple from '../../routes/console/project-[project]/auth/(providers)/appleOAuth.svelte'; +import Auth0 from '../../routes/console/project-[project]/auth/(providers)/auth0OAuth.svelte'; +import Authentik from '../../routes/console/project-[project]/auth/(providers)/authentikOAuth.svelte'; +import GitLab from '../../routes/console/project-[project]/auth/(providers)/gitlabOAuth.svelte'; +import Google from '../../routes/console/project-[project]/auth/(providers)/googleOAuth.svelte'; +import Main from '../../routes/console/project-[project]/auth/(providers)/mainOAuth.svelte'; +import Microsoft from '../../routes/console/project-[project]/auth/(providers)/microsoftOAuth.svelte'; +import Oidc from '../../routes/console/project-[project]/auth/(providers)/oidcOAuth.svelte'; +import Okta from '../../routes/console/project-[project]/auth/(providers)/oktaOAuth.svelte'; export type Provider = Models.Provider & { key: string; diff --git a/src/lib/stores/stripe.ts b/src/lib/stores/stripe.ts index fd89db004..93b4576ae 100644 --- a/src/lib/stores/stripe.ts +++ b/src/lib/stores/stripe.ts @@ -5,6 +5,7 @@ import { get, writable } from 'svelte/store'; import type { PaymentMethodData } from '$lib/sdk/billing'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { addNotification } from './notifications'; +import { organization } from './organization'; export const stripe = writable(); let paymentMethod: PaymentMethodData; @@ -50,7 +51,7 @@ export async function unmountPaymentElement() { elements = null; } -export async function submitStripeCard(name: string, urlRoute?: string) { +export async function submitStripeCard(name: string, organizationId?: string) { try { // If a payment method was created during initialization, use it, otherwise create a new one if (!paymentMethod) { @@ -61,15 +62,20 @@ export async function submitStripeCard(name: string, urlRoute?: string) { // // Element needs to be submitted before confirming the setup intent elements.submit(); - const baseUrl = 'https://cloud.appwrite.io/console/'; + const baseUrl = 'https://cloud.appwrite.io/console'; + const accountUrl = `${baseUrl}/account/payments?clientSecret=${clientSecret}`; + const orgUrl = `${baseUrl}/organization-${organizationId}/billing?clientSecret=${clientSecret}`; + + const returnUrl = new URL(organizationId ? orgUrl : accountUrl); + + returnUrl.searchParams.append('clientSecret', clientSecret); + returnUrl.searchParams.append('paymentMethodId', paymentMethod.$id); const { setupIntent, error } = await get(stripe).confirmSetup({ elements, clientSecret, confirmParams: { - return_url: `${baseUrl}${ - urlRoute ?? `organization/billing?clientSecret=${clientSecret}` - }`, + return_url: returnUrl.toString(), payment_method_data: { billing_details: { name @@ -138,6 +144,45 @@ export async function confirmPayment( } } +export async function confirmSetup( + clientSecret: string, + paymentMethodId: string, + urlRoute?: string +) { + const baseUrl = 'https://cloud.appwrite.io/console/'; + + const { setupIntent, error } = await get(stripe).confirmCardSetup(clientSecret, { + payment_method: paymentMethodId, + return_url: `${baseUrl}${ + urlRoute ?? `organization-${get(organization).$id}/billing?clientSecret=${clientSecret}` + }` + }); + + if (error) { + const e = new Error(error.message); + trackError(e, Submit.VerifyPayment); + addNotification({ + message: error.message, + type: 'error' + }); + } + + if (setupIntent && setupIntent.status === 'succeeded') { + trackEvent(Submit.VerifyPayment); + addNotification({ + message: 'Payment method verified successfully', + type: 'success' + }); + } else { + const e = new Error('Something went wrong. Please try again later.'); + trackError(e, Submit.VerifyPayment); + addNotification({ + message: e.message, + type: 'error' + }); + } +} + const apperanceLight = { variables: { colorPrimary: '#606a7b', diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index 4e9d8e540..8b914f299 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -6,7 +6,7 @@ - {$page.status} + {$page.error.status || 'Invalid Argument'} {$page.error.message} diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 14cb350c0..84fdba79b 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -13,9 +13,10 @@ export const ssr = false; export const load: LayoutLoad = async ({ depends, url }) => { depends(Dependencies.ACCOUNT); - redirectTo.set(url.searchParams.get('forceRedirect') || null); - - url.searchParams.delete('forceRedirect'); + if (url.searchParams.has('forceRedirect')) { + redirectTo.set(url.searchParams.get('forceRedirect') || null); + url.searchParams.delete('forceRedirect'); + } try { const account = await sdk.forConsole.account.get<{ organization?: string }>(); diff --git a/src/routes/console/+error.svelte b/src/routes/console/+error.svelte index 9a50e9be7..408a5afaa 100644 --- a/src/routes/console/+error.svelte +++ b/src/routes/console/+error.svelte @@ -6,7 +6,9 @@ - {$page.status} - {$page.error.message} - +
+ {$page.error.status || 'Invalid Argument'} + {$page.error.message} + +
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte index 6ca05b289..23145a667 100644 --- a/src/routes/console/+layout.svelte +++ b/src/routes/console/+layout.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/console/account/payments/paymentModal.svelte b/src/routes/console/account/payments/paymentModal.svelte index abe6767fe..2ac93e0b2 100644 --- a/src/routes/console/account/payments/paymentModal.svelte +++ b/src/routes/console/account/payments/paymentModal.svelte @@ -6,6 +6,7 @@ import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { addNotification } from '$lib/stores/notifications'; + import { page } from '$app/stores'; export let show = false; @@ -20,7 +21,7 @@ async function handleSubmit() { try { - const card = await submitStripeCard(name); + const card = await submitStripeCard(name, $page?.params?.organization ?? null); invalidate(Dependencies.PAYMENT_METHODS); dispatch('submit', card); show = false; diff --git a/src/routes/console/changeOrganizationTierCloud.svelte b/src/routes/console/changeOrganizationTierCloud.svelte index aeb45a657..2e2ad4544 100644 --- a/src/routes/console/changeOrganizationTierCloud.svelte +++ b/src/routes/console/changeOrganizationTierCloud.svelte @@ -14,6 +14,7 @@ changeOrganizationFinalAction, changeOrganizationTier, changeTierSteps, + feedbackDowngradeOptions, isUpgrade } from './wizard/cloudOrganizationChangeTier/store'; import { goto, invalidate } from '$app/navigation'; @@ -24,7 +25,7 @@ import { wizard } from '$lib/stores/wizard'; import { tierToPlan } from '$lib/stores/billing'; import { user } from '$lib/stores/user'; - import { feedback } from '$lib/stores/feedback'; + import { VARS } from '$lib/system'; const dispatch = createEventDispatcher(); @@ -42,12 +43,25 @@ $changeOrganizationTier.paymentMethodId, $changeOrganizationTier.billingAddressId ); - feedback.submitFeedback( - 'downgrade', - $changeOrganizationTier.feedbackMessage, - $user?.name ?? '', - $user.email - ); + + await fetch(`${VARS.GROWTH_ENDPOINT}/feedback/billing`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + from: tierToPlan($organization.billingPlan).name, + to: tierToPlan($changeOrganizationTier.billingPlan).name, + email: $user.email, + reason: feedbackDowngradeOptions.find( + (option) => + option.value === $changeOrganizationTier.feedbackDowngradeReason + )?.label, + orgId: $organization.$id, + userId: $user.$id, + message: $changeOrganizationTier?.feedbackMessage ?? '' + }) + }); addNotification({ type: 'success', diff --git a/src/routes/console/organization-[organization]/billing/paymentHistory.svelte b/src/routes/console/organization-[organization]/billing/paymentHistory.svelte index eb3ea4b31..a8caf4348 100644 --- a/src/routes/console/organization-[organization]/billing/paymentHistory.svelte +++ b/src/routes/console/organization-[organization]/billing/paymentHistory.svelte @@ -65,7 +65,7 @@

{#if invoiceList.total - 1 > 0} - + Due Date Status @@ -94,7 +94,7 @@ {formatCurrency(invoice.amount)} - + @@ -61,6 +65,6 @@ - + diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte index 23c2d23d8..f0eb26049 100644 --- a/src/routes/console/organization-[organization]/header.svelte +++ b/src/routes/console/organization-[organization]/header.svelte @@ -94,7 +94,7 @@ {#if isCloud && $organization?.billingPlan === BillingPlan.STARTER} FREE {/if} - {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0} + {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0 && $organization.billingPlan !== BillingPlan.STARTER}
- {$page.status} + {$page.error.status || 'Invalid Argument'}

{$page.error.message}

diff --git a/src/routes/console/project-[project]/auth/appleOAuth.svelte b/src/routes/console/project-[project]/auth/(providers)/appleOAuth.svelte similarity index 95% rename from src/routes/console/project-[project]/auth/appleOAuth.svelte rename to src/routes/console/project-[project]/auth/(providers)/appleOAuth.svelte index c14b2e5f7..982422b3f 100644 --- a/src/routes/console/project-[project]/auth/appleOAuth.svelte +++ b/src/routes/console/project-[project]/auth/(providers)/appleOAuth.svelte @@ -5,11 +5,12 @@ import type { Provider } from '$lib/stores/oauth-providers'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import { updateOAuth } from './updateOAuth'; + import { updateOAuth } from '../updateOAuth'; const projectId = $page.params.project; export let provider: Provider; + export let show = false; let appId: string = null; let enabled: boolean = null; @@ -37,7 +38,7 @@ $: secret = keyID && teamID && p8 ? JSON.stringify({ keyID, teamID, p8 }) : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/auth0OAuth.svelte b/src/routes/console/project-[project]/auth/(providers)/auth0OAuth.svelte similarity index 95% rename from src/routes/console/project-[project]/auth/auth0OAuth.svelte rename to src/routes/console/project-[project]/auth/(providers)/auth0OAuth.svelte index 51a25c834..0607180a5 100644 --- a/src/routes/console/project-[project]/auth/auth0OAuth.svelte +++ b/src/routes/console/project-[project]/auth/(providers)/auth0OAuth.svelte @@ -5,9 +5,10 @@ import type { Provider } from '$lib/stores/oauth-providers'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import { updateOAuth } from './updateOAuth'; + import { updateOAuth } from '../updateOAuth'; export let provider: Provider; + export let show = false; let appId: string = null; let enabled: boolean = null; @@ -38,7 +39,7 @@ : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/authentikOAuth.svelte b/src/routes/console/project-[project]/auth/(providers)/authentikOAuth.svelte similarity index 95% rename from src/routes/console/project-[project]/auth/authentikOAuth.svelte rename to src/routes/console/project-[project]/auth/(providers)/authentikOAuth.svelte index 7df8877a5..f7d6dcd37 100644 --- a/src/routes/console/project-[project]/auth/authentikOAuth.svelte +++ b/src/routes/console/project-[project]/auth/(providers)/authentikOAuth.svelte @@ -5,9 +5,10 @@ import type { Provider } from '$lib/stores/oauth-providers'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import { updateOAuth } from './updateOAuth'; + import { updateOAuth } from '../updateOAuth'; export let provider: Provider; + export let show = false; let appId: string = null; let enabled: boolean = null; @@ -38,7 +39,7 @@ : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/gitlabOAuth.svelte b/src/routes/console/project-[project]/auth/(providers)/gitlabOAuth.svelte similarity index 95% rename from src/routes/console/project-[project]/auth/gitlabOAuth.svelte rename to src/routes/console/project-[project]/auth/(providers)/gitlabOAuth.svelte index e93d4ae8f..95f80675e 100644 --- a/src/routes/console/project-[project]/auth/gitlabOAuth.svelte +++ b/src/routes/console/project-[project]/auth/(providers)/gitlabOAuth.svelte @@ -5,9 +5,10 @@ import type { Provider } from '$lib/stores/oauth-providers'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import { updateOAuth } from './updateOAuth'; + import { updateOAuth } from '../updateOAuth'; export let provider: Provider; + export let show = false; let appId: string = null; let enabled: boolean = null; @@ -36,7 +37,7 @@ clientSecret && endpoint ? JSON.stringify({ clientSecret, endpoint }) : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/googleOAuth.svelte b/src/routes/console/project-[project]/auth/(providers)/googleOAuth.svelte similarity index 95% rename from src/routes/console/project-[project]/auth/googleOAuth.svelte rename to src/routes/console/project-[project]/auth/(providers)/googleOAuth.svelte index c06c99b6f..defd59038 100644 --- a/src/routes/console/project-[project]/auth/googleOAuth.svelte +++ b/src/routes/console/project-[project]/auth/(providers)/googleOAuth.svelte @@ -5,9 +5,10 @@ import type { Provider } from '$lib/stores/oauth-providers'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import { updateOAuth } from './updateOAuth'; + import { updateOAuth } from '../updateOAuth'; export let provider: Provider; + export let show = false; const projectId = $page.params.project; @@ -34,7 +35,7 @@ }; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/mainOAuth.svelte b/src/routes/console/project-[project]/auth/(providers)/mainOAuth.svelte similarity index 94% rename from src/routes/console/project-[project]/auth/mainOAuth.svelte rename to src/routes/console/project-[project]/auth/(providers)/mainOAuth.svelte index f8c11649e..184fcd00c 100644 --- a/src/routes/console/project-[project]/auth/mainOAuth.svelte +++ b/src/routes/console/project-[project]/auth/(providers)/mainOAuth.svelte @@ -5,9 +5,10 @@ import type { Provider } from '$lib/stores/oauth-providers'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import { updateOAuth } from './updateOAuth'; + import { updateOAuth } from '../updateOAuth'; export let provider: Provider; + export let show = false; const projectId = $page.params.project; @@ -34,7 +35,7 @@ }; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte b/src/routes/console/project-[project]/auth/(providers)/microsoftOAuth.svelte similarity index 95% rename from src/routes/console/project-[project]/auth/microsoftOAuth.svelte rename to src/routes/console/project-[project]/auth/(providers)/microsoftOAuth.svelte index 266713e8e..7fd451af5 100644 --- a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte +++ b/src/routes/console/project-[project]/auth/(providers)/microsoftOAuth.svelte @@ -5,9 +5,10 @@ import type { Provider } from '$lib/stores/oauth-providers'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import { updateOAuth } from './updateOAuth'; + import { updateOAuth } from '../updateOAuth'; export let provider: Provider; + export let show = false; let appId: string = null; let enabled: boolean = null; @@ -37,7 +38,7 @@ clientSecret && tenantID ? JSON.stringify({ clientSecret, tenantID }) : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/oidcOAuth.svelte b/src/routes/console/project-[project]/auth/(providers)/oidcOAuth.svelte similarity index 96% rename from src/routes/console/project-[project]/auth/oidcOAuth.svelte rename to src/routes/console/project-[project]/auth/(providers)/oidcOAuth.svelte index 719759e14..f00f07e30 100644 --- a/src/routes/console/project-[project]/auth/oidcOAuth.svelte +++ b/src/routes/console/project-[project]/auth/(providers)/oidcOAuth.svelte @@ -5,11 +5,12 @@ import type { Provider } from '$lib/stores/oauth-providers'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import { updateOAuth } from './updateOAuth'; + import { updateOAuth } from '../updateOAuth'; const projectId = $page.params.project; export let provider: Provider; + export let show = false; let appId: string = null; let enabled: boolean = null; @@ -60,7 +61,7 @@ : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/oktaOAuth.svelte b/src/routes/console/project-[project]/auth/(providers)/oktaOAuth.svelte similarity index 95% rename from src/routes/console/project-[project]/auth/oktaOAuth.svelte rename to src/routes/console/project-[project]/auth/(providers)/oktaOAuth.svelte index b9e640f8d..6e23ca60c 100644 --- a/src/routes/console/project-[project]/auth/oktaOAuth.svelte +++ b/src/routes/console/project-[project]/auth/(providers)/oktaOAuth.svelte @@ -5,11 +5,12 @@ import type { Provider } from '$lib/stores/oauth-providers'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import { updateOAuth } from './updateOAuth'; + import { updateOAuth } from '../updateOAuth'; const projectId = $page.params.project; export let provider: Provider; + export let show = false; let appId: string = null; let enabled: boolean = null; @@ -42,7 +43,7 @@ : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/settings/+page.svelte b/src/routes/console/project-[project]/auth/settings/+page.svelte index fea2bad07..610733117 100644 --- a/src/routes/console/project-[project]/auth/settings/+page.svelte +++ b/src/routes/console/project-[project]/auth/settings/+page.svelte @@ -14,6 +14,7 @@ import { project } from '../../store'; const projectId = $page.params.project; + let showProvider = false; $: { authMethods.load($project); @@ -74,6 +75,7 @@ class="card u-flex u-flex-vertical u-cross-center u-width-full-line" on:click={() => { selectedProvider = provider; + showProvider = true; trackEvent(`click_select_provider`, { provider: provider.key.toLowerCase() }); @@ -99,9 +101,13 @@ {/if} -{#if selectedProvider} +{#if selectedProvider && showProvider} (selectedProvider = null)} /> + bind:show={showProvider} + on:close={() => { + selectedProvider = null; + showProvider = false; + }} /> {/if} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte index 857e64584..1be558a2d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte @@ -58,9 +58,9 @@

{:else} -