ashpie/swaf
1
0
Fork 0
Code Issues 22 Pull Requests Releases 11 Wiki Activity

Move EMAIL_REGEXP to Validator

Browse Source
This commit is contained in:
Alice Gaudon 2020-09-06 10:21:47 +02:00
parent 27bd7400e2
commit f6b326f802
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/auth/models/MagicLink.ts
View File

@ -1,12 +1,13 @@
import crypto from "crypto"; import crypto from "crypto";
import config from "config"; import config from "config";
import Model, {EMAIL_REGEX} from "../../db/Model"; import Model from "../../db/Model";
import AuthProof from "../AuthProof"; import AuthProof from "../AuthProof";
import User from "./User"; import User from "./User";
import argon2 from "argon2"; import argon2 from "argon2";
import {WhereTest} from "../../db/ModelQuery"; import {WhereTest} from "../../db/ModelQuery";
import UserEmail from "./UserEmail"; import UserEmail from "./UserEmail";
import ModelFactory from "../../db/ModelFactory"; import ModelFactory from "../../db/ModelFactory";
import {EMAIL_REGEX} from "../../db/Validator";
export default class MagicLink extends Model implements AuthProof<User> { export default class MagicLink extends Model implements AuthProof<User> {
public static async bySessionID(sessionID: string, actionType?: string | string[]): Promise<MagicLink | null> { public static async bySessionID(sessionID: string, actionType?: string | string[]): Promise<MagicLink | null> {

2
src/auth/models/UserEmail.ts
View File

@ -1,7 +1,7 @@
import User from "./User"; import User from "./User";
import Model, {EMAIL_REGEX} from "../../db/Model";
import {OneModelRelation} from "../../db/ModelRelation"; import {OneModelRelation} from "../../db/ModelRelation";
import ModelFactory from "../../db/ModelFactory"; import ModelFactory from "../../db/ModelFactory";
import {EMAIL_REGEX} from "../../db/Validator";
export default class UserEmail extends Model { export default class UserEmail extends Model {
public readonly id?: number = undefined; public readonly id?: number = undefined;

2
src/db/Model.ts
View File

@ -222,5 +222,3 @@ export default abstract class Model {
}); });
} }
} }
export const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+$/;

2
src/db/Validator.ts
View File

@ -4,6 +4,8 @@ import {Connection} from "mysql";
import {Type} from "../Utils"; import {Type} from "../Utils";
import {ServerError} from "../HttpError"; import {ServerError} from "../HttpError";
export const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+$/;
export default class Validator<T> { export default class Validator<T> {
private readonly steps: ValidationStep<T>[] = []; private readonly steps: ValidationStep<T>[] = [];
private readonly validationAttributes: string[] = []; private readonly validationAttributes: string[] = [];