From 2da978421e17ba10310de4ac1d12267c5b376362 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 18 Feb 2025 02:52:08 +0100 Subject: [PATCH] fix: various issues --- package.json | 4 +- pnpm-lock.yaml | 28 +- .../components/mfaChallengeFormList.svelte | 138 ++++---- src/lib/elements/forms/inputDigits.svelte | 99 +----- src/lib/elements/forms/inputPassword.svelte | 3 +- src/lib/layout/activity.svelte | 5 +- src/lib/layout/unauthenticated.svelte | 11 +- src/routes/(authenticated)/mfa/+page.svelte | 16 +- .../(console)/account/identities.svelte | 16 +- .../(console)/account/mfaRecoveryCodes.svelte | 93 +++--- .../account/organizations/+page.svelte | 3 +- .../(console)/account/sessions/+page.svelte | 142 ++++----- .../(console)/account/updateEmail.svelte | 9 +- src/routes/(console)/account/updateMfa.svelte | 295 +++++++++--------- .../(console)/account/updateName.svelte | 7 +- .../(console)/account/updatePassword.svelte | 7 +- .../(public)/(guest)/register/+page.svelte | 16 +- src/routes/(public)/invite/+page.svelte | 19 +- src/routes/(public)/recover/+page.svelte | 14 +- 19 files changed, 406 insertions(+), 519 deletions(-) diff --git a/package.json b/package.json index 159957ae6..34ec1e812 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,9 @@ "dependencies": { "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f6fbc25", "@appwrite.io/pink-icons": "0.25.0", - "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bc66aea", + "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@35f29290", "@appwrite.io/pink-legacy": "^1.0.1", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bc66aea", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@35f29290", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d47f0ffba..b626f518b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,14 +15,14 @@ importers: specifier: 0.25.0 version: 0.25.0 '@appwrite.io/pink-icons-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bc66aea - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bc66aea(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@35f29290 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@35f29290(svelte@4.2.19) '@appwrite.io/pink-legacy': specifier: ^1.0.1 version: 1.0.1 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bc66aea - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bc66aea(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@35f29290 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@35f29290(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -215,14 +215,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f6fbc25} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bc66aea': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bc66aea} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@35f29290': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@35f29290} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bc66aea96b32baf5a0ffe2dad22caf7ef1921c65': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bc66aea96b32baf5a0ffe2dad22caf7ef1921c65} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@35f2929064b9d126a377b6a3e85f59198c5901a2': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@35f2929064b9d126a377b6a3e85f59198c5901a2} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,8 @@ packages: '@appwrite.io/pink-legacy@1.0.1': resolution: {integrity: sha512-e5IZx2drqSxgl2WXvmr0eLfg/WiOCzuqQE8oksD+9GoFBkcL9HWvXul5GjFni3RBAN9XFRL3nUExGk4T0H8sFw==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bc66aea': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bc66aea} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@35f29290': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@35f29290} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4099,11 +4099,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f6fbc25': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bc66aea(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@35f29290(svelte@4.2.19)': dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bc66aea96b32baf5a0ffe2dad22caf7ef1921c65(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@35f2929064b9d126a377b6a3e85f59198c5901a2(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4116,9 +4116,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@bc66aea(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@35f29290(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bc66aea96b32baf5a0ffe2dad22caf7ef1921c65(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@35f2929064b9d126a377b6a3e85f59198c5901a2(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.3(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.3(svelte@4.2.19) diff --git a/src/lib/components/mfaChallengeFormList.svelte b/src/lib/components/mfaChallengeFormList.svelte index dcde547d8..68c2754b0 100644 --- a/src/lib/components/mfaChallengeFormList.svelte +++ b/src/lib/components/mfaChallengeFormList.svelte @@ -22,13 +22,13 @@ - - {#if challengeType == AuthenticationFactor.Recoverycode} -

- Enter below one of the recovery codes you received when enabling MFA for this account. -

- - {:else} - {#if factors.totp && (challengeType == AuthenticationFactor.Totp || challengeType == null)} -

Enter below a 6-digit one-time code generated by your authentication app.

- {:else if challengeType == AuthenticationFactor.Email} -

A 6-digit verification code was sent to your email, enter it below.

- {:else if challengeType == AuthenticationFactor.Phone} -

A 6-digit verification code was sent to your phone, enter it below.

+{#if challengeType == AuthenticationFactor.Recoverycode} + + Enter below one of the recovery codes you received when enabling MFA for this account. + + +{:else} + {#if factors.totp && (challengeType == AuthenticationFactor.Totp || challengeType == null)} + Enter below a 6-digit one-time code generated by your authentication app. + {:else if challengeType == AuthenticationFactor.Email} + A 6-digit verification code was sent to your email, enter it below. + {:else if challengeType == AuthenticationFactor.Phone} + A 6-digit verification code was sent to your phone, enter it below. + {/if} + +{/if} +{#if showVerifyButton} + +{/if} +{#if enabledFactors.length > 1} + or +
+ {#if factors.totp && challengeType != null && challengeType != AuthenticationFactor.Totp} + {/if} - - {/if} - {#if showVerifyButton} - - {/if} - {#if enabledFactors.length > 1} - or -
- {#if factors.totp && challengeType != null && challengeType != AuthenticationFactor.Totp} - - {/if} - {#if factors.email && challengeType != AuthenticationFactor.Email} - - {/if} - {#if factors.phone && challengeType != AuthenticationFactor.Phone} - - {/if} - {#if factors.recoveryCode && challengeType != AuthenticationFactor.Recoverycode} - - {/if} -
- {/if} - + {#if factors.email && challengeType != AuthenticationFactor.Email} + + {/if} + {#if factors.phone && challengeType != AuthenticationFactor.Phone} + + {/if} + {#if factors.recoveryCode && challengeType != AuthenticationFactor.Recoverycode} + + {/if} +
+{/if} diff --git a/src/lib/elements/forms/inputDigits.svelte b/src/lib/elements/forms/inputDigits.svelte index cde8f2c0e..6895d82a4 100644 --- a/src/lib/elements/forms/inputDigits.svelte +++ b/src/lib/elements/forms/inputDigits.svelte @@ -1,6 +1,5 @@ -
    - {#each Array.from({ length }) as _} -
  1. - -
  2. - {/each} -
- - + diff --git a/src/lib/elements/forms/inputPassword.svelte b/src/lib/elements/forms/inputPassword.svelte index 44ffb8725..401ae3695 100644 --- a/src/lib/elements/forms/inputPassword.svelte +++ b/src/lib/elements/forms/inputPassword.svelte @@ -4,6 +4,7 @@ export let id: string; export let label: string; export let value = ''; + export let helper = ''; export let placeholder = ''; export let required = false; export let disabled = false; @@ -44,6 +45,6 @@ state={error ? 'error' : 'default'} autofocus={autofocus || undefined} autocomplete={autocomplete ? 'on' : 'off'} - helper={error} + helper={helper || error} on:invalid={handleInvalid} bind:value /> diff --git a/src/lib/layout/activity.svelte b/src/lib/layout/activity.svelte index e989c4eb0..44ef46c73 100644 --- a/src/lib/layout/activity.svelte +++ b/src/lib/layout/activity.svelte @@ -3,7 +3,7 @@ import { Container } from '$lib/layout'; import { toLocaleDateTime } from '$lib/helpers/date'; import type { Models } from '@appwrite.io/console'; - import { Layout, Table, Card, Empty } from '@appwrite.io/pink-svelte'; + import { Layout, Table, Card, Empty, Typography } from '@appwrite.io/pink-svelte'; import Button from '$lib/elements/forms/button.svelte'; export let logs: Models.LogList; @@ -12,6 +12,9 @@ + + Activity + {#if logs.total} diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte index f645eb554..ecbeb5196 100644 --- a/src/lib/layout/unauthenticated.svelte +++ b/src/lib/layout/unauthenticated.svelte @@ -9,12 +9,14 @@ import { app } from '$lib/stores/app'; import type { Campaign } from '$lib/stores/campaigns'; import { getApiEndpoint } from '$lib/stores/sdk'; + import { Typography } from '@appwrite.io/pink-svelte'; export const imgLight = LoginLight; export const imgDark = LoginDark; export let campaign: Campaign = null; export let coupon: Coupon = null; + export let align: 'start' | 'center' | 'end' = 'start'; $: variation = ((coupon?.campaign ?? campaign) ? campaign?.template : 'default') as | 'default' @@ -181,14 +183,9 @@
-

+ -

-

- -

+
diff --git a/src/routes/(authenticated)/mfa/+page.svelte b/src/routes/(authenticated)/mfa/+page.svelte index 9edb09d26..693893280 100644 --- a/src/routes/(authenticated)/mfa/+page.svelte +++ b/src/routes/(authenticated)/mfa/+page.svelte @@ -8,7 +8,7 @@ import MfaChallengeFormList, { verify } from '$lib/components/mfaChallengeFormList.svelte'; import { page } from '$app/stores'; import { addNotification } from '$lib/stores/notifications.js'; - import { Icon } from '@appwrite.io/pink-svelte'; + import { Icon, Layout } from '@appwrite.io/pink-svelte'; import { IconChevronLeft } from '@appwrite.io/pink-icons-svelte'; export let data; @@ -53,11 +53,11 @@ Verify - Appwrite - +
- @@ -65,11 +65,11 @@
Verify your identity - -
+ + - -
+ +