fix(user): Add check user name and email on update profile, create an…

…d update user
rucken · Dec 9, 2018 · ab770a7 · ab770a7
1 parent c9d6d3c
commit ab770a7
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 50 deletions.
diff --git a/src/libs/auth/services/auth.service.ts b/src/libs/auth/services/auth.service.ts
@@ -40,7 +40,7 @@ export class AuthService {
     if (this.coreConfig.port) {
       this.localUri = `http://${this.coreConfig.domain}:${
         this.coreConfig.port
-      }`;
+        }`;
     } else {
       this.localUri = `http://${this.coreConfig.domain}`;
     }
@@ -69,31 +69,13 @@ export class AuthService {
     } catch (error) {
       throw new BadRequestException('Error in load groups');
     }
-    if (options.email) {
-      let userOfEmail: { user };
-      try {
-        userOfEmail = await this.usersService.findByEmail(options);
-      } catch (error) {
-        userOfEmail = undefined;
-      }
-      if (userOfEmail) {
-        throw new ConflictException(
-          `User with email "${options.email}" is exists`
-        );
-      }
-    }
-    if (options.username) {
-      let userOfUsername: { user };
-      try {
-        userOfUsername = await this.usersService.findByUserName(options);
-      } catch (error) {
-        userOfUsername = undefined;
-      }
-      if (userOfUsername) {
-        throw new ConflictException(
-          `User with username "${options.username}" is exists`
-        );
-      }
+    try {
+      await this.usersService.assertUsernameAndEmail({
+        email: options.email,
+        username: options.username
+      });
+    } catch (error) {
+      throw error;
     }
     const group = this.groupsService.getGroupByName({ name: 'user' });
     const newUser = await plainToClass(User, options).setPassword(
@@ -110,7 +92,7 @@ export class AuthService {
     ];
     const redirect_uri: string = `${
       this.fbConfig.login_dialog_uri
-    }?${queryParams.join('&')}`.replace('{host}', host);
+      }?${queryParams.join('&')}`.replace('{host}', host);
     Logger.log(redirect_uri, AuthService.name + ':requestFacebookRedirectUri');
     return {
       redirect_uri
@@ -167,9 +149,9 @@ export class AuthService {
       );
       throw new BadRequestException(
         error &&
-        error.response &&
-        error.response.data &&
-        error.response.data.error
+          error.response &&
+          error.response.data &&
+          error.response.data.error
           ? error.response.data.error.message
           : error.message
       );
@@ -184,7 +166,7 @@ export class AuthService {
     ];
     const redirect_uri: string = `${
       this.googlePlusConfig.login_dialog_uri
-    }?${queryParams.join('&')}`.replace('{host}', host);
+      }?${queryParams.join('&')}`.replace('{host}', host);
     Logger.log(redirect_uri, AuthService.name + ':requestGoogleRedirectUri');
     return {
       redirect_uri

diff --git a/src/libs/core/entities/user.entity.ts b/src/libs/core/entities/user.entity.ts
@@ -38,7 +38,6 @@ export class User {
 
   @Column({ length: 150, unique: true })
   @MaxLength(150)
-  @IsOptional()
   username: string = undefined;
 
   @Column({ name: 'first_name', length: 30, nullable: true })

diff --git a/src/libs/core/migrations/1524197725191-Init.ts b/src/libs/core/migrations/1524197725191-Init.ts
@@ -351,5 +351,5 @@ export class Init1524197725191 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<any> {}
+  public async down(queryRunner: QueryRunner): Promise<any> { }
 }
diff --git a/src/libs/core/services/account.service.ts b/src/libs/core/services/account.service.ts
@@ -1,29 +1,30 @@
 import { Inject, Injectable, MethodNotAllowedException } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
 import { plainToClassFromExist } from 'class-transformer';
-import { Repository } from 'typeorm';
 import { CORE_CONFIG_TOKEN } from '../configs/core.config';
 import { User } from '../entities/user.entity';
 import { ICoreConfig } from '../interfaces/core-config.interface';
+import { UsersService } from './users.service';
 
 @Injectable()
 export class AccountService {
   constructor(
     @Inject(CORE_CONFIG_TOKEN) private readonly coreConfig: ICoreConfig,
-    @InjectRepository(User) private readonly usersRepository: Repository<User>
-  ) {}
+    private readonly usersService: UsersService
+  ) { }
   async update(options: { id: number; user: User }) {
     if (this.coreConfig.demo) {
       throw new MethodNotAllowedException('Not allowed in DEMO mode');
     }
     try {
-      let user = await this.usersRepository.findOneOrFail(options.id, {
-        relations: ['groups', 'groups.permissions']
+      await this.usersService.assertUsernameAndEmail({
+        id: options.id,
+        email: options.user.email,
+        username: options.user.username
       });
+      let { user } = await this.usersService.findById(options);
       user = plainToClassFromExist(user, options.user);
       await user.setPassword(options.user.password);
-      user = await this.usersRepository.save(user);
-      return user;
+      return await this.usersService.update({ id: options.id, item: user });
     } catch (error) {
       throw error;
     }

diff --git a/src/libs/core/services/users.service.ts b/src/libs/core/services/users.service.ts
@@ -1,9 +1,4 @@
-import {
-  Inject,
-  Injectable,
-  MethodNotAllowedException,
-  NotFoundException
-} from '@nestjs/common';
+import { ConflictException, Inject, Injectable, MethodNotAllowedException, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { CORE_CONFIG_TOKEN } from '../configs/core.config';
@@ -15,12 +10,45 @@ export class UsersService {
   constructor(
     @Inject(CORE_CONFIG_TOKEN) private readonly coreConfig: ICoreConfig,
     @InjectRepository(User) private readonly repository: Repository<User>
-  ) {}
+  ) { }
+  async assertUsernameAndEmail(options: { id?: number, email: string, username: string }) {
+    if (options.email) {
+      let userOfEmail: { user };
+      try {
+        userOfEmail = await this.findByEmail(options);
+      } catch (error) {
+        userOfEmail = undefined;
+      }
+      if (userOfEmail && userOfEmail.user.id !== options.id) {
+        throw new ConflictException(
+          `User with email "${options.email}" is exists`
+        );
+      }
+    }
+    if (options.username) {
+      let userOfUsername: { user };
+      try {
+        userOfUsername = await this.findByUserName(options);
+      } catch (error) {
+        userOfUsername = undefined;
+      }
+      if (userOfUsername && userOfUsername.user.id !== options.id) {
+        throw new ConflictException(
+          `User with username "${options.username}" is exists`
+        );
+      }
+    }
+  }
   async create(options: { item: User }) {
     if (options.item.isSuperuser && this.coreConfig.demo) {
       throw new MethodNotAllowedException('Not allowed in DEMO mode');
     }
     try {
+      await this.assertUsernameAndEmail({
+        id: options.item.id,
+        email: options.item.email,
+        username: options.item.username
+      });
       options.item = await this.repository.save(options.item);
       const { user } = await this.findById({ id: options.item.id });
       return { user };
@@ -32,9 +60,14 @@ export class UsersService {
     if (this.coreConfig.demo) {
       throw new MethodNotAllowedException('Not allowed in DEMO mode');
     }
-    options.item.lastLogin = new Date();
-    options.item.id = options.id;
     try {
+      await this.assertUsernameAndEmail({
+        id: options.item.id,
+        email: options.item.email,
+        username: options.item.username
+      });
+      options.item.lastLogin = new Date();
+      options.item.id = options.id;
       options.item = await this.repository.save(options.item);
       const { user } = await this.findById({ id: options.item.id });
       return { user };