generator-jhipster 7.7.0 → 7.9.0

package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs

@@ -28,35 +28,34 @@
 
 // This function is called when a project is opened or re-opened (e.g. due to
 // the project's config changing)
-import fs = require('fs');
+<%_ if (cypressAudit) { _%>
+import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { lighthouse, pa11y, prepareAudit } from 'cypress-audit';
-import ReportGenerator = require('lighthouse/report/generator/report-generator');
-/**
- * @type {Cypress.PluginConfig}
- */
-module.exports = async (on<% if (cypressCoverage) { %>, config<% } %>) => {
-  // `on` is used to hook into various events Cypress emits
-<%_ if (cypressCoverage) { _%>
-  // `config` is the resolved Cypress config
+import ReportGenerator from 'lighthouse/report/generator/report-generator';
 <%_ } _%>
+
+export default async (on: Cypress.PluginEvents, config: Cypress.PluginConfigOptions) => {
   on('before:browser:launch', (browser, launchOptions) => {
+<%_ if (cypressAudit) { _%>
     prepareAudit(launchOptions);
+<%_ } _%>
     if (browser.name === 'chrome' && browser.isHeadless) {
       launchOptions.args.push('--disable-gpu');
       return launchOptions;
     }
   });
 
+<%_ if (cypressAudit) { _%>
   on('task', {
     lighthouse: lighthouse((lighthouseReport) => {
-      !fs.existsSync('<%= BUILD_DIR %>cypress') && fs.mkdirSync('<%= BUILD_DIR %>cypress', { recursive: true });
-      fs.writeFileSync('<%= BUILD_DIR %>cypress/lhreport.html', ReportGenerator.generateReport(lighthouseReport.lhr, 'html'));
+      !existsSync('<%= BUILD_DIR %>cypress') && mkdirSync('<%= BUILD_DIR %>cypress', { recursive: true });
+      writeFileSync('<%= BUILD_DIR %>cypress/lhreport.html', ReportGenerator.generateReport(lighthouseReport.lhr, 'html'));
     }),
     pa11y: pa11y(),
   });
+<%_ } _%>
 <%_ if (cypressCoverage) { _%>
-  const coverageTask = await import('@cypress/code-coverage/task.js');
-  coverageTask(on, config);
-  return config;
+  (await import('@cypress/code-coverage/task')).default(on, config);
 <%_ } _%>
+  return config;
 }

package/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs

@@ -104,7 +104,7 @@ export const classValid = <%_ if (clientFrameworkAngular) { _%>'ng-valid';
 <%_ } else if (clientFrameworkReact) { _%>'is-valid';
 <%_ } else { _%>'valid';<%_ } _%>
 
-Cypress.Commands.add('authenticatedRequest', (data: any) => {
+Cypress.Commands.add('authenticatedRequest', (data) => {
 <%_ if (authenticationTypeJwt) { _%>
   <%_ if (clientFrameworkAngular || clientFrameworkReact) { _%>
   const bearerToken = JSON.parse(sessionStorage.getItem(Cypress.env('jwtStorageName')));
@@ -173,14 +173,14 @@ Cypress.Commands.add('login', (username: string, password: string) => {
 declare global {
   namespace Cypress {
     interface Chainable {
-<%_ if (!authenticationTypeOauth2) { _%>
+      authenticatedRequest(data): Cypress.Chainable;
       login(username: string, password: string): Cypress.Chainable;
-<%_ } _%>
-      authenticatedRequest(data: any): Cypress.Chainable;
     }
   }
 }
 
+<%_ if (cypressAudit) { _%>
 import 'cypress-audit/commands';
+<%_ } _%>
 // Convert this to a module instead of script (allows import/export)
 export {};

package/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs

@@ -56,7 +56,7 @@ Cypress.Commands.add('clickOnAdminMenuItem', (item: string) => {
 });
 
 Cypress.Commands.add('clickOnEntityMenuItem', (entityName: string) => {
-  return cy.get(navbarSelector).get(entityItemSelector).click().get(`.dropdown-item[href="/${entityName}"]`).click();
+  return cy.get(navbarSelector).get(entityItemSelector).click().get(`.dropdown-item[href="/${entityName}"]`).click(<% if(clientFrameworkAngular) { %>{ force: true }<% } %>);
 });
 
 declare global {

package/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs

@@ -31,7 +31,7 @@ Cypress.Commands.add('getOauth2Data', () => {
   });
 });
 
-Cypress.Commands.add('oauthLogin', (oauth2Data: any, username: string, password: string) => {
+Cypress.Commands.add('oauthLogin', (oauth2Data, username: string, password: string) => {
   const url = new URL(oauth2Data.url);
   if (url.origin.includes('okta')) {
     cy.oktaLogin(oauth2Data, username, password);
@@ -42,7 +42,7 @@ Cypress.Commands.add('oauthLogin', (oauth2Data: any, username: string, password:
   }
 });
 
-Cypress.Commands.add('keycloakLogin', (oauth2Data: any, username: string, password: string) => {
+Cypress.Commands.add('keycloakLogin', (oauth2Data, username: string, password: string) => {
   cy.request({
     url: `${oauth2Data.url}`,
     followRedirect: false,
@@ -75,7 +75,7 @@ Cypress.Commands.add('keycloakLogin', (oauth2Data: any, username: string, passwo
   })
 });
 
-Cypress.Commands.add('auth0Login', (oauth2Data: any, username: string, password: string) => {
+Cypress.Commands.add('auth0Login', (oauth2Data, username: string, password: string) => {
   cy.request({
     url: `${oauth2Data.url}`,
     followRedirect: true,
@@ -107,7 +107,7 @@ Cypress.Commands.add('auth0Login', (oauth2Data: any, username: string, password:
     });
 });
 
-Cypress.Commands.add('oktaLogin', (oauth2Data: any, username, password) => {
+Cypress.Commands.add('oktaLogin', (oauth2Data, username, password) => {
   const url = new URL(oauth2Data.url);
   cy.request({
     method: 'POST',
@@ -159,10 +159,10 @@ declare global {
   namespace Cypress {
     interface Chainable<Subject> {
       getOauth2Data(): Cypress.Chainable;
-      oauthLogin(oauth2Data: any, username: string, password: string): Cypress.Chainable;
-      keycloakLogin(oauth2Data: any, username: string, password: string): Cypress.Chainable;
-      auth0Login(oauth2Data: any, username: string, password: string): Cypress.Chainable;
-      oktaLogin(oauth2Data: any, username: string, password: string): Cypress.Chainable;
+      oauthLogin(oauth2Data, username: string, password: string): Cypress.Chainable;
+      keycloakLogin(oauth2Data, username: string, password: string): Cypress.Chainable;
+      auth0Login(oauth2Data, username: string, password: string): Cypress.Chainable;
+      oktaLogin(oauth2Data, username: string, password: string): Cypress.Chainable;
       oauthLogout(): Cypress.Chainable;
     }
   }

package/generators/cypress/templates/src/test/javascript/cypress/tsconfig.json.ejs

@@ -17,9 +17,12 @@
  limitations under the License.
 -%>
 {
-  "references": [
-    {
-      "path": "./../../../../tsconfig.json"
-    }
-  ]
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "../../../../<%= BUILD_DIR %>out-tsc/cypress",
+    "target": "es2018",
+    "types": ["cypress", "node"]
+  },
+  "include": ["./../../../../cypress*.config.ts", "./**/*.ts"]
 }

package/generators/database-changelog-liquibase/files.js

@@ -110,7 +110,7 @@ const fakeFiles = {
             interpolate: INTERPOLATE_REGEX,
           },
           renameTo: generator => {
-            if (!generator.jhipsterConfig.incrementalChangelog) {
+            if (!generator.jhipsterConfig.incrementalChangelog || generator.configOptions.recreateInitialChangelog) {
               return `config/liquibase/fake-data/${generator.entity.entityTableName}.csv`;
             }
 

package/generators/database-changelog-liquibase/index.js

@@ -38,6 +38,7 @@ const TYPE_LONG = CommonDBTypes.LONG;
 
 const constants = require('../generator-constants');
 
+// TODO v8: Remove this constant
 const { LIQUIBASE_DTD_VERSION } = constants;
 const { prepareFieldForTemplates } = require('../../utils/field');
 const { prepareRelationshipForTemplates } = require('../../utils/relationship');
@@ -122,6 +123,7 @@ module.exports = class extends BaseBlueprintGenerator {
             const uniqueRelationships = this.entity.relationships.filter(rel => rel.unique && (rel.relationshipRequired || rel.id));
             return _.min([this.entity.liquibaseFakeData.length, ...uniqueRelationships.map(rel => rel.otherEntity.fakeDataCount)]);
           },
+          configurable: true,
         });
 
         for (let rowNumber = 0; rowNumber < this.numberOfRows; rowNumber++) {
@@ -215,6 +217,7 @@ module.exports = class extends BaseBlueprintGenerator {
     return {
       setupConstants() {
         // Make constants available in templates
+        // TODO v8: Remove this constant
         this.LIQUIBASE_DTD_VERSION = LIQUIBASE_DTD_VERSION;
       },
     };

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs

@@ -21,7 +21,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
     <!--

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity_constraints.xml.ejs

@@ -20,7 +20,7 @@
 <databaseChangeLog
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd">
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
     <!--
         Added the constraints for entity <%= entity.entityClass %>.
     -->

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs

@@ -21,7 +21,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 <%_ if (addedFields && addedFields.length) { _%>
 

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs

@@ -20,7 +20,7 @@
 <databaseChangeLog
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd">
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
 <%_
 const entityTableName = entity.entityTableName;
 const entityClass = entity.entityClass;
@@ -36,7 +36,7 @@ if (hasFieldConstraint) { _%>
     _%>
         <addUniqueConstraint tableName="<%= entityTableName %>"
             columnNames="<%= field.columnName %>"
-            constraintName="<%= field.getUXConstraintName(entityTableName) %>"/>
+            constraintName="<%= field.uniqueConstraintName %>"/>
     <%_ }
         if (!field.nullable) {
     _%>

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_migrate.xml.ejs

@@ -21,7 +21,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
 <%_ const entityTableName = entity.entityTableName;

package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs

@@ -29,14 +29,14 @@ for (field of fieldsToGenerate) {
   }
 }
 for (relationship of relationships) {
-  const relationshipType = relationship.relationshipType
+  const { relationshipType, joinColumnNames } = relationship;
   if (
     (relationshipType === "many-to-one"
       || (relationshipType === "one-to-one" && relationship.ownerSide === true
          && (relationship.id == null || relationship.id === false))
     ) && (relationship.relationshipValidate === true && relationship.relationshipRequired)
   ) {
-    header.push(getColumnName(relationship.relationshipName) + "_id");
+    header.push(joinColumnNames[0]);
   }
 }
 table.push(header);

package/generators/docker-base.js

@@ -20,7 +20,6 @@ const shelljs = require('shelljs');
 const chalk = require('chalk');
 const _ = require('lodash');
 
-const { defaultConfig } = require('./generator-defaults');
 const dockerUtils = require('./docker-utils');
 const { getBase64Secret } = require('./utils');
 const { MAVEN } = require('../jdl/jhipster/build-tool-types');
@@ -103,17 +102,21 @@ function loadConfigs() {
   this.gatewayNb = 0;
   this.monolithicNb = 0;
   this.microserviceNb = 0;
+  const serverPort = 8080;
 
   // Loading configs
   this.debug(`Apps folders: ${this.appsFolders}`);
-  this.appsFolders.forEach(appFolder => {
+  this.appsFolders.forEach((appFolder, index) => {
     const path = this.destinationPath(`${this.directoryPath + appFolder}`);
     if (this.fs.exists(`${path}/.yo-rc.json`)) {
       const config = this.getJhipsterConfig(`${path}/.yo-rc.json`).getAll();
-      _.defaults(config, defaultConfig);
+      config.composePort = serverPort + index;
+      _.defaults(config, this.getDefaultConfigForApplicationType(config.applicationType));
+      this.loadAppConfig(config, config);
       this.loadServerConfig(config, config);
       this.loadDerivedPlatformConfig(config);
       this.loadDerivedAppConfig(config);
+      this.loadDerivedServerConfig(config);
 
       if (config.applicationType === MONOLITH) {
         this.monolithicNb++;

package/generators/docker-compose/files.js

@@ -26,6 +26,10 @@ module.exports = {
 
 function writeFiles() {
   return {
+    cleanup() {
+      this.removeFile('realm-config/jhipster-users-0.json');
+    },
+
     writeDockerCompose() {
       this.template('docker-compose.yml.ejs', 'docker-compose.yml');
       this.template('README-DOCKER-COMPOSE.md.ejs', 'README-DOCKER-COMPOSE.md');
@@ -40,7 +44,6 @@ function writeFiles() {
     writeKeycloakFiles() {
       if (this.authenticationType === OAUTH2 && this.applicationType !== MICROSERVICE) {
         this.template('realm-config/jhipster-realm.json.ejs', 'realm-config/jhipster-realm.json');
-        this.template('realm-config/jhipster-users-0.json.ejs', 'realm-config/jhipster-users-0.json');
       }
     },
 
@@ -50,7 +53,7 @@ function writeFiles() {
       // Generate a list of target apps to monitor for the prometheus config
       const appsToMonitor = [];
       for (let i = 0; i < this.appConfigs.length; i++) {
-        appsToMonitor.push(`        - ${this.appConfigs[i].baseName}:${this.appConfigs[i].serverPort}`);
+        appsToMonitor.push(`        - ${this.appConfigs[i].baseName}:${this.appConfigs[i].composePort}`);
       }
 
       // Format the application target list as a YAML array

package/generators/docker-compose/index.js

@@ -20,6 +20,7 @@ const chalk = require('chalk');
 const shelljs = require('shelljs');
 const jsyaml = require('js-yaml');
 const pathjs = require('path');
+const normalize = require('normalize-path');
 
 const BaseDockerGenerator = require('../generator-base-docker');
 const { INITIALIZING_PRIORITY, PROMPTING_PRIORITY, CONFIGURING_PRIORITY, LOADING_PRIORITY, PREPARING_PRIORITY, WRITING_PRIORITY } =
@@ -29,15 +30,12 @@ const writeFiles = require('./files').writeFiles;
 const { GATEWAY, MONOLITH } = require('../../jdl/jhipster/application-types');
 const { PROMETHEUS } = require('../../jdl/jhipster/monitoring-types');
 const { EUREKA } = require('../../jdl/jhipster/service-discovery-types');
-const { CASSANDRA, COUCHBASE, MARIADB, MONGODB, ORACLE } = require('../../jdl/jhipster/database-types');
+const { CASSANDRA, COUCHBASE, MONGODB, ORACLE, NO: NO_DATABASE } = require('../../jdl/jhipster/database-types');
 const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
 const { KAFKA } = require('../../jdl/jhipster/message-broker-types');
 const { MEMCACHED, REDIS } = require('../../jdl/jhipster/cache-types');
-const databaseTypes = require('../../jdl/jhipster/database-types');
 const { GENERATOR_DOCKER_COMPOSE } = require('../generator-list');
 
-const NO_DATABASE = databaseTypes.NO;
-
 /* eslint-disable consistent-return */
 module.exports = class extends BaseDockerGenerator {
   async _postConstruct() {
@@ -130,13 +128,12 @@ module.exports = class extends BaseDockerGenerator {
       loadConfig() {
         this.usesOauth2 = this.appConfigs.some(appConfig => appConfig.authenticationTypeOauth2);
         this.useKafka = this.appConfigs.some(appConfig => appConfig.messageBroker === KAFKA);
+        this.entryPort = 8080;
       },
 
       setAppsYaml() {
         this.appsYaml = [];
         this.keycloakRedirectUris = '';
-        let portIndex = 8080;
-        this.serverPort = portIndex;
         this.appConfigs.forEach(appConfig => {
           const lowercaseBaseName = appConfig.baseName.toLowerCase();
           const parentConfiguration = {};
@@ -145,15 +142,14 @@ module.exports = class extends BaseDockerGenerator {
           const yaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/app.yml`));
           const yamlConfig = yaml.services[`${lowercaseBaseName}-app`];
           if (appConfig.applicationType === GATEWAY || appConfig.applicationType === MONOLITH) {
-            this.keycloakRedirectUris += `"http://localhost:${portIndex}/*", "https://localhost:${portIndex}/*", `;
+            this.keycloakRedirectUris += `"http://localhost:${appConfig.composePort}/*", "https://localhost:${appConfig.composePort}/*", `;
             if (appConfig.devServerPort !== undefined) {
               this.keycloakRedirectUris += `"http://localhost:${appConfig.devServerPort}/*", `;
             }
             // Split ports by ":" and take last 2 elements to skip the hostname/IP if present
             const ports = yamlConfig.ports[0].split(':').slice(-2);
-            ports[0] = portIndex;
+            ports[0] = appConfig.composePort;
             yamlConfig.ports[0] = ports.join(':');
-            portIndex++;
           }
 
           if (appConfig.applicationType === MONOLITH && this.monitoring === PROMETHEUS) {
@@ -173,27 +169,26 @@ module.exports = class extends BaseDockerGenerator {
           parentConfiguration[`${lowercaseBaseName}`] = yamlConfig;
 
           // Add database configuration
-          const database = appConfig.prodDatabaseType;
+          const database = appConfig.databaseTypeSql ? appConfig.prodDatabaseType : appConfig.databaseType;
           if (database !== NO_DATABASE && database !== ORACLE) {
-            const relativePath = pathjs.relative(this.destinationRoot(), `${path}/src/main/docker`);
+            const relativePath = normalize(pathjs.relative(this.destinationRoot(), `${path}/src/main/docker`));
             const databaseYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/${database}.yml`));
             const databaseServiceName = `${lowercaseBaseName}-${database}`;
             let databaseYamlConfig = databaseYaml.services[databaseServiceName];
-            if (database !== MARIADB) delete databaseYamlConfig.ports;
+            // Don't export database ports
+            delete databaseYamlConfig.ports;
 
             if (database === CASSANDRA) {
-              // node config
-              const cassandraClusterYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/cassandra-cluster.yml`));
-              const cassandraNodeConfig = cassandraClusterYaml.services[`${databaseServiceName}-node`];
-              parentConfiguration[`${databaseServiceName}-node`] = cassandraNodeConfig;
-
               // migration service config
-              const cassandraMigrationYaml = jsyaml.load(this.fs.read(`${path}/src/main/docker/cassandra-migration.yml`));
-              const cassandraMigrationConfig = cassandraMigrationYaml.services[`${databaseServiceName}-migration`];
+              const cassandraMigrationConfig = databaseYaml.services[`${databaseServiceName}-migration`];
+
+              // replace script with prod
+              cassandraMigrationConfig.environment = [
+                ...cassandraMigrationConfig.environment.filter(envVariable => !envVariable.includes('CREATE_KEYSPACE_SCRIPT=')),
+                'CREATE_KEYSPACE_SCRIPT=create-keyspace-prod.cql',
+              ];
               cassandraMigrationConfig.build.context = relativePath;
-              const createKeyspaceScript = cassandraClusterYaml.services[`${databaseServiceName}-migration`].environment[0];
-              cassandraMigrationConfig.environment.push(createKeyspaceScript);
-              const cqlFilesRelativePath = pathjs.relative(this.destinationRoot(), `${path}/src/main/resources/config/cql`);
+              const cqlFilesRelativePath = normalize(pathjs.relative(this.destinationRoot(), `${path}/src/main/resources/config/cql`));
               cassandraMigrationConfig.volumes[0] = `${cqlFilesRelativePath}:/cql:ro`;
 
               parentConfiguration[`${databaseServiceName}-migration`] = cassandraMigrationConfig;
@@ -304,11 +299,9 @@ module.exports = class extends BaseDockerGenerator {
     this.log(`You can launch all your infrastructure by running : ${chalk.cyan('docker-compose up -d')}`);
     if (this.gatewayNb + this.monolithicNb > 1) {
       this.log('\nYour applications will be accessible on these URLs:');
-      let portIndex = 8080;
       this.appConfigs.forEach(appConfig => {
         if (appConfig.applicationType === GATEWAY || appConfig.applicationType === MONOLITH) {
-          this.log(`\t- ${appConfig.baseName}: http://localhost:${portIndex}`);
-          portIndex++;
+          this.log(`\t- ${appConfig.baseName}: http://localhost:${appConfig.composePort}`);
         }
       });
       this.log('\n');

package/generators/docker-compose/templates/README-DOCKER-COMPOSE.md.ejs

@@ -19,7 +19,7 @@ Launch all your infrastructure by running: `docker-compose up -d`.
 ### Applications and dependencies:
 <%_ for(let i = 0; i < appConfigs.length; i++) { _%>
 - <%= appConfigs[i].baseName %> (<%= appConfigs[i].applicationType %> application)
-- <%= appConfigs[i].baseName %>'s <%= appConfigs[i].prodDatabaseType %> database
+- <%= appConfigs[i].baseName %>'s <%= appConfigs[i].databaseTypeSql ? appConfigs[i].prodDatabaseType : appConfigs[i].databaseType %> database
 <%_ if (appConfigs[i].searchEngine && !appConfigs[i].searchEngineCouchbase) { _%>
 - <%= appConfigs[i].baseName %>'s <%= appConfigs[i].searchEngine %> search engine
 <%_ } _%>

package/generators/docker-compose/templates/docker-compose.yml.ejs

@@ -49,7 +49,7 @@ services:
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
   <%_ if (usesOauth2) { _%>
-      - JHIPSTER_SLEEP=20
+      - JHIPSTER_SLEEP=30
   <%_ } _%>
       - SPRING_PROFILES_ACTIVE=dev<% if (usesOauth2) { %>,oauth2<% } %>
       - SPRING_SECURITY_USER_PASSWORD=<%= adminPassword %>
@@ -68,7 +68,7 @@ services:
   <%_ } _%>
   <%_ if (usesOauth2) { _%>
       # For Keycloak to work, you need to add '127.0.0.1 keycloak' to your hosts file
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/auth/realms/jhipster
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
       - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=jhipster-registry
       - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=jhipster-registry
   <%_ } _%>
@@ -95,17 +95,19 @@ services:
 <%_ if (usesOauth2) { _%>
   keycloak:
     image: <%= DOCKER_KEYCLOAK %>
-    command: ["-b", "0.0.0.0", "-Dkeycloak.migration.action=import", "-Dkeycloak.migration.provider=dir", "-Dkeycloak.migration.dir=/opt/jboss/keycloak/realm-config", "-Dkeycloak.migration.strategy=OVERWRITE_EXISTING", "-Djboss.socket.binding.port-offset=1000", "-Dkeycloak.profile.feature.upload_scripts=enabled"]
+    command: ['start-dev --import-realm']
     volumes:
-      - ./realm-config:/opt/jboss/keycloak/realm-config
+      - ./realm-config:/opt/keycloak/data/import
     environment:
-      - KEYCLOAK_USER=admin
-      - KEYCLOAK_PASSWORD=admin
-      - DB_VENDOR=h2
+      - KC_DB=dev-file
+      - KEYCLOAK_ADMIN=admin
+      - KEYCLOAK_ADMIN_PASSWORD=admin
+      - KC_FEATURES=scripts
+      - KC_HTTP_PORT=9080
+      - KC_HTTPS_PORT=9443
     ports:
       - 9080:9080
       - 9443:9443
-      - 10990:10990
 <%_ } _%>
 <%_ if (monitoringPrometheus) { _%>
 

package/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs

@@ -1024,8 +1024,8 @@
     {
       "id": "6e8deddb-b4d6-4e2e-b389-b397d3f74fcd",
       "clientId": "web_app",
-      "rootUrl": "http://localhost:<%= serverPort %>",
-      "adminUrl": "http://localhost:<%= serverPort %>",
+      "rootUrl": "http://localhost:<%= entryPort %>",
+      "adminUrl": "http://localhost:<%= entryPort %>",
       "surrogateAuthRequired": false,
       "enabled": true,
       "alwaysDisplayInConsole": false,
@@ -2492,12 +2492,70 @@
     "clientOfflineSessionIdleTimeout": "0",
     "cibaInterval": "5"
   },
-  "keycloakVersion": "16.1.0",
+  "keycloakVersion": "18.0.0",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []
   },
   "clientPolicies": {
     "policies": []
-  }
+  },
+  "users": [
+    {
+      "id": "4c973896-5761-41fc-8217-07c5d13a004b",
+      "createdTimestamp": 1505479415590,
+      "username": "admin",
+      "enabled": true,
+      "totp": false,
+      "emailVerified": true,
+      "firstName": "Admin",
+      "lastName": "Administrator",
+      "email": "admin@localhost",
+      "credentials": [
+        {
+          "id": "b860462b-9b02-48ba-9523-d3a8926a917b",
+          "type": "password",
+          "createdDate": 1505479429154,
+          "secretData": "{\"value\":\"4pf9K2jWSCcHC+CwsZP/qidN5pSmDUe6AX6wBerSGdBVKkExay8MWKx+EKmaaObZW6FVsD8vdW/ZsyUFD9gJ1Q==\",\"salt\":\"1/qNkZ5kr77jOMOBPBogGw==\"}",
+          "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\"}"
+        }
+      ],
+      "disableableCredentialTypes": [],
+      "requiredActions": [],
+      "realmRoles": ["offline_access", "uma_authorization"],
+      "clientRoles": {
+        "account": ["view-profile", "manage-account"]
+      },
+      "notBefore": 0,
+      "groups": ["/Admins", "/Users"]
+    },
+    {
+      "id": "c4af4e2f-b432-4c3b-8405-cca86cd5b97b",
+      "createdTimestamp": 1505479373742,
+      "username": "user",
+      "enabled": true,
+      "totp": false,
+      "emailVerified": true,
+      "firstName": "",
+      "lastName": "User",
+      "email": "user@localhost",
+      "credentials": [
+        {
+          "id": "7821832b-1e82-45a2-b8d3-f1a6ad909e64",
+          "type": "password",
+          "createdDate": 1505479392766,
+          "secretData": "{\"value\":\"MbKsMgWPnZyImih8s4SaoCSCq+XIY/c6S9F93sXEidHF1TjPWxCqMkec0+o3860CMLXHt3az61cIJOWI0FW9aw==\",\"salt\":\"fmpBI1r8R1u75hDLMUlwBw==\"}",
+          "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\"}"
+        }
+      ],
+      "disableableCredentialTypes": [],
+      "requiredActions": [],
+      "realmRoles": ["offline_access", "uma_authorization"],
+      "clientRoles": {
+        "account": ["view-profile", "manage-account"]
+      },
+      "notBefore": 0,
+      "groups": ["/Users"]
+    }
+  ]
 }

package/generators/docker-prompts.js

@@ -21,7 +21,6 @@ const shelljs = require('shelljs');
 const { loadConfigs, setClusteredApps } = require('./docker-base');
 const { getBase64Secret } = require('./utils');
 const { MICROSERVICE, MONOLITH, GATEWAY } = require('../jdl/jhipster/application-types');
-const { COUCHBASE, MONGODB } = require('../jdl/jhipster/database-types');
 const { PROMETHEUS } = require('../jdl/jhipster/monitoring-types');
 const monitoring = require('../jdl/jhipster/monitoring-types');
 
@@ -183,7 +182,7 @@ async function askForClustersMode() {
 
   const clusteredDbApps = [];
   this.appConfigs.forEach((appConfig, index) => {
-    if (appConfig.prodDatabaseType === MONGODB || appConfig.prodDatabaseType === COUCHBASE) {
+    if (appConfig.databaseTypeMongodb || appConfig.databaseTypeCouchbase) {
       clusteredDbApps.push(this.appsFolders[index]);
     }
   });

package/generators/docker-utils.js

@@ -35,7 +35,6 @@ module.exports = {
 
 /**
  * Check that Docker exists.
- * @param failOver flag
  */
 function checkDocker() {
   if (this.abort || this.skipChecks) return;