Allow signing up forever without Brevo.
Also allow logins from local IPs (related to #5).
This commit is contained in:
@@ -6,6 +6,7 @@ import { FormField, generateFieldHtml, getFormDataField } from '/lib/form-utils.
|
||||
import { createVerificationCode, getUserByEmail, updateUser, validateVerificationCode } from '/lib/data/user.ts';
|
||||
import { sendVerifyEmailEmail } from '/lib/providers/brevo.ts';
|
||||
import { FreshContextState } from '/lib/types.ts';
|
||||
import { isEmailEnabled } from '/lib/config.ts';
|
||||
|
||||
interface Data {
|
||||
error?: string;
|
||||
@@ -62,6 +63,12 @@ export const handler: Handlers<Data, FreshContextState> = {
|
||||
throw new Error('Email not found or invalid password.');
|
||||
}
|
||||
|
||||
if (!isEmailEnabled() && !user.extra.is_email_verified) {
|
||||
user.extra.is_email_verified = true;
|
||||
|
||||
await updateUser(user);
|
||||
}
|
||||
|
||||
if (!user.extra.is_email_verified) {
|
||||
const code = getFormDataField(formData, 'verification-code');
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
import { convertFormDataToObject, generateHash, validateEmail } from '/lib/utils/misc.ts';
|
||||
import { getFormDataField } from '/lib/form-utils.tsx';
|
||||
import { sendVerifyEmailEmail } from '/lib/providers/brevo.ts';
|
||||
import { isEmailEnabled } from '/lib/config.ts';
|
||||
import Settings, { Action, actionWords } from '/islands/Settings.tsx';
|
||||
|
||||
interface Data {
|
||||
@@ -73,7 +74,7 @@ export const handler: Handlers<Data, FreshContextState> = {
|
||||
throw new Error('Email is already in use.');
|
||||
}
|
||||
|
||||
if (action === 'change-email') {
|
||||
if (action === 'change-email' && isEmailEnabled()) {
|
||||
const verificationCode = await createVerificationCode(user, email, 'email');
|
||||
|
||||
await sendVerifyEmailEmail(email, verificationCode);
|
||||
@@ -81,9 +82,11 @@ export const handler: Handlers<Data, FreshContextState> = {
|
||||
successTitle = 'Verify your email!';
|
||||
successMessage = 'You have received a code in your new email. Use it to verify it here.';
|
||||
} else {
|
||||
const code = getFormDataField(formData, 'verification-code');
|
||||
if (isEmailEnabled()) {
|
||||
const code = getFormDataField(formData, 'verification-code');
|
||||
|
||||
await validateVerificationCode(user, email, code, 'email');
|
||||
await validateVerificationCode(user, email, code, 'email');
|
||||
}
|
||||
|
||||
user.email = email;
|
||||
|
||||
|
||||
@@ -3,9 +3,9 @@ import { Handlers, PageProps } from 'fresh/server.ts';
|
||||
import { generateHash, helpEmail, validateEmail } from '/lib/utils/misc.ts';
|
||||
import { PASSWORD_SALT } from '/lib/auth.ts';
|
||||
import { FormField, generateFieldHtml, getFormDataField } from '/lib/form-utils.tsx';
|
||||
import { createUser, createVerificationCode, getUserByEmail } from '/lib/data/user.ts';
|
||||
import { createUser, createVerificationCode, getUserByEmail, updateUser } from '/lib/data/user.ts';
|
||||
import { sendVerifyEmailEmail } from '/lib/providers/brevo.ts';
|
||||
import { isSignupAllowed } from '/lib/config.ts';
|
||||
import { isEmailEnabled, isSignupAllowed } from '/lib/config.ts';
|
||||
import { FreshContextState } from '/lib/types.ts';
|
||||
|
||||
interface Data {
|
||||
@@ -64,9 +64,11 @@ export const handler: Handlers<Data, FreshContextState> = {
|
||||
|
||||
const user = await createUser(email, hashedPassword);
|
||||
|
||||
const verificationCode = await createVerificationCode(user, user.email, 'email');
|
||||
if (isEmailEnabled()) {
|
||||
const verificationCode = await createVerificationCode(user, user.email, 'email');
|
||||
|
||||
await sendVerifyEmailEmail(user.email, verificationCode);
|
||||
await sendVerifyEmailEmail(user.email, verificationCode);
|
||||
}
|
||||
|
||||
return new Response('Signup successful', {
|
||||
status: 303,
|
||||
|
||||
Reference in New Issue
Block a user