Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bad user validation

Browse Source
This commit is contained in:
Madeline 2022-10-27 23:12:48 +11:00
parent 906d51b454
commit c00c70985c
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,6 +130,7 @@ router.patch(
} }
user.assign(body); user.assign(body);
user.validate();
await user.save(); await user.save();
// @ts-ignore // @ts-ignore

17
src/util/entities/User.ts
View File

@ -196,15 +196,15 @@ export class User extends BaseClass {
@Column({ type: "simple-json", select: false }) @Column({ type: "simple-json", select: false })
extended_settings: string; extended_settings: string;
@BeforeUpdate() // @BeforeUpdate()
_update_validator() { this.validate(true); } // _update_validator() { this.validate(true); }
@BeforeInsert() // @BeforeInsert()
_insert_validator() { this.validate(false); } // _insert_validator() { this.validate(false); }
validate(update: boolean = false) { validate(/*update: boolean = false*/) {
// inserting or email provided in update // inserting or email provided in update
if (!update || this.email) { if (/*!update || */this.email) {
this.email = adjustEmail(this.email); this.email = adjustEmail(this.email);
if (!this.email) if (!this.email)
throw FieldErrors({ throw FieldErrors({
@ -217,7 +217,7 @@ export class User extends BaseClass {
} }
// inserting or discrim provided // inserting or discrim provided
if (!update || this.discriminator) { if (/*!update ||*/ this.discriminator) {
const discrim = Number(this.discriminator); const discrim = Number(this.discriminator);
if (this.discriminator.length > 4) if (this.discriminator.length > 4)
throw FieldErrors({ throw FieldErrors({
@ -243,7 +243,7 @@ export class User extends BaseClass {
this.discriminator = discrim.toString().padStart(4, "0"); this.discriminator = discrim.toString().padStart(4, "0");
} }
if (!update || this.username) if (/*!update ||*/ this.username)
if (BannedWords.find(this.username)) if (BannedWords.find(this.username))
throw FieldErrors({ throw FieldErrors({
username: { message: "Bad username", code: "INVALID_USERNAME" }, username: { message: "Bad username", code: "INVALID_USERNAME" },
@ -375,6 +375,7 @@ export class User extends BaseClass {
fingerprints: [], fingerprints: [],
}); });
user.validate();
await user.save(); await user.save();
setImmediate(async () => { setImmediate(async () => {