-
Notifications
You must be signed in to change notification settings - Fork 186
feat: added modal for email verfication #2354
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.
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
79 changes: 79 additions & 0 deletions
79
src/lib/components/account/sendVerificationEmailModal.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
<script lang="ts"> | ||
import { invalidate } from '$app/navigation'; | ||
import { Modal } from '$lib/components'; | ||
import { Button } from '$lib/elements/forms'; | ||
import { addNotification } from '$lib/stores/notifications'; | ||
import { sdk } from '$lib/stores/sdk'; | ||
import { user } from '$lib/stores/user'; | ||
import { get } from 'svelte/store'; | ||
import { page } from '$app/state'; | ||
import { Card, Layout, Typography } from '@appwrite.io/pink-svelte'; | ||
import { Dependencies } from '$lib/constants'; | ||
import { onMount } from 'svelte'; | ||
|
||
let { show = $bindable(false) } = $props(); | ||
let creating = $state(false); | ||
let emailSent = $state(false); | ||
|
||
let cleanUrl = $derived(page.url.origin + page.url.pathname); | ||
|
||
async function onSubmit() { | ||
if (creating) return; | ||
creating = true; | ||
try { | ||
await sdk.forConsole.account.createVerification({ url: cleanUrl }); | ||
addNotification({ message: 'Verification email has been sent', type: 'success' }); | ||
emailSent = true; | ||
show = false; | ||
} catch (error) { | ||
addNotification({ message: error.message, type: 'error' }); | ||
} finally { | ||
creating = false; | ||
} | ||
} | ||
ItzNotABug marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
async function updateEmailVerification() { | ||
const searchParams = page.url.searchParams; | ||
const userId = searchParams.get('userId'); | ||
const secret = searchParams.get('secret'); | ||
|
||
if (userId && secret) { | ||
try { | ||
await sdk.forConsole.account.updateVerification({ userId, secret }); | ||
addNotification({ | ||
message: 'Email verified successfully', | ||
type: 'success' | ||
}); | ||
await Promise.all([ | ||
invalidate(Dependencies.ACCOUNT), | ||
invalidate(Dependencies.FACTORS) | ||
]); | ||
} catch (error) { | ||
addNotification({ | ||
message: error.message, | ||
type: 'error' | ||
}); | ||
} | ||
} | ||
} | ||
|
||
onMount(() => { | ||
updateEmailVerification(); | ||
}); | ||
</script> | ||
|
||
<Modal bind:show title="Send verification email" {onSubmit}> | ||
HarshMN2345 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<Card.Base variant="secondary" padding="s"> | ||
<Layout.Stack gap="m"> | ||
<Typography.Text gap="m"> | ||
To continue using Appwrite Cloud, please verify your email address. An email will be | ||
sent to <Typography.Text variant="m-600" style="display: inline;" | ||
>{get(user)?.email}</Typography.Text> | ||
</Typography.Text> | ||
</Layout.Stack> | ||
</Card.Base> | ||
|
||
<svelte:fragment slot="footer"> | ||
<Button submit disabled={creating}>{emailSent ? 'Resend email' : 'Send email'}</Button> | ||
</svelte:fragment> | ||
</Modal> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,63 +1,31 @@ | ||
<script lang="ts"> | ||
import { base } from '$app/paths'; | ||
import { goto } from '$app/navigation'; | ||
import { Button } from '$lib/elements/forms'; | ||
import { HeaderAlert } from '$lib/layout'; | ||
import { Typography } from '@appwrite.io/pink-svelte'; | ||
import { hideNotification, shouldShowNotification } from '$lib/helpers/notifications'; | ||
import { user } from '$lib/stores/user'; | ||
import { wizard } from '$lib/stores/wizard'; | ||
import { page } from '$app/state'; | ||
|
||
const { emailBannerClosed, onEmailBannerClose } = $props<{ | ||
emailBannerClosed: boolean; | ||
onEmailBannerClose: (closed: boolean) => void; | ||
}>(); | ||
|
||
const isOnOnboarding = $derived(page.url?.pathname?.includes('/console/onboarding')); | ||
import SendVerificationEmailModal from '../account/sendVerificationEmailModal.svelte'; | ||
import { page } from '$app/stores'; | ||
|
||
const hasUser = $derived(!!$user); | ||
const needsEmailVerification = $derived(hasUser && !$user.emailVerification); | ||
const shouldShowNotificationBanner = $derived.by(() => | ||
shouldShowNotification('email-verification-banner') | ||
); | ||
const wizardNotActive = $derived(!$wizard.show && !$wizard.cover); | ||
const bannerNotClosed = $derived(!emailBannerClosed); | ||
const notOnOnboarding = $derived(!isOnOnboarding); | ||
|
||
const shouldShowEmailBanner = $derived( | ||
hasUser && | ||
needsEmailVerification && | ||
shouldShowNotificationBanner && | ||
wizardNotActive && | ||
bannerNotClosed && | ||
notOnOnboarding | ||
); | ||
|
||
function navigateToAccount() { | ||
goto(`${base}/account`); | ||
} | ||
const notOnOnboarding = $derived(!$page.route.id.includes('/onboarding')); | ||
const shouldShowEmailBanner = $derived(hasUser && needsEmailVerification && notOnOnboarding); | ||
|
||
function handleDismiss() { | ||
onEmailBannerClose(true); | ||
hideNotification('email-verification-banner', { coolOffPeriod: 24 * 365 * 100 }); | ||
} | ||
let showSendVerification = $state(false); | ||
</script> | ||
|
||
{#if shouldShowEmailBanner} | ||
<HeaderAlert | ||
type="warning" | ||
title="Your email address needs to be verified" | ||
dismissible | ||
on:dismiss={handleDismiss}> | ||
<HeaderAlert type="warning" title="Your email address needs to be verified"> | ||
<svelte:fragment> | ||
To avoid losing access to your projects, make sure <Typography.Text | ||
variant="m-500" | ||
style="display:inline">{$user.email}</Typography.Text> is valid and up to date. Email | ||
verification will be required soon. | ||
</svelte:fragment> | ||
<svelte:fragment slot="buttons"> | ||
<Button secondary size="s" on:click={navigateToAccount}>Update email address</Button> | ||
<Button secondary size="s" on:click={() => (showSendVerification = true)} | ||
>Verify email</Button> | ||
</svelte:fragment> | ||
</HeaderAlert> | ||
<SendVerificationEmailModal bind:show={showSendVerification} /> | ||
{/if} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.