Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-26 04:03:03 +01:00
Code Issues Releases Activity

Merge branch 'fix/claim_accounts' into slowcord

Browse Source
This commit is contained in:
Madeline 2022-02-18 10:47:53 +11:00
commit 93e3f069b5
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/assets/schemas.json
View File

@ -7039,6 +7039,9 @@
}, },
"code": { "code": {
"type": "string" "type": "string"
},
"email": {
"type": "string"
} }
}, },
"definitions": { "definitions": {

12
api/src/routes/users/@me/index.ts
View File

@ -1,5 +1,5 @@
import { Router, Request, Response } from "express"; import { Router, Request, Response } from "express";
import { User, PrivateUserProjection, emitEvent, UserUpdateEvent, handleFile, FieldErrors } from "@fosscord/util"; import { User, PrivateUserProjection, emitEvent, UserUpdateEvent, handleFile, FieldErrors, adjustEmail } from "@fosscord/util";
import { route } from "@fosscord/api"; import { route } from "@fosscord/api";
import bcrypt from "bcrypt"; import bcrypt from "bcrypt";
@ -21,6 +21,7 @@ export interface UserModifySchema {
password?: string; password?: string;
new_password?: string; new_password?: string;
code?: string; code?: string;
email?: string;
} }
router.get("/", route({}), async (req: Request, res: Response) => { router.get("/", route({}), async (req: Request, res: Response) => {
@ -46,6 +47,12 @@ router.patch("/", route({ body: "UserModifySchema" }), async (req: Request, res:
} }
} }
if (body.email) {
body.email = adjustEmail(body.email);
if (!body.email)
throw FieldErrors({ email: { message: req.t("auth:register.EMAIL_INVALID"), code: "EMAIL_INVALID" } });
}
user.assign(body); user.assign(body);
if (body.new_password) { if (body.new_password) {
@ -58,7 +65,8 @@ router.patch("/", route({ body: "UserModifySchema" }), async (req: Request, res:
} }
var check_username = body?.username?.replace(/\s/g, ''); var check_username = body?.username?.replace(/\s/g, '');
if(!check_username) { //claiming an account does not provide username so check if username in body before throw
if (!check_username && body.username) {
throw FieldErrors({ throw FieldErrors({
username: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") } username: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") }
}); });