try fix auth react error

generators/client/templates/angular/test/e2e/administration.spec.ts.ejs

@@ -18,8 +18,7 @@
 
 6.8.0 CHANGED
 -%>
-import { browser, element, by, ExpectedConditions as ec } from 'protractor';
-
+import { browser, <%_ if (!skipUserManagement) { _%> element, by, <%_ } _%> ExpectedConditions as ec } from 'protractor';
 import { NavBarPage, SignInPage } from '../page-objects/jhi-page-objects';
 <%_
 let elementGetter = `getText()`;
@@ -28,7 +27,9 @@ if (enableTranslation) {
 }
 _%>
 
+<%_ if (!skipUserManagement) { _%>
 const expect = chai.expect;
+<%_ } _%>
 
 describe('administration', () => {
     let navBarPage: NavBarPage;

generators/entity-server/templates/server/e2e/entity.e2e-spec.ts.ejs

@@ -21,7 +21,7 @@ describe('<%= entityClass %> Controller', () => {
         findAndCount: (): any => [entityMock, 0],
         save: (): any => entityMock,
         update: (): any => entityMock,
-        delete: (): any => entityMock
+        deleteById: (): any => entityMock
     };
 
 

generators/entity-server/templates/server/src/service/entity.service.ts.ejs

@@ -1,4 +1,4 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable, HttpException, HttpStatus, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { FindManyOptions, FindOneOptions } from 'typeorm';
 import  <%= entityClass %>  from '../domain/<%= entityFileName %>.entity';
@@ -12,7 +12,7 @@ for (idx in relationships) {
  const relationshipFieldName = relationships[idx].relationshipFieldName;
  const relationshipFieldNamePlural = relationships[idx].relationshipFieldNamePlural;
  const ownerSide = relationships[idx].ownerSide;
- 
+
    if (relationshipType === 'many-to-one') { _%>
     relationshipNames.push('<%-relationshipFieldName %>');
    <%_ } else if (relationshipType === 'many-to-many' && ownerSide === true) { _%>
@@ -49,8 +49,13 @@ export class <%= entityClass %>Service {
         return await this.save(<%= asEntity(entityInstance) %>);
       }
 
-      async delete(<%= asEntity(entityInstance) %>: <%= entityClass %>): Promise<<%= entityClass %> | undefined> {
-        return await this.<%= asEntity(entityInstance) %>Repository.remove(<%= asEntity(entityInstance) %>);
+      async deleteById(id: string): Promise<void | undefined> {
+        await this.<%= asEntity(entityInstance) %>Repository.delete(id);
+        const entityFind = await this.findById(id);
+        if (entityFind) {
+          throw new HttpException('Error, entity not deleted!', HttpStatus.NOT_FOUND);
+        }
+        return;
       }
 
 }

generators/entity-server/templates/server/src/web/rest/entity.controller.ts.ejs

@@ -87,9 +87,8 @@ export class <%= entityClass %>Controller {
     status: 204,
     description: 'The record has been successfully deleted.',
   })
-  async remove(@Req() req: Request, @Param('id') id: string): Promise<<%= entityClass %>>  {
+  async deleteById(@Req() req: Request, @Param('id') id: string): Promise<void>  {
     HeaderUtil.addEntityDeletedHeaders(req.res, '<%= entityClass %>', id);
-    const toDelete = await this.<%= asEntity(entityInstance) %>Service.findById(id);
-    return await this.<%= asEntity(entityInstance) %>Service.delete(toDelete);
+    return await this.<%= asEntity(entityInstance) %>Service.deleteById(id);
   }
 }

generators/server/templates/server/src/migrations/1570200490072-SeedUsersRoles.ts.ejs

@@ -63,7 +63,7 @@ export class SeedUsersRoles1570200490072 implements MigrationInterface {
   };
 
   <%_ } _%>
-
+  // eslint-disable-next-line
   public async up(queryRunner: QueryRunner): Promise<any> {
 
     const authorityRepository = getRepository("nhi_authority");

generators/server/templates/server/src/service/auth.service.ts.ejs

@@ -59,6 +59,14 @@ export class AuthService {
     return user;
   }
 
+  async getAccount(userId: string): Promise<User | undefined> {
+    const user: any = await this.findUserWithAuthById(userId);
+    if (!user) {
+       return;
+    }
+    return user;
+  }
+
   async changePassword(userLogin: string, currentClearTextPassword: string, newPassword: string): Promise<void> {
     const userFind = await this.userService.findByfields({ where: { login: userLogin } });
     if (!userFind) {
@@ -119,6 +127,13 @@ export class AuthService {
         return loginUser;
       }
 
+   getAccount(user: User): any {
+    if (!user) {
+       return;
+    }
+    return user;
+   }
+
   <%_ } _%>
 
 }

generators/server/templates/server/src/web/rest/account.controller.ts.ejs

@@ -65,7 +65,7 @@ export class AccountController {
   })
   async getAccount(@Req() req: Request): Promise<any> {
     const user: any = req.user;
-    return await this.authService.findUserWithAuthById(user.id);
+    return await this.authService.getAccount(user.id);
   }
 
   @Post('/account')
@@ -130,13 +130,9 @@ export class AccountController {
     status: 200,
     description: 'User retrieved',
   })
-  getAccount(@Req() req: any): any | void {
+  getAccount(@Req() req: any): any {
     const user: User = req.session.user;
-    if (user) {
-      return user;
-    }
-    return ;
-
+    return this.authService.getAccount(user);
   }
 
   <%_ } _%>

generators/server/templates/server/src/web/rest/user.oauth2.controller.ts.ejs

@@ -64,8 +64,9 @@ export class UserOauth2Controller {
     if (req.session && req.session.user) {
       idTokenFromSession = req.session.user.idToken;
       req.session.destroy();
+      return { idToken: idTokenFromSession, logoutUrl: oauth2Config.logoutUrl };
     }
-    return { idToken: idTokenFromSession, logoutUrl: oauth2Config.logoutUrl };
+    return;
   }
 
 }

test-integration/07-run-generated-app-sample.sh

@@ -13,7 +13,7 @@ launchCurlOrProtractor() {
     if [ "$1" = "build" ]; then
       sleep 10
     else
-      sleep 130
+      sleep 150
     fi
     retryCount=1
     maxRetry=10

test-integration/samples/monolith-client-auth-i18n-template-jdl/monolith-client-auth-i18n-template-jdl.jdl

@@ -35,7 +35,7 @@ entity BloodPressure {
 }
 entity Weight {
   timestamp ZonedDateTime required
-  weight Double
+  weight Double required
 }
 entity Points {
   date LocalDate required
@@ -63,3 +63,5 @@ relationship ManyToOne {
   Points{user(login)} to User
 }
 
+paginate BloodPressure, Weight with infinite-scroll
+paginate Points with pagination