generator-jhipster 8.4.0 → 8.6.0

package/dist/generators/bootstrap-application-client/generator.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties } from '../client/support/index.js';
+import { loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties, filterEntitiesAndPropertiesForClient, filterEntitiesForClient, } from '../client/support/index.js';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import clientCommand from '../client/command.js';
@@ -61,6 +61,10 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
     }
     get postPreparingEachEntity() {
         return this.asPostPreparingEachEntityTaskGroup({
+            control({ control }) {
+                control.filterEntitiesAndPropertiesForClient = filterEntitiesAndPropertiesForClient;
+                control.filterEntitiesForClient = filterEntitiesForClient;
+            },
             postPreparingEntity({ entity }) {
                 preparePostEntityClientDerivedProperties(entity);
             },

package/dist/generators/bootstrap-application-server/generator.js

@@ -71,6 +71,7 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
                         ...applicationDockerContainers,
                         ...currentDockerContainers,
                     }),
+                    gatewayRoutes: undefined,
                 });
             },
         });

package/dist/generators/ci-cd/generator.js

@@ -153,7 +153,7 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
             postWriting({ application }) {
                 if (application.ciCdIntegrations.includes('deploy')) {
                     if (application.buildToolMaven) {
-                        createPomStorage(this).addDistributionManagement({
+                        createPomStorage(this, { sortFile: false }).addDistributionManagement({
                             releasesId: application.artifactoryReleasesId,
                             releasesUrl: application.artifactoryReleasesUrl,
                             snapshotsId: application.artifactorySnapshotsId,

package/dist/generators/ci-cd/templates/docker-registry.yml.ejs

@@ -17,7 +17,6 @@
  limitations under the License.
 -%>
 # Documentation at https://docs.docker.com/registry/deploying
-version: '2'
 services:
   registry:
     image: registry:2

package/dist/generators/ci-cd/templates/jenkins/jenkins.yml.ejs

@@ -16,7 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-version: '2'
 services:
   jenkins:
     image: <%- dockerContainers.jenkins %>

package/dist/generators/client/command.js

@@ -42,8 +42,8 @@ const command = {
             prompt: generator => ({
                 type: 'list',
                 message: () => generator.jhipsterConfigWithDefaults.applicationType === APPLICATION_TYPE_MICROSERVICE
-                    ? `Which ${chalk.yellow('*Framework*')} would you like to use as microfrontend?`
-                    : `Which ${chalk.yellow('*Framework*')} would you like to use for the client?`,
+                    ? `Which ${chalk.yellow('*framework*')} would you like to use as microfrontend?`
+                    : `Which ${chalk.yellow('*framework*')} would you like to use for the client?`,
             }),
             choices: [
                 { value: ANGULAR, name: 'Angular' },

package/dist/generators/client/generator.js

@@ -26,7 +26,6 @@ import { testFrameworkTypes, clientFrameworkTypes } from '../../jdl/jhipster/ind
 import { createNeedleCallback } from '../base/support/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import command from './command.js';
-import { filterEntitiesAndPropertiesForClient } from './support/index.js';
 const { ANGULAR, VUE, REACT, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 const { CYPRESS } = testFrameworkTypes;
 export default class JHipsterClientGenerator extends BaseApplicationGenerator {
@@ -189,11 +188,11 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
     }
     get writingEntities() {
         return this.asWritingEntitiesTaskGroup({
-            async writeEnumerationFiles({ application, entities }) {
+            async writeEnumerationFiles({ control, application, entities }) {
                 if (!application.webappEnumerationsDir || ![ANGULAR, VUE, REACT].includes(application.clientFramework)) {
                     return;
                 }
-                for (const entity of filterEntitiesAndPropertiesForClient(entities)) {
+                for (const entity of (control.filterEntitiesAndPropertiesForClient ?? (entities => entities))(entities)) {
                     await addEnumerationFiles.call(this, { application, entity });
                 }
             },

package/dist/generators/client/generators/common/command.js

@@ -0,0 +1,5 @@
+const command = {
+    configs: {},
+    import: [],
+};
+export default command;

package/dist/generators/client/generators/common/generator.js

@@ -0,0 +1,79 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import BaseApplicationGenerator from '../../../base-application/index.js';
+import { clientApplicationTemplatesBlock } from '../../support/index.js';
+export default class CommonGenerator extends BaseApplicationGenerator {
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints();
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnBootstrapApplication();
+        }
+    }
+    get initializing() {
+        return this.asInitializingTaskGroup({
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.INITIALIZING]() {
+        return this.delegateTasksToBlueprint(() => this.initializing);
+    }
+    get prompting() {
+        return this.asPromptingTaskGroup({
+            async promptCommand({ control }) {
+                if (control.existingProject && this.options.askAnswered !== true)
+                    return;
+                await this.promptCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PROMPTING]() {
+        return this.delegateTasksToBlueprint(() => this.prompting);
+    }
+    get loading() {
+        return this.asLoadingTaskGroup({
+            async loadConfig({ application }) {
+                await this.loadCurrentJHipsterCommandConfig(application);
+            },
+        });
+    }
+    get [BaseApplicationGenerator.LOADING]() {
+        return this.delegateTasksToBlueprint(() => this.loading);
+    }
+    get writing() {
+        return this.asWritingTaskGroup({
+            async writing({ application }) {
+                await this.writeFiles({
+                    blocks: [
+                        clientApplicationTemplatesBlock({
+                            templates: ['shared/jhipster/problem-details.ts', 'shared/jhipster/headers.ts'],
+                        }),
+                    ],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+}

package/dist/generators/client/generators/common/index.js

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs

@@ -0,0 +1,57 @@
+<%#
+ Copyright 2013-2024 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+export type HeaderMessage = {
+  /** Success message */
+  alert?: string;
+  /** Error message */
+  error?: string;
+  /** Entity id for success messages. Entity name for error messages. */
+  param?: string;
+};
+
+const headerToString = (headerValue: any): string => {
+  if (Array.isArray(headerValue)) {
+    if (headerValue.length > 1) {
+      throw new Error('Multiple header values found');
+    }
+    headerValue = headerValue[0];
+  }
+  if (typeof headerValue !== 'string') {
+    throw new Error('Header value is not a string');
+  }
+  return headerValue;
+}
+
+const decodeHeaderValue = (headerValue: string): string => decodeURIComponent(headerValue.replace(/\+/g, ' '));
+
+export const getMessageFromHeaders = (headers: Record<string, any>): HeaderMessage => {
+  let alert: string | undefined = undefined;
+  let param: string | undefined = undefined;
+  let error: string | undefined = undefined;
+  for (const [key, value] of Object.entries(headers)) {
+    if (key.toLowerCase().endsWith('-alert')) {
+      alert = headerToString(value);
+    } else if (key.toLowerCase().endsWith('-error')) {
+      error = headerToString(value);
+    } else if (key.toLowerCase().endsWith('-params')) {
+      param = decodeHeaderValue(headerToString(value));
+    }
+  }
+  return { alert, error, param };
+};

package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs

@@ -0,0 +1,51 @@
+<%#
+ Copyright 2013-2024 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+/**
+ * Problem details defined in RFC 7807.
+ * @see https://datatracker.ietf.org/doc/html/rfc7807#section-3.1
+ */
+export type ProblemDetails = {
+  /** A URI reference that identifies the problem type */
+  type: string;
+  /** A short, human-readable summary of the problem type */
+  title: string;
+  /** The HTTP status code */
+  status: number;
+  /** A human-readable explanation specific to this occurrence of the problem */
+  detail: string;
+  /** A URI reference that identifies the specific occurrence of the problem */
+  instance: string;
+}
+
+export const ProblemWithMessageType = 'https://www.jhipster.tech/problem/problem-with-message';
+
+export type FieldErrorVM = { message: string; objectName: string; field: string };
+
+export type ProblemWithMessage = ProblemDetails & {
+  type: typeof ProblemWithMessageType;
+
+  /** Translation message key */
+  message?: string;
+  /** Request path */
+  path?: string;
+  /** Field errors */
+  fieldErrors?: FieldErrorVM[];
+};
+
+export const isProblemWithMessage = (data: any): data is ProblemWithMessage => data?.type === ProblemWithMessageType;

package/dist/generators/client/resources/package.json

@@ -3,14 +3,14 @@
     "dayjs": "1.11.11"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.12.37",
+    "@cypress/code-coverage": "3.12.39",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
-    "cypress": "13.8.1",
+    "cypress": "13.12.0",
     "cypress-audit": "1.1.0",
-    "eslint-plugin-cypress": "3.0.2",
-    "lighthouse": "12.0.0",
-    "nyc": "15.1.0",
-    "swagger-ui-dist": "5.17.2"
+    "eslint-plugin-cypress": "3.3.0",
+    "lighthouse": "12.1.0",
+    "nyc": "17.0.0",
+    "swagger-ui-dist": "5.17.14"
   }
 }

package/dist/generators/client/support/filter-entities.js

@@ -5,7 +5,7 @@
 export const filterEntityPropertiesForClient = (entity) => ({
     ...entity,
     fields: entity.fields.filter(field => !field.skipClient),
-    relationships: entity.relationships.filter(rel => !rel.skipClient && (rel.persistableRelationship || rel.relationshipEagerLoad)),
+    relationships: entity.relationships.filter(rel => !(rel.skipClient ?? !(rel.persistableRelationship || rel.relationshipEagerLoad || rel.otherEntity?.jpaMetamodelFiltering))),
 });
 /**
  * Filter entities for frontend templates.

package/dist/generators/client/templates/.eslintignore.ejs

@@ -17,12 +17,16 @@
  limitations under the License.
 -%>
 node_modules/
-src/main/docker/
-<%= !clientFrameworkVue ? '' : clientTestDir %>jest.conf.js
+<%- dockerServicesDir %>
+<%_ if (!clientFrameworkVue) { _%>
+jest.conf.js
+<%_ } _%>
+<%_ if (!clientFrameworkVue || microfrontend) { _%>
 webpack/
-target/
-build/
-node/
+<%_ } _%>
+<%- temporaryDir %>
 coverage/
+<%_ if (clientFrameworkReact) { _%>
 postcss.config.js
+<%_ } _%>
 <%- this.relativeDir(clientRootDir, clientDistDir) %>

package/dist/generators/client/templates/README.md.jhi.client.ejs

@@ -28,21 +28,28 @@
 _&>
 <%_
 let clientPackageMngrName = 'Npm';
+let clientPackageMngrWrapper = useNpmWrapper ? './npmw' : clientPackageManager;
 let clientPackageMngrAddGlobal = 'install -g';
 let clientPackageMngrAdd = 'install --save --save-exact';
 let clientPackageMngrAddDev = 'install --save-dev --save-exact';
 -%>
 <&_ if (fragment.developmentSection) { -&>
+<%_ if (useNpmWrapper) { _%>
+The build system will install automatically the recommended version of Node and <%= clientPackageManager %>.
+
+We provide a wrapper to launch <%= clientPackageManager %>.
+<%_ } else { _%>
 Before you can build this project, you must install and configure the following dependencies on your machine:
 
-1. [Node.js](https://nodejs.org/): We use Node to run a development web server and build the project.
+1. [Node.js](https://nodejs.org/): Node is used to run a development web server and build the project.
    Depending on your system, you can install Node either from source or as a pre-packaged bundle.
 
 After installing Node, you should be able to run the following command to install development tools.
+<%_ } _%>
 You will only need to run this command when dependencies change in [package.json](package.json).
 
 ```
-<%= clientPackageManager %> install
+<%= clientPackageMngrWrapper %> install
 ```
 
 We use <%= clientPackageManager %> scripts and <&- fragments.customCliSection(' ') &>[Webpack][] as our build system.
@@ -58,14 +65,16 @@ docker compose -f src/main/docker/<%= cacheProviderHazelcast?'hazelcast-manageme
     <%_ if (cacheProviderRedis) { _%>
 
 The cache can also be turned off by adding to the application yaml:
-```
+
+```yaml
 spring:
     cache:
         type: none
 ```
+
 See [here](https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-caching.html#boot-features-caching-provider-none) for details.
 
-**WARNING**: If you using second level hibernate cache and disabling the spring cache, you have to disable the second level hibernate cache as well since they are using
+**WARNING**: If you're using the second level Hibernate cache and disabling the Spring cache, you have to disable the second level Hibernate cache as well since they are using
 the same CacheManager.
     <%_ } _%>
   <%_ } _%>
@@ -80,14 +89,14 @@ auto-refreshes when files change on your hard drive.
   <%_ if (buildToolGradle) { _%>
 ./gradlew -x webapp
   <%_ } _%>
-<%= clientPackageManager %> start
+<%= clientPackageMngrWrapper %> start
 ```
 
 <%= clientPackageMngrName %> is also used to manage CSS and JavaScript dependencies used in this application. You can upgrade dependencies by
-specifying a newer version in [package.json](package.json). You can also run `<%= clientPackageManager %> update` and `<%= clientPackageManager %> install` to manage dependencies.
-Add the `help` flag on any command to see how you can use it. For example, `<%= clientPackageManager %> help update`.
+specifying a newer version in [package.json](package.json). You can also run `<%= clientPackageMngrWrapper %> update` and `<%= clientPackageMngrWrapper %> install` to manage dependencies.
+Add the `help` flag on any command to see how you can use it. For example, `<%= clientPackageMngrWrapper %> help update`.
 
-The `<%= clientPackageManager %> run` command will list all of the scripts available to run for this project.
+The `<%= clientPackageMngrWrapper %> run` command will list all the scripts available to run for this project.
 
 ### PWA Support
 
@@ -121,13 +130,13 @@ ServiceWorkerModule.register('ngsw-worker.js', { enabled: false }),
 For example, to add [Leaflet][] library as a runtime dependency of your application, you would run following command:
 
 ```
-<%= clientPackageManager %> <%= clientPackageMngrAdd %> leaflet
+<%= clientPackageMngrWrapper %> <%= clientPackageMngrAdd %> leaflet
 ```
 
 To benefit from TypeScript type definitions from [DefinitelyTyped][] repository in development, you would run following command:
 
 ```
-<%= clientPackageManager %> <%= clientPackageMngrAddDev %> @types/leaflet
+<%= clientPackageMngrWrapper %> <%= clientPackageMngrAddDev %> @types/leaflet
 ```
 
 Then you would import the JS and CSS files specified in library's installation instructions so that [Webpack][] knows about them:
@@ -159,9 +168,9 @@ Start gateway from source:
 
 ```
 cd gateway
-npm run docker:db:up # start database if necessary
-npm run docker:others:up # start service discovery and authentication service if necessary
-npm run app:start # alias for ./(mvnw|gradlew)
+<%= clientPackageMngrWrapper %> run docker:db:up # start database if necessary
+<%= clientPackageMngrWrapper %> run docker:others:up # start service discovery and authentication service if necessary
+<%= clientPackageMngrWrapper %> run app:start # alias for ./(mvnw|gradlew)
 ```
 
 Microfrontend's `build-watch` script is configured to watch and compile microfrontend's sources and synchronizes with gateway's frontend.
@@ -169,16 +178,16 @@ Start it using:
 
 ```
 cd microfrontend
-npm run docker:db:up # start database if necessary
-npm run build-watch
+<%= clientPackageMngrWrapper %> run docker:db:up # start database if necessary
+<%= clientPackageMngrWrapper %> run build-watch
 ```
 
 It's possible to run microfrontend's frontend standalone using:
 
 ```
 cd microfrontend
-npm run docker:db:up # start database if necessary
-npm watch # alias for `npm start` and `npm run backend:start` in parallel
+<%= clientPackageMngrWrapper %> run docker:db:up # start database if necessary
+<%= clientPackageMngrWrapper %> watch # alias for `npm start` and `npm run backend:start` in parallel
 ```
 
 <%_ } -%>
@@ -190,16 +199,16 @@ npm watch # alias for `npm start` and `npm run backend:start` in parallel
 Unit tests are run by [Jest][]. They're located in [<%= clientTestDir %>](<%= clientTestDir %>) and can be run with:
 
 ```
-<%= clientPackageManager %> test
+<%= clientPackageMngrWrapper %> test
 ```
 
   <%_ if (cypressTests) { _%>
 UI end-to-end tests are powered by [Cypress][]. They're located in [<%= clientTestDir %>cypress](<%= clientTestDir %>cypress)
-and can be run by starting Spring Boot in one terminal (`<% if (buildToolMaven) { %>./mvnw spring-boot:run<% } else { %>./gradlew bootRun<% } %>`) and running the tests (`<%= clientPackageManager %> run e2e`) in a second one.
+and can be run by starting Spring Boot in one terminal (`<% if (buildToolMaven) { %>./mvnw spring-boot:run<% } else { %>./gradlew bootRun<% } %>`) and running the tests (`<%= clientPackageMngrWrapper %> run e2e`) in a second one.
 
 #### Lighthouse audits
 
-You can execute automated [lighthouse audits][https://developers.google.com/web/tools/lighthouse/] with [cypress audits][https://github.com/mfrachet/cypress-audit] by running `<%= clientPackageManager %> run e2e:cypress:audits`.
+You can execute automated [Lighthouse audits](https://developers.google.com/web/tools/lighthouse/) with [cypress-audit](https://github.com/mfrachet/cypress-audit) by running `<%= clientPackageMngrWrapper %> run e2e:cypress:audits`.
 You should only run the audits when your application is packaged with the production profile.
 The lighthouse report is created in <% if (buildToolMaven) { %>`target/cypress/lhreport.html`<% } else { %>`build/cypress/lhreport.html`<% } %>
   <%_ } _%>

package/dist/generators/client/templates/src/main/webapp/index.html.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <!DOCTYPE html>
-<html class="no-js" lang="<%= nativeLanguage %>" dir="ltr">
+<html class="no-js" lang="<%= nativeLanguage %>" dir="<%- nativeLanguageDefinition.rtl ? 'rtl' : 'ltr' %>">
   <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />

package/dist/generators/common/generator.js

@@ -136,6 +136,11 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     // Public API method used by the getter and also by Blueprints
     get preparing() {
         return this.asPreparingTaskGroup({
+            checkSuffix({ application }) {
+                if (application.entitySuffix === application.dtoSuffix) {
+                    throw new Error('Entities cannot be generated as the entity suffix and DTO suffix are equals!');
+                }
+            },
             setupConstants({ application }) {
                 // Make constants available in templates
                 application.MAIN_DIR = MAIN_DIR;

package/dist/generators/common/resources/package.json

@@ -2,8 +2,8 @@
   "devDependencies": {
     "concurrently": "8.2.2",
     "husky": "9.0.11",
-    "lint-staged": "15.2.2",
-    "npm": "10.6.0",
+    "lint-staged": "15.2.7",
+    "npm": "10.8.1",
     "wait-on": "7.2.0"
   }
 }

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/login-page.cy.ts.ejs

@@ -52,7 +52,7 @@ describe('login modal', () => {
     cy.get(passwordLoginSelector).type('a-password');
     cy.get(submitLoginSelector).click();
 <%_ if (!clientFrameworkReact) { _%>
-    cy.wait('@authenticate').then(({ response }) => expect(response.statusCode).to.equal(<% if (authenticationTypeSession) { %>401<% } else { %>400<% } %>));
+    cy.wait('@authenticate').then(({ response }) => expect(response?.statusCode).to.equal(<% if (authenticationTypeSession) { %>401<% } else { %>400<% } %>));
 <%_ } _%>
     // login page should stay open when login fails
     cy.get(titleLoginSelector).should('be.visible');
@@ -62,7 +62,7 @@ describe('login modal', () => {
     cy.get(usernameLoginSelector).type('a-login');
     cy.get(submitLoginSelector).click();
 <%_ if (!clientFrameworkReact) { _%>
-    cy.wait('@authenticate').then(({ response }) => expect(response.statusCode).to.equal(<% if (authenticationTypeSession) { %>401<% } else { %>400<% } %>));
+    cy.wait('@authenticate').then(({ response }) => expect(response?.statusCode).to.equal(<% if (authenticationTypeSession) { %>401<% } else { %>400<% } %>));
     cy.get(errorLoginSelector).should('be.visible');
 <%_ } else { _%>
     // login page should stay open when login fails
@@ -74,7 +74,7 @@ describe('login modal', () => {
     cy.get(usernameLoginSelector).type(username);
     cy.get(passwordLoginSelector).type('bad-password');
     cy.get(submitLoginSelector).click();
-    cy.wait('@authenticate').then(({ response }) => expect(response.statusCode).to.equal(401));
+    cy.wait('@authenticate').then(({ response }) => expect(response?.statusCode).to.equal(401));
     cy.get(errorLoginSelector).should('be.visible');
   });
 
@@ -82,7 +82,7 @@ describe('login modal', () => {
     cy.get(usernameLoginSelector).type(username);
     cy.get(passwordLoginSelector).type(password);
     cy.get(submitLoginSelector).click();
-    cy.wait('@authenticate').then(({ response }) => expect(response.statusCode).to.equal(200));
+    cy.wait('@authenticate').then(({ response }) => expect(response?.statusCode).to.equal(200));
     cy.hash().should('eq', '');
   });
 });

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/password-page.cy.ts.ejs

@@ -80,7 +80,7 @@ describe('/account/password', () => {
     cy.get(newPasswordSelector).type('jhipster');
     cy.get(confirmPasswordSelector).type('jhipster');
     cy.get(submitPasswordSelector).click();
-    cy.wait('@passwordSave').then(({ response }) => expect(response.statusCode).to.equal(400));
+    cy.wait('@passwordSave').then(({ response }) => expect(response?.statusCode).to.equal(400));
   });
 
   it("should be able to update password", () => {
@@ -88,6 +88,6 @@ describe('/account/password', () => {
     cy.get(newPasswordSelector).type(password);
     cy.get(confirmPasswordSelector).type(password);
     cy.get(submitPasswordSelector).click();
-    cy.wait('@passwordSave').then(({ response }) => expect(response.statusCode).to.equal(200));
+    cy.wait('@passwordSave').then(({ response }) => expect(response?.statusCode).to.equal(200));
   });
 });

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/register-page.cy.ts.ejs

@@ -128,6 +128,6 @@ describe('<%= registerPage %>', () => {
     cy.get(firstPasswordRegisterSelector).type('jondoe');
     cy.get(secondPasswordRegisterSelector).type('jondoe');
     cy.get(submitRegisterSelector).click();
-    cy.wait('@registerSave').then(({ response }) => expect(response.statusCode).to.equal(201));
+    cy.wait('@registerSave').then(({ response }) => expect(response?.statusCode).to.equal(201));
   });
 });

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/reset-password-page.cy.ts.ejs

@@ -54,6 +54,6 @@ describe('forgot your password', () => {
   it('should be able to init reset password', () => {
     cy.get(emailResetPasswordSelector).type('user@gmail.com');
     cy.get(submitInitResetPasswordSelector).click({ force: true });
-    cy.wait('@initResetPassword').then(({ response }) => expect(response.statusCode).to.equal(200));
+    cy.wait('@initResetPassword').then(({ response }) => expect(response?.statusCode).to.equal(200));
   });
 });