generator-jhipster 7.1.0 → 7.4.0

package/generators/common/templates/{README.md.ejs → README.md.jhi.ejs}

@@ -16,6 +16,20 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+<%#
+ This is a fragment root file, it will be merge fragments if available.
+ EJS fragments will process % delimiter tags in template rendering and & delimiter tags in the merge process.
+-%>
+<&_
+ // Register sections and max allowed fragments, 0 for unlimited.
+ fragments.registerSections({
+   developmentSection: 0,
+   productionSection: 0,
+   testingSection: 0,
+   othersSection: 0,
+   referenceSection: 0,
+ });
+_&>
 # <%= baseName %>
 
 <%_
@@ -29,8 +43,6 @@ This application was generated using JHipster <%= jhipsterVersion %>, you can fi
 <%_ if (applicationTypeGateway || applicationTypeMicroservice) { _%>
 
 This is a "<%= applicationType %>" application intended to be part of a microservice architecture, please refer to the [Doing microservices with JHipster][] page of the documentation for more information.
-<%_ } _%>
-<%_ if (applicationTypeGateway || applicationTypeMicroservice) { _%>
 This application is configured for Service Discovery and Configuration with <% if (serviceDiscoveryEureka) { %>the JHipster-Registry<% } %><% if (serviceDiscoveryConsul) { %>Consul<% } %>. On launch, it will refuse to start if it is not able to connect to <% if (serviceDiscoveryEureka) { %>the JHipster-Registry at [http://localhost:8761](http://localhost:8761)<% } %><% if (serviceDiscoveryConsul) { %>Consul at [http://localhost:8500](http://localhost:8500)<% } %>.<% if (serviceDiscoveryEureka) { %> For more information, read our documentation on [Service Discovery and Configuration with the JHipster-Registry][].<% } %><% if (serviceDiscoveryConsul) { %> For more information, read our documentation on [Service Discovery and Configuration with Consul][].<% } %>
 <%_ } _%>
 
@@ -42,67 +54,21 @@ To start your application in the dev profile, run:
 ```
 <% if (buildToolMaven) { %>./mvnw<% } %><% if (buildToolGradle) { %>./gradlew<% } %>
 ```
-<%_ } _%>
-
-<%_ if (!skipClient) { _%>
-Before you can build this project, you must install and configure the following dependencies on your machine:
-
-1. [Node.js][]: We use Node 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
-```
-
-We use <%= clientPackageManager %> scripts and <% if (clientFrameworkAngular) { %>[Angular CLI][] with <% } %>[Webpack][] as our build system.
 
-<%_ if (cacheProviderRedis || cacheProviderHazelcast || cacheProviderMemcached) { _%>
-If you are using <%= cacheProvider %> as a cache, you will have to launch a cache server.
-To start your cache server, run:
-
-```
-docker-compose -f src/main/docker/<%= cacheProviderHazelcast?'hazelcast-management-center':cacheProvider %>.yml up -d
-```
-
-<%_ if (cacheProviderRedis) { _%>
-
-The cache can also be turned off by adding to the application 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.
+For further instructions on how to develop with JHipster, have a look at [Using JHipster in development][].
 
-**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
-the same CacheManager.
-    <%_ } _%>
 <%_ } _%>
+<&- fragments.developmentSection() &>
+### JHipster Control Center
 
-Run the following commands in two separate terminals to create a blissful development experience where your browser
-auto-refreshes when files change on your hard drive.
+JHipster Control Center can help you manage and control your application(s). You can start a local control center server (accessible on http://localhost:7419) with:
 
 ```
-<%_ if (buildToolMaven) { _%>
-./mvnw
-<%_ } _%>
-<%_ if (buildToolGradle) { _%>
-./gradlew -x webapp
-<%_ } _%>
-<%= clientPackageManager %> start
+docker-compose -f src/main/docker/jhipster-control-center.yml up
 ```
 
-<%= 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`.
-
-The `<%= clientPackageManager %> run` command will list all of the scripts available to run for this project.
-<%_ if (authenticationTypeOauth2) { _%>
-
-## OAuth 2.0 / OpenID Connect
+<%_ if (authenticationTypeOauth2) { -%>
+### OAuth 2.0 / OpenID Connect
 
 Congratulations! You've selected an excellent way to secure your JHipster application. If you're not sure what OAuth and OpenID Connect (OIDC) are, please see [What the Heck is OAuth?](https://developer.okta.com/blog/2017/06/21/what-the-heck-is-oauth)
 
@@ -127,14 +93,7 @@ spring:
           oidc:
             client-id: web_app
             client-secret: web_app
-```
-
-### JHipster Control Center
-
-JHipster Control Center can help you to manage and control your application(s). You can start a local control center server (accessible on http://localhost:7419) with:
-
-```
-docker-compose -f src/main/docker/jhipster-control-center.yml up
+            scope: openid,profile,email
 ```
 
 ### Okta
@@ -180,89 +139,78 @@ Create a `ROLE_ADMIN` and `ROLE_USER` group and add users into them. Modify e2e
 Navigate to **API** > **Authorization Servers**, click the **Authorization Servers** tab and edit the default one. Click the **Claims** tab and **Add Claim**. Name it "groups", and include it in the ID Token. Set the value type to "Groups" and set the filter to be a Regex of `.*`.
 
 After making these changes, you should be good to go! If you have any issues, please post them to [Stack Overflow](https://stackoverflow.com/questions/tagged/jhipster). Make sure to tag your question with "jhipster" and "okta".
-<%_ } _%>
-
-### PWA Support
-
-JHipster ships with PWA (Progressive Web App) support, and it's turned off by default. One of the main components of a PWA is a service worker.
 
-<%_ if (!clientFrameworkAngular) { _%>
-The service worker initialization code is commented out by default. To enable it, uncomment the following code in `<%= CLIENT_MAIN_SRC_DIR %>index.html`:
+### Auth0
 
-```html
-<script>
-    if ('serviceWorker' in navigator) {
-        navigator.serviceWorker
-        .register('./service-worker.js')
-        .then(function() { console.log('Service Worker Registered'); });
-    }
-</script>
-```
-
-Note: [Workbox](https://developers.google.com/web/tools/workbox/) powers JHipster's service worker. It dynamically generates the `service-worker.js` file.
-<%_ } _%>
-<%_ if (clientFrameworkAngular) { _%>
-The service worker initialization code is disabled by default. To enable it, uncomment the following code in `<%= CLIENT_MAIN_SRC_DIR %>app/app.module.ts`:
+If you'd like to use [Auth0](https://auth0.com/) instead of Keycloak, follow the configuration steps below:
 
-```typescript
-ServiceWorkerModule.register('ngsw-worker.js', { enabled: false }),
-```
-<%_ } _%>
+- Create a free developer account at <https://auth0.com/signup>. After successful sign-up, your account will be associated with a unique domain like `dev-xxx.us.auth0.com`
+- Create a new application of type `Regular Web Applications`. Switch to the `Settings` tab, and configure your application settings like:
+    - Allowed Callback URLs: `http://localhost:8080/login/oauth2/code/oidc`
+    - Allowed Logout URLs: `http://localhost:8080/`
+- Navigate to **User Management** > **Roles** and create new roles named `ROLE_ADMIN`, and `ROLE_USER`.
+- Navigate to **User Management** > **Users** and create a new user account. Click on the **Role** tab to assign roles to the newly created user account.
+- Navigate to **Auth Pipeline** > **Rules** and create a new Rule. Choose `Empty rule` template. Provide a meaningful name like `JHipster claims` and replace `Script` content with the following and Save.
+```javascript
+function (user, context, callback) {
+  user.preferred_username = user.email;
+  const roles = (context.authorization || {}).roles;
 
-### Managing dependencies
+  function prepareCustomClaimKey(claim) {
+    return `https://www.jhipster.tech/${claim}`;
+  }
 
-For example, to add [Leaflet][] library as a runtime dependency of your application, you would run following command:
+  const rolesClaim = prepareCustomClaimKey('roles');
 
-```
-<%= clientPackageManager %> <%= clientPackageMngrAdd %> leaflet
-```
+  if (context.idToken) {
+    context.idToken[rolesClaim] = roles;
+  }
 
-To benefit from TypeScript type definitions from [DefinitelyTyped][] repository in development, you would run following command:
+  if (context.accessToken) {
+    context.accessToken[rolesClaim] = roles;
+  }
 
+  callback(null, user, context);
+}
 ```
-<%= clientPackageManager %> <%= clientPackageMngrAddDev %> @types/leaflet
+- In your `JHipster` application, modify `src/main/resources/config/application.yml` to use your Auth0 application settings:
+```yaml
+spring:
+  ...
+  security:
+    oauth2:
+      client:
+        provider:
+          oidc:
+            # make sure to include the ending slash!
+            issuer-uri: https://{your-auth0-domain}/
+        registration:
+          oidc:
+            client-id: {clientId}
+            client-secret: {clientSecret}
+            scope: openid,profile,email
+jhipster:
+  ...
+  security:
+    oauth2:
+      audience:
+        - https://{your-auth0-domain}/api/v2/
 ```
+  <%_ if (cypressTests) { _%>
 
-Then you would import the JS and CSS files specified in library's installation instructions so that [Webpack][] knows about them:
-<%_ if (clientFrameworkAngular) { _%>
-Edit [<%= CLIENT_MAIN_SRC_DIR %>app/app.module.ts](<%= CLIENT_MAIN_SRC_DIR %>app/app.module.ts) file:
+Before running Cypress tests, specify Auth0 user credentials by overriding the `CYPRESS_E2E_USERNAME` and `CYPRESS_E2E_PASSWORD` environment variables.
 
 ```
-import 'leaflet/dist/leaflet.js';
+export CYPRESS_E2E_USERNAME="<your-username>"
+export CYPRESS_E2E_PASSWORD="<your-password>"
 ```
 
-Edit [<%= CLIENT_MAIN_SRC_DIR %>content/scss/vendor.scss](<%= CLIENT_MAIN_SRC_DIR %>content/scss/vendor.scss) file:
-
-```
-@import '~leaflet/dist/leaflet.css';
-```
+See Cypress' documentation for setting OS [environment variables](https://docs.cypress.io/guides/guides/environment-variables#Setting) to learn more.
 
+**Auth0 requires a user to provide authorization consent on the first login.** Consent flow is currently not handled in the Cypress test suite. To mitigate the issue, you can use a user account that has already granted consent to authorize application access via interactive login.
+  <%_ } _%>
 <%_ } _%>
-Note: There are still a few other things remaining to do for Leaflet that we won't detail here.
-<%_ } _%>
-
-For further instructions on how to develop with JHipster, have a look at [Using JHipster in development][].
-
-<%_ if (clientFrameworkAngular && !applicationTypeMicroservice) { _%>
-### Using Angular CLI
-
-You can also use [Angular CLI][] to generate some custom client code.
-
-For example, the following command:
-
-```
-ng generate component my-component
-```
 
-will generate few files:
-
-```
-create <%= CLIENT_MAIN_SRC_DIR %>app/my-component/my-component.component.html
-create <%= CLIENT_MAIN_SRC_DIR %>app/my-component/my-component.component.ts
-update <%= CLIENT_MAIN_SRC_DIR %>app/app.module.ts
-```
-
-<%_ } _%>
 <%_ if (enableSwaggerCodegen) { _%>
 ### Doing API-First development using openapi-generator
 
@@ -330,6 +278,7 @@ To package your application as a war in order to deploy it to an application ser
 <%_ } _%>
 ```
 
+<&- fragments.productionSection() &>
 ## Testing
 
 To launch your application's tests, run:
@@ -342,31 +291,7 @@ To launch your application's tests, run:
 <%_ } _%>
 ```
 
-<%_ if (!skipClient) { _%>
-### Client tests
-
-Unit tests are run by [Jest][]. They're located in [<%= CLIENT_TEST_SRC_DIR %>](<%= CLIENT_TEST_SRC_DIR %>) and can be run with:
-
-```
-<%= clientPackageManager %> test
-```
-
-<%_ if (protractorTests) { _%>
-UI end-to-end tests are powered by [Protractor][], which is built on top of WebDriverJS. They're located in [<%= CLIENT_TEST_SRC_DIR %>e2e](<%= CLIENT_TEST_SRC_DIR %>e2e)
-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.
-<%_ } _%>
-<%_ if (cypressTests) { _%>
-UI end-to-end tests are powered by [Cypress][]. They're located in [<%= CLIENT_TEST_SRC_DIR %>cypress](<%= CLIENT_TEST_SRC_DIR %>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.
-
-#### 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 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`<% } %>
-<%_ } _%>
-<%_ } _%>
-
+<&- fragments.testingSection() -&>
 <%_ if (gatlingTests) { _%>
 ### Other tests
 
@@ -468,6 +393,10 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
 
 To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.
 
+<& if (fragments.othersSection()) { &>
+## Others
+<&- fragments.othersSection() &>
+<& } &>
 [JHipster Homepage and latest documentation]: <%= DOCUMENTATION_URL %>
 [JHipster <%= jhipsterVersion %> archive]: <%= DOCUMENTATION_ARCHIVE_URL %>
 <%_ if (applicationTypeGateway || applicationTypeMicroservice) { _%>
@@ -486,25 +415,10 @@ To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`)
 [Code quality page]: <%= DOCUMENTATION_ARCHIVE_URL %>/code-quality/
 [Setting up Continuous Integration]: <%= DOCUMENTATION_ARCHIVE_URL %>/setting-up-ci/
 
-<% if (gatlingTests) { %>[Gatling]: https://gatling.io/<% } %>
-<%_ if (!skipClient) { _%>
 [Node.js]: https://nodejs.org/
-[Webpack]: https://webpack.github.io/
-<%_ if (clientFrameworkAngular) { _%>
-[Angular CLI]: https://cli.angular.io/
-<%_ } _%>
-[BrowserSync]: https://www.browsersync.io/
-[Jest]: https://facebook.github.io/jest/
-[Jasmine]: https://jasmine.github.io/2.0/introduction.html
-<%_ if (protractorTests) { _%>
-[Protractor]: https://angular.github.io/protractor/
-<%_ } _%>
-<%_ if (cypressTests) { _%>
-[Cypress]: https://www.cypress.io/
-<%_ } _%>
-[Leaflet]: https://leafletjs.com/
-[DefinitelyTyped]: https://definitelytyped.org/
-<%_ } _%>
+[NPM]: https://www.npmjs.com/
+<&- fragments.referenceSection() &>
+<% if (gatlingTests) { %>[Gatling]: https://gatling.io/<% } %>
 <%_ if (enableSwaggerCodegen) { _%>
 [OpenAPI-Generator]: https://openapi-generator.tech
 [Swagger-Editor]: https://editor.swagger.io

package/generators/common/templates/package.json

@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "concurrently": "6.2.0",
-    "husky": "4.3.8",
-    "lint-staged": "11.0.0",
-    "npm": "7.18.1",
-    "wait-on": "5.3.0"
+    "concurrently": "6.4.0",
+    "husky": "7.0.4",
+    "lint-staged": "12.0.2",
+    "npm": "8.1.4",
+    "wait-on": "6.0.0"
   }
 }

package/generators/cypress/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 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 generator from './index.js';
+
+export default generator;

package/generators/cypress/generator.spec.mjs

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2013-2021 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 expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import testSupport from '../../test/support/index.cjs';
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+const { testBlueprintSupport } = testSupport;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+  describe('blueprint support', () => testBlueprintSupport(generator));
+});

package/generators/cypress/index.js

@@ -23,19 +23,22 @@ const constants = require('../generator-constants');
 const { GENERATOR_CYPRESS } = require('../generator-list');
 const { CYPRESS } = require('../../jdl/jhipster/test-framework-types');
 
-let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts, { unique: 'namespace' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', ...features });
 
     if (this.options.help) {
       return;
     }
 
     this.loadRuntimeOptions();
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_CYPRESS);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_CYPRESS);
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -48,7 +51,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -75,7 +78,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -88,14 +91,14 @@ module.exports = class extends BaseBlueprintGenerator {
         this.loadClientConfig();
         this.loadDerivedClientConfig();
         this.loadServerConfig();
-        this.loadDerivedServerConfig();
         this.loadTranslationConfig();
+        this.loadPlatformConfig();
       },
     };
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -110,7 +113,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -120,7 +123,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -139,7 +142,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -169,7 +172,7 @@ module.exports = class extends BaseBlueprintGenerator {
           },
           scripts: {
             'cypress:audits': 'cypress open --config-file cypress-audits.json',
-            'e2e:cypress:audits:headless': 'npm run e2e:cypress -- --headless --config-file cypress-audits.json',
+            'e2e:cypress:audits:headless': 'npm run e2e:cypress -- --config-file cypress-audits.json',
             // eslint-disable-next-line no-template-curly-in-string
             'e2e:cypress:audits': 'cypress run --browser chrome --record ${CYPRESS_ENABLE_RECORD:-false} --config-file cypress-audits.json',
           },
@@ -187,7 +190,7 @@ module.exports = class extends BaseBlueprintGenerator {
           scripts: {
             'clean-coverage': 'rimraf .nyc_output coverage',
             'pree2e:cypress:coverage': 'npm run clean coverage && npm run ci:server:await',
-            'e2e:cypress:coverage': 'npm run e2e:cypress',
+            'e2e:cypress:coverage': 'npm run e2e:cypress:headed',
             'poste2e:cypress:coverage': 'nyc report',
             'prewebapp:instrumenter': 'npm run clean-www && npm run clean-coverage',
             'webapp:instrumenter': 'ng build --configuration instrumenter',
@@ -227,7 +230,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 };

package/generators/cypress/templates/cypress.json.ejs

@@ -26,7 +26,14 @@
   "pluginsFile": "<%= CLIENT_TEST_SRC_DIR %>cypress/plugins/index.ts",
   "screenshotsFolder": "<%= BUILD_DIR %>cypress/screenshots",
   "chromeWebSecurity": <% if(authenticationTypeOauth2) { %>false<% } else { %>true<% } %>,
+<%_ if (clientFrameworkReact) { _%>
+  "scrollBehavior": "center",
+<%_ } _%>
   "viewportWidth": 1200,
   "viewportHeight": 720,
-  "retries": 2
+  "retries": 2<%_ if (authenticationTypeJwt) { _%>,
+  "env": {
+    "jwtStorageName": "<%= jhiPrefixDashed %>-authenticationToken"
+  }
+<%_ } _%>
 }

package/generators/cypress/templates/src/test/javascript/cypress/integration/account/login-page.spec.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(({ request, 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');
@@ -63,7 +63,7 @@ describe('login modal', () => {
     cy.get(usernameLoginSelector).type('a-login');
     cy.get(submitLoginSelector).click();
     <%_ if (!clientFrameworkReact) { _%>
-    cy.wait('@authenticate').then(({ request, 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
@@ -76,7 +76,7 @@ describe('login modal', () => {
     cy.get(usernameLoginSelector).type(username);
     cy.get(passwordLoginSelector).type('bad-password');
     cy.get(submitLoginSelector).click();
-    cy.wait('@authenticate').then(({ request, response }) => expect(response.statusCode).to.equal(401));
+    cy.wait('@authenticate').then(({ response }) => expect(response.statusCode).to.equal(401));
     cy.get(errorLoginSelector).should('be.visible');
     cy.get(usernameLoginSelector).clear();
     cy.get(passwordLoginSelector).clear();
@@ -86,7 +86,7 @@ describe('login modal', () => {
     cy.get(usernameLoginSelector).type(username);
     cy.get(passwordLoginSelector).type(password);
     cy.get(submitLoginSelector).click();
-    cy.wait('@authenticate').then(({ request, response }) => expect(response.statusCode).to.equal(200));
+    cy.wait('@authenticate').then(({ response }) => expect(response.statusCode).to.equal(200));
     cy.hash().should('eq', '');
   });
 });

package/generators/cypress/templates/src/test/javascript/cypress/integration/account/password-page.spec.ts.ejs

@@ -86,7 +86,7 @@ describe('/account/password', () => {
     cy.get(newPasswordSelector).type('jhipster');
     cy.get(confirmPasswordSelector).type('jhipster');
     cy.get(submitPasswordSelector).click({force: true});
-    cy.wait('@passwordSave').then(({ request, response }) => expect(response.statusCode).to.equal(400));
+    cy.wait('@passwordSave').then(({ response }) => expect(response.statusCode).to.equal(400));
     cy.get(currentPasswordSelector).clear();
     cy.get(newPasswordSelector).clear();
     cy.get(confirmPasswordSelector).clear();
@@ -97,6 +97,6 @@ describe('/account/password', () => {
     cy.get(newPasswordSelector).type('user');
     cy.get(confirmPasswordSelector).type('user');
     cy.get(submitPasswordSelector).click({force: true});
-    cy.wait('@passwordSave').then(({ request, response }) => expect(response.statusCode).to.equal(200));
+    cy.wait('@passwordSave').then(({ response }) => expect(response.statusCode).to.equal(200));
   });
 });

package/generators/cypress/templates/src/test/javascript/cypress/integration/account/register-page.spec.ts.ejs

@@ -147,6 +147,6 @@ describe('/account/register', () => {
     cy.get(firstPasswordRegisterSelector).type('jondoe');
     cy.get(secondPasswordRegisterSelector).type('jondoe');
     cy.get(submitRegisterSelector).click({force: true});
-    cy.wait('@registerSave').then(({ request, response }) => expect(response.statusCode).to.equal(201));
+    cy.wait('@registerSave').then(({ response }) => expect(response.statusCode).to.equal(201));
   });
 });

package/generators/cypress/templates/src/test/javascript/cypress/integration/account/reset-password-page.spec.ts.ejs

@@ -63,6 +63,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(({ request, response }) => expect(response.statusCode).to.equal(200));
+    cy.wait('@initResetPassword').then(({ response }) => expect(response.statusCode).to.equal(200));
   });
 });