diff options
| author | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2023-08-12 15:36:29 +1000 |
|---|---|---|
| committer | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2023-08-12 15:36:29 +1000 |
| commit | d18584f8e9f9423f9d72d837a36a0c3cad6e8d10 (patch) | |
| tree | 7dae8a74764d38289985309e54f5d359716ef685 /src/api | |
| parent | remove default welcome screen text (diff) | |
| download | server-d18584f8e9f9423f9d72d837a36a0c3cad6e8d10.tar.xz | |
Refactor email sending + remove email verification if mail sending is not set up
Diffstat (limited to 'src/api')
| -rw-r--r-- | src/api/routes/auth/login.ts | 8 | ||||
| -rw-r--r-- | src/api/routes/auth/register.ts | 5 | ||||
| -rw-r--r-- | src/api/routes/users/@me/index.ts | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/api/routes/auth/login.ts b/src/api/routes/auth/login.ts index d3fc1fb4..cc5a2063 100644 --- a/src/api/routes/auth/login.ts +++ b/src/api/routes/auth/login.ts @@ -18,14 +18,13 @@ import { getIpAdress, route, verifyCaptcha } from "@spacebar/api"; import { - adjustEmail, Config, FieldErrors, - generateToken, - generateWebAuthnTicket, LoginSchema, User, WebAuthn, + generateToken, + generateWebAuthnTicket, } from "@spacebar/util"; import bcrypt from "bcrypt"; import crypto from "crypto"; @@ -50,7 +49,6 @@ router.post( async (req: Request, res: Response) => { const { login, password, captcha_key, undelete } = req.body as LoginSchema; - const email = adjustEmail(login); const config = Config.get(); @@ -76,7 +74,7 @@ router.post( } const user = await User.findOneOrFail({ - where: [{ phone: login }, { email: email }], + where: [{ phone: login }, { email: login }], select: [ "data", "id", diff --git a/src/api/routes/auth/register.ts b/src/api/routes/auth/register.ts index c92ebfe0..de1cbd3d 100644 --- a/src/api/routes/auth/register.ts +++ b/src/api/routes/auth/register.ts @@ -30,7 +30,6 @@ import { RegisterSchema, User, ValidRegistrationToken, - adjustEmail, generateToken, } from "@spacebar/util"; import bcrypt from "bcrypt"; @@ -76,9 +75,6 @@ router.post( } } - // email will be slightly modified version of the user supplied email -> e.g. protection against GMail Trick - const email = adjustEmail(body.email); - // check if registration is allowed if (!regTokenUsed && !register.allowNewRegistration) { throw FieldErrors({ @@ -161,6 +157,7 @@ router.post( // TODO: gift_code_sku_id? // TODO: check password strength + const email = body.email; if (email) { // replace all dots and chars after +, if its a gmail.com email if (!email) { diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts index 8fe86265..ad11a428 100644 --- a/src/api/routes/users/@me/index.ts +++ b/src/api/routes/users/@me/index.ts @@ -18,7 +18,6 @@ import { route } from "@spacebar/api"; import { - adjustEmail, Config, emitEvent, FieldErrors, @@ -111,7 +110,6 @@ router.patch( } if (body.email) { - body.email = adjustEmail(body.email); if (!body.email && Config.get().register.email.required) throw FieldErrors({ email: { |