Merge branch 'dev' into feature/12-jwt-creation
This commit is contained in:
		@@ -1,5 +1,5 @@
 | 
			
		||||
import * as argon2 from "argon2";
 | 
			
		||||
import { IsEmail, IsOptional, IsPhoneNumber, IsString, IsUUID } from 'class-validator';
 | 
			
		||||
import { IsEmail, IsOptional, IsPhoneNumber, IsString } from 'class-validator';
 | 
			
		||||
import { getConnectionManager } from 'typeorm';
 | 
			
		||||
import * as uuid from 'uuid';
 | 
			
		||||
import { UserGroupNotFoundError, UsernameOrEmailNeededError } from '../../errors/UserErrors';
 | 
			
		||||
@@ -26,8 +26,6 @@ export class CreateUser {
 | 
			
		||||
    email?: string;
 | 
			
		||||
    @IsOptional()
 | 
			
		||||
    groupId?: number[] | number
 | 
			
		||||
    @IsUUID("4")
 | 
			
		||||
    uuid: string;
 | 
			
		||||
 | 
			
		||||
    public async toUser(): Promise<User> {
 | 
			
		||||
        let newUser: User = new User();
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user