heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Refactor

Browse source
This commit is contained in:
syuilo 2018-04-02 04:52:11 +09:00
parent 86e1ff6a6f
commit 6b6adeaa68
1 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/models/user.ts
View file

@ -15,30 +15,6 @@ User.createIndex('account.token');
export default User; export default User;
export function validateUsername(username: string): boolean {
return typeof username == 'string' && /^[a-zA-Z0-9\-]{3,20}$/.test(username);
}
export function validatePassword(password: string): boolean {
return typeof password == 'string' && password != '';
}
export function isValidName(name: string): boolean {
return typeof name == 'string' && name.length < 30 && name.trim() != '';
}
export function isValidDescription(description: string): boolean {
return typeof description == 'string' && description.length < 500 && description.trim() != '';
}
export function isValidLocation(location: string): boolean {
return typeof location == 'string' && location.length < 50 && location.trim() != '';
}
export function isValidBirthday(birthday: string): boolean {
return typeof birthday == 'string' && /^([0-9]{4})\-([0-9]{2})-([0-9]{2})$/.test(birthday);
}
type IUserBase = { type IUserBase = {
_id: mongo.ObjectID; _id: mongo.ObjectID;
createdAt: Date; createdAt: Date;
@ -61,8 +37,6 @@ type IUserBase = {
hostLower: string; hostLower: string;
}; };
export type IUser = ILocalUser | IRemoteUser;
export interface ILocalUser extends IUserBase { export interface ILocalUser extends IUserBase {
host: null; host: null;
account: { account: {
@ -108,12 +82,38 @@ export interface IRemoteUser extends IUserBase {
}; };
} }
export type IUser = ILocalUser | IRemoteUser;
export const isLocalUser = (user: any): user is ILocalUser => export const isLocalUser = (user: any): user is ILocalUser =>
user.host === null; user.host === null;
export const isRemoteUser = (user: any): user is IRemoteUser => export const isRemoteUser = (user: any): user is IRemoteUser =>
!isLocalUser(user); !isLocalUser(user);
export function validateUsername(username: string): boolean {
return typeof username == 'string' && /^[a-zA-Z0-9\-]{3,20}$/.test(username);
}
export function validatePassword(password: string): boolean {
return typeof password == 'string' && password != '';
}
export function isValidName(name: string): boolean {
return typeof name == 'string' && name.length < 30 && name.trim() != '';
}
export function isValidDescription(description: string): boolean {
return typeof description == 'string' && description.length < 500 && description.trim() != '';
}
export function isValidLocation(location: string): boolean {
return typeof location == 'string' && location.length < 50 && location.trim() != '';
}
export function isValidBirthday(birthday: string): boolean {
return typeof birthday == 'string' && /^([0-9]{4})\-([0-9]{2})-([0-9]{2})$/.test(birthday);
}
export function init(user): IUser { export function init(user): IUser {
user._id = new mongo.ObjectID(user._id); user._id = new mongo.ObjectID(user._id);
user.avatarId = new mongo.ObjectID(user.avatarId); user.avatarId = new mongo.ObjectID(user.avatarId);