Fix backend e2e tests

jhipster · Jun 3, 2021 · 2917167 · 2917167
1 parent f997cde
commit 2917167
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/generators/server/files.js b/generators/server/files.js
@@ -34,7 +34,6 @@ const serverFiles = {
                 'src/security/decorators/auth-user.decorator.ts',
                 'src/security/decorators/roles.decorator.ts',
                 'src/security/index.ts',
-                'src/security/hash.transformer.ts',
                 'src/client/header-util.ts',
                 'src/client/interceptors/logging.interceptor.ts',
                 'src/service/auth.service.ts',

diff --git a/generators/server/templates/server/package.json.ejs b/generators/server/templates/server/package.json.ejs
@@ -37,7 +37,9 @@
     <%_ } _%>
     "@nestjs/swagger": "3.1.0",
     "@nestjs/typeorm": "7.1.4",
+    <%_ if (authenticationType === 'jwt') { _%>
     "bcrypt": "5.0.1",
+    <%_ } _%>
     "class-transformer": "0.3.1",
     "class-validator": "0.13.1",
     "cloud-config-client": "1.4.2",

diff --git a/generators/server/templates/server/src/domain/user.entity.ts.ejs b/generators/server/templates/server/src/domain/user.entity.ts.ejs
@@ -1,8 +1,10 @@
 import { Authority } from './authority.entity';
-import { Entity, Column, BeforeInsert, BeforeUpdate <%_ if (databaseType !== 'mongodb') { _%>, ManyToMany, JoinTable <%_ } _%> } from 'typeorm';
+import { Entity, Column<%_ if (authenticationType === 'jwt') { _%>, BeforeInsert, BeforeUpdate<%_ } _%> <%_ if (databaseType !== 'mongodb') { _%>, ManyToMany, JoinTable <%_ } _%> } from 'typeorm';
 import { BaseEntity } from './base/base.entity';
+<%_ if (authenticationType === 'jwt') { _%>
 import * as bcrypt from 'bcrypt';
 import { config } from '../config';
+<% } %>
 
 @Entity('nhi_user')
 export class User extends BaseEntity {
@@ -42,11 +44,13 @@ export class User extends BaseEntity {
   @Column({ nullable: true })
   resetDate?: Date;
 
+<%_ if (authenticationType === 'jwt') { _%>
   @BeforeInsert()
   @BeforeUpdate()
   async hashPassword?(): Promise<void> {
     if (this.password) {
       this.password = await bcrypt.hash(this.password, config.get('jhipster.security.authentication.jwt.hash-salt-or-rounds'));
     }
   }
+<%_ } _%>
 }
diff --git a/generators/server/templates/server/src/security/hash.transformer.ts.ejs b/generators/server/templates/server/src/security/hash.transformer.ts.ejs