feat: verify users email (#215)

* worked on the email verification

* worked on the email verification

* fixed the emailing issue and the supabase updating issue

* chore: add timer to resend, add supabase.server, enforce unique email

* chore: remove nodemailer logger

* remove async

* remove disposable email verification

---------

Co-authored-by: Rotimi Best <best@classroomio.com>
This commit is contained in:
Em_Dev
2024-03-22 06:30:24 +01:00
committed by GitHub
co-authored by Rotimi Best
parent 5a566cbb4f
commit bd905b580a
17 changed files with 261 additions and 38 deletions
+3 -2
View File
@@ -22,7 +22,7 @@
import showAppsSideBar from '$lib/utils/functions/showAppsSideBar';
import isPublicRoute from '$lib/utils/functions/routes/isPublicRoute';
import { user, profile } from '$lib/utils/store/user';
import { getSupabase, isSupabaseTokenInLocalStorage } from '$lib/utils/functions/supabase';
import { getSupabase } from '$lib/utils/functions/supabase';
import { isMobile } from '$lib/utils/store/useMobile';
import { ROUTE } from '$lib/utils/constants/routes';
import { getOrganizations } from '$lib/utils/services/org';
@@ -41,6 +41,7 @@
let supabase = getSupabase();
let path = $page.url?.pathname?.replace('/', '');
let queryParam = $page.url?.search;
let carbonTheme: CarbonTheme = 'white';
const delayedPreloading = derived(navigating, (currentPreloading, set) => {
@@ -82,7 +83,7 @@
console.log('Get user', authUser);
if (!authUser && !isPublicRoute($page.url?.pathname)) {
return goto('/login?redirect=/' + path);
return goto('/login?redirect=/' + path + queryParam);
}
// Skip refetching profile, if already in store
@@ -0,0 +1,55 @@
import { json } from '@sveltejs/kit';
import { getSupabase } from '$lib/utils/functions/supabase';
import sendEmail from '$defer/sendEmail';
const supabase = getSupabase();
export async function POST({ request }) {
const { to, profileId, orgSiteName } = await request.json();
const accessToken = request.headers.get('Authorization');
console.log('/POST api/email/verify_email', to, profileId);
if (!to || !profileId || !accessToken) {
return json({ success: false, message: 'Name and To are required fields' }, { status: 400 });
}
let user;
try {
const { data } = await supabase.auth.getUser(accessToken);
user = data.user;
} catch (error) {
console.error(error);
}
if (!user) {
return json({ success: false, message: 'Unauthenticated user' }, { status: 401 });
}
const origin = request.headers.get('origin');
const verificationData = JSON.stringify({
profileId,
orgSiteName
});
const verificationLink = `${origin}/api/verify?data=${encodeURIComponent(
btoa(verificationData)
)}`;
await sendEmail({
to,
subject: '[ClassroomIO]: Verify your email',
content: `
<p>Thank you for signing up</p>
<p>To verify your email, please click the <strong>Verify</strong> button below /p>
<div>
<a class="button" href="${verificationLink}">Verify</a>
</div>
`,
isPersonalEmail: true
});
return json({
success: true,
message: `Email sent ${verificationLink}`
});
}
@@ -0,0 +1,29 @@
import { redirect, json } from '@sveltejs/kit';
import { getServerSupabase } from '$lib/utils/functions/supabase.server';
export const GET = async ({ url }) => {
const supabase = getServerSupabase();
const data = url.searchParams.get('data');
if (!data) return json({ message: 'data is not found' }, { status: 404 });
const hashData = decodeURIComponent(data);
console.log('hashData', hashData);
const decodedData = atob(hashData);
console.log('decodedData', decodedData);
const { profileId, orgSiteName } = JSON.parse(decodedData);
const { error } = await supabase
.from('profile')
.update({ is_email_verified: true, verified_at: new Date().toDateString() })
.match({ id: profileId });
if (error) {
console.log('profile not found', error);
throw redirect(307, '/404');
}
throw redirect(307, `/org/${orgSiteName}?welcomePopup=true`);
};
@@ -9,7 +9,6 @@
import { onboardingValidation } from '$lib/utils/functions/validator';
import { supabase } from '$lib/utils/functions/supabase';
import { blockedSubdomain } from '$lib/utils/constants/app';
import { welcomeModalStore } from '$lib/components/WelcomeModal/store';
import { getOrganizations } from '$lib/utils/services/org';
import { generateSitename } from '$lib/utils/functions/org';
import {
@@ -181,16 +180,13 @@
if (fields.fullname) {
$profile.fullname = fields.fullname;
triggerSendEmail(NOTIFICATION_NAME.WELCOME_TO_APP, {
to: $profile.email,
name: fields.fullname
});
}
triggerSendEmail(NOTIFICATION_NAME.VERIFY_EMAIL, {
to: $profile.email,
profileId: $profile.id,
orgSiteName: fields.siteName
});
console.log('data', data);
console.log('error', error);
$welcomeModalStore.open = true;
return goto(`/org/${fields.siteName}`);
}
@@ -3,10 +3,11 @@
import AddOrgModal from '$lib/components/Org/AddOrgModal/AddOrgModal.svelte';
import { isQuizPage } from '$lib/utils/functions/app';
import OrgSideBar from '$lib/components/Org/SideBar.svelte';
import VerifyEmailModal from '$lib/components/Org/VerifyEmail/VerifyEmailModal.svelte';
</script>
<AddOrgModal />
<VerifyEmailModal />
<div class="org-root w-full flex items-center justify-between">
{#if !isQuizPage($page.url?.pathname)}
<OrgSideBar />
@@ -14,7 +14,6 @@
import { profile } from '$lib/utils/store/user';
import { currentOrg } from '$lib/utils/store/org';
import { capturePosthogEvent } from '$lib/utils/services/posthog';
import { snackbar } from '$lib/components/Snackbar/store';
let supabase = getSupabase();
let fields = Object.assign({}, SIGNUP_FIELDS);
@@ -44,21 +43,6 @@
try {
loading = true;
// Check if the email address is disposable
const emailCheck = await fetch('https://is-disposable-email.ephraimduncan68.workers.dev/', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({ email: fields.email })
});
const emailCheckResponse = await emailCheck.json();
if (emailCheckResponse.isDisposable === true) {
snackbar.error('The email you provided is disposable');
return;
}
const {
data: { session },
error