spring-boot: move oauth2 configuration to secret-samples

generators/app/__snapshots__/generator.spec.ts.snap

@@ -30,6 +30,7 @@ Options:
   --skip-server                            Skip the server-side application generation
   --skip-user-management                   Skip the user management module during app generation
   --application-type <value>               Application type to generate (choices: "monolith", "gateway", "microservice")
+  --server-port <value>                    Server port to use (default: 8080)
   --prettier-tab-width <value>             Default tab width for prettier (default: 2)
   --monorepository                         Use monorepository
   --skip-commit-hook                       Skip adding husky commit hooks

generators/common/command.ts

@@ -67,6 +67,14 @@ const command = {
       choices: applicationTypesChoices,
       scope: 'storage',
     },
+    serverPort: {
+      description: 'Server port to use',
+      cli: {
+        type: Number,
+      },
+      default: 8080,
+      scope: 'storage',
+    },
   },
   import: [
     'jhipster:base-application:bootstrap',

generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap

@@ -925,13 +925,13 @@ jhipster:
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
       - SPRING_CLOUD_CONSUL_HOST=consul
       - SPRING_CLOUD_CONSUL_PORT=8500
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=web_app
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=web_app
       - SPRING_R2DBC_URL=r2dbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
       - SPRING_R2DBC_USERNAME=
       - SPRING_R2DBC_PASSWORD=
       - SPRING_LIQUIBASE_URL=jdbc:mysql://jhgate-mysql:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=web_app
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=web_app
     ports:
       - 8080:8080
     healthcheck:
@@ -972,13 +972,13 @@ jhipster:
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
       - SPRING_CLOUD_CONSUL_HOST=consul
       - SPRING_CLOUD_CONSUL_PORT=8500
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
       - SPRING_DATASOURCE_URL=jdbc:mysql://msmysql-mysql:3306/msmysql?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
       - SPRING_DATASOURCE_USERNAME=
       - SPRING_DATASOURCE_PASSWORD=
       - SPRING_LIQUIBASE_URL=jdbc:mysql://msmysql-mysql:3306/msmysql?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
     healthcheck:
       test:
         - CMD
@@ -1017,13 +1017,13 @@ jhipster:
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
       - SPRING_CLOUD_CONSUL_HOST=consul
       - SPRING_CLOUD_CONSUL_PORT=8500
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
       - SPRING_DATASOURCE_URL=jdbc:postgresql://mspsql-postgresql:5432/mspsql
       - SPRING_DATASOURCE_USERNAME=
       - SPRING_DATASOURCE_PASSWORD=
       - SPRING_LIQUIBASE_URL=jdbc:postgresql://mspsql-postgresql:5432/mspsql
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
       - SPRING_ELASTICSEARCH_URIS=http://mspsql-elasticsearch:9200
     healthcheck:
       test:
@@ -1077,13 +1077,13 @@ jhipster:
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
       - SPRING_CLOUD_CONSUL_HOST=consul
       - SPRING_CLOUD_CONSUL_PORT=8500
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
       - SPRING_COUCHBASE_USERNAME=Administrator
       - SPRING_COUCHBASE_PASSWORD=password
       - SPRING_COUCHBASE_CONNECTION_STRING=mscouchbase-couchbase
       - JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME=mscouchbase
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
       - JHIPSTER_SLEEP=20
     healthcheck:
       test:
@@ -1121,13 +1121,13 @@ jhipster:
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
       - SPRING_CLOUD_CONSUL_HOST=consul
       - SPRING_CLOUD_CONSUL_PORT=8500
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
       - SPRING_DATASOURCE_URL=jdbc:mariadb://msmariadb-mariadb:3306/msmariadb?useLegacyDatetimeCode=false
       - SPRING_DATASOURCE_USERNAME=
       - SPRING_DATASOURCE_PASSWORD=
       - SPRING_LIQUIBASE_URL=jdbc:mariadb://msmariadb-mariadb:3306/msmariadb?useLegacyDatetimeCode=false
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
     healthcheck:
       test:
         - CMD

generators/docker/__snapshots__/generator.spec.ts.snap

@@ -233,10 +233,6 @@ services:
   app:
     image: jhipster
     environment:
-      - SPRING_NEO4J_URI=bolt://neo4j:7687
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=web_app
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=web_app
       - SPRING_PULSAR_CLIENT_SERVICE_URL=pulsar://pulsar:6650
       - SPRING_PULSAR_ADMINISTRATION_SERVICE_URL=http://pulsar:8080
     ports:
@@ -341,9 +337,6 @@ services:
   app:
     image: jhipster
     environment:
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=web_app
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=web_app
       - SPRING_ELASTICSEARCH_URIS=http://elasticsearch:9200
     ports:
       - 127.0.0.1:8080:8080
@@ -659,9 +652,6 @@ services:
     image: jhipster
     environment:
       - JHIPSTER_CACHE_MEMCACHED_SERVERS=memcached:11211
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
     healthcheck:
       test:
         - CMD
@@ -762,11 +752,6 @@ services:
   app:
     image: jhipster
     environment:
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
-      - SPRING_CASSANDRA_CONTACTPOINTS=cassandra
-      - JHIPSTER_SLEEP=10
       - SPRING_ELASTICSEARCH_URIS=http://elasticsearch:9200
       - SPRING_PULSAR_CLIENT_SERVICE_URL=pulsar://pulsar:6650
       - SPRING_PULSAR_ADMINISTRATION_SERVICE_URL=http://pulsar:8080
@@ -1131,10 +1116,7 @@ name: jhipster
 services:
   app:
     image: jhipster
-    environment:
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=web_app
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=web_app
+    environment: null
     ports:
       - 127.0.0.1:8080:8080
     healthcheck:
@@ -1224,10 +1206,6 @@ services:
   app:
     image: jhipster
     environment:
-      - SPRING_NEO4J_URI=bolt://neo4j:7687
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=web_app
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=web_app
       - SPRING_ELASTICSEARCH_URIS=http://elasticsearch:9200
       - SPRING_PULSAR_CLIENT_SERVICE_URL=pulsar://pulsar:6650
       - SPRING_PULSAR_ADMINISTRATION_SERVICE_URL=http://pulsar:8080
@@ -1466,9 +1444,6 @@ services:
   app:
     image: jhipster
     environment:
-      - SPRING_COUCHBASE_CONNECTION_STRING=couchbase
-      - JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME=jhipster
-      - JHIPSTER_SLEEP=20
       - SPRING_ELASTICSEARCH_URIS=http://elasticsearch:9200
     ports:
       - 127.0.0.1:8080:8080

generators/docker/templates/docker/app.yml.ejs

@@ -25,42 +25,13 @@ services:
 <%_ for (const [key, value] of Object.entries(dockerApplicationEnvironment)) { _%>
       - <%- key %>=<%- value %>
 <%_ } _%>
-<%_ if (databaseTypeNeo4j) { _%>
-      - SPRING_NEO4J_URI=bolt://neo4j:7687
-  <%_ if (databaseMigrationLiquibase) { _%>
-      - SPRING_LIQUIBASE_URL=jdbc:neo4j:bolt://neo4j:7687
-  <%_ } _%>
-<%_ } _%>
-<%_ if (databaseTypeCouchbase) { _%>
-      - SPRING_COUCHBASE_CONNECTION_STRING=couchbase
-      - JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME=<%= baseName %>
-<%_ } _%>
 <%_ if (cacheProviderMemcached) { _%>
       - JHIPSTER_CACHE_MEMCACHED_SERVERS=memcached:11211
 <%_ } _%>
 <%_ if (cacheProviderRedis) { _%>
       - JHIPSTER_CACHE_REDIS_SERVER=redis://redis:6379
       - JHIPSTER_CACHE_REDIS_CLUSTER=false
 <%_ } _%>
-<%_ if (authenticationTypeOauth2) { _%>
-      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/realms/jhipster
-  <%_ if (applicationTypeGateway || applicationTypeMonolith) { _%>
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=web_app
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=web_app
-  <%_ } _%>
-  <%_ if (applicationTypeMicroservice) { _%>
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
-      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
-  <%_ } _%>
-<%_ } _%>
-<%_ if (databaseTypeCassandra) { _%>
-      - SPRING_CASSANDRA_CONTACTPOINTS=cassandra
-<%_ } _%>
-<%_ if (databaseTypeCassandra) { _%>
-      - JHIPSTER_SLEEP=10 # Let migration complete
-<%_ } else if (databaseTypeCouchbase) { _%>
-      - JHIPSTER_SLEEP=20 # Let database to start
-<%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
       - SPRING_ELASTICSEARCH_URIS=http://elasticsearch:9200
 <%_ } _%>

generators/jdl/__snapshots__/generator.spec.ts.snap

@@ -194,6 +194,7 @@ Options:
   --skip-client                            Skip the client-side application generation
   --skip-server                            Skip the server-side application generation
   --application-type <value>               Application type to generate (choices: "monolith", "gateway", "microservice")
+  --server-port <value>                    Server port to use (default: 8080)
   --prettier-tab-width <value>             Default tab width for prettier (default: 2)
   --skip-commit-hook                       Skip adding husky commit hooks
   --enable-swagger-codegen                 API first development using OpenAPI-generator

generators/spring-boot/__snapshots__/generator.spec.ts.snap

@@ -1090,6 +1090,9 @@ exports[`generator - spring-boot with oauth2 should match application snapshot 1
     "SPRING_DATASOURCE_USERNAME": undefined,
     "SPRING_LIQUIBASE_URL": "jdbc:postgresql://postgresql:5432/jhipster",
     "SPRING_PROFILES_ACTIVE": "prod,api-docs",
+    "SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI": "http://keycloak:9080/realms/jhipster",
+    "SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID": "web_app",
+    "SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET": "web_app",
     "_JAVA_OPTIONS": "-Xmx512m -Xms256m",
   },
   "dockerContainers": {

generators/spring-boot/generators/bootstrap/generator.ts

@@ -96,7 +96,15 @@ export default class BootstrapGenerator extends SpringBootApplicationGenerator {
           mutateData(dockerApplicationEnvironment as any, {
             SPRING_SECURITY_REMEMBER_ME_KEY: application.rememberMeKey,
           });
+        } else if (application.authenticationTypeOauth2) {
+          const clientId = application.applicationTypeMicroservice ? 'internal' : 'web_app';
+          mutateData(dockerApplicationEnvironment as any, {
+            SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI: 'http://keycloak:9080/realms/jhipster',
+            SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID: clientId,
+            SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET: clientId,
+          });
         }
+
         if (application.generateInMemoryUserCredentials) {
           mutateData(dockerApplicationEnvironment as any, {
             SPRING_SECURITY_USER_NAME: application.defaultAdminUsername,
@@ -139,6 +147,23 @@ export default class BootstrapGenerator extends SpringBootApplicationGenerator {
           mutateData(dockerApplicationEnvironment as any, {
             SPRING_COUCHBASE_USERNAME: 'Administrator',
             SPRING_COUCHBASE_PASSWORD: 'password',
+            SPRING_COUCHBASE_CONNECTION_STRING: 'couchbase',
+            JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME: application.baseName,
+            JHIPSTER_SLEEP: '20', // Let database to start
+          });
+        } else if (application.databaseTypeNeo4j) {
+          mutateData(dockerApplicationEnvironment as any, {
+            SPRING_NEO4J_URI: 'bolt://neo4j:7687',
+          });
+          if (application.databaseMigrationLiquibase) {
+            mutateData(dockerApplicationEnvironment as any, {
+              SPRING_LIQUIBASE_URL: 'jdbc:neo4j:bolt://neo4j:7687',
+            });
+          }
+        } else if (application.databaseTypeCassandra) {
+          mutateData(dockerApplicationEnvironment as any, {
+            SPRING_CASSANDRA_CONTACTPOINTS: 'cassandra',
+            JHIPSTER_SLEEP: '10', // Let migration complete
           });
         }
       },

generators/spring-boot/templates/src/main/resources/config/application-secret-samples.yml.ejs

@@ -50,6 +50,24 @@ spring:
         - <%- role %>
   <%_ } _%>
 <%_ } _%>
+<%_ if (authenticationTypeOauth2) { _%>
+  security:
+    oauth2:
+      client:
+        provider:
+          oidc:
+            issuer-uri: http://localhost:9080/realms/jhipster
+        registration:
+          oidc:
+  <%_ if (applicationTypeMicroservice) { _%>
+            client-id: internal
+            client-secret: internal
+  <%_ } else { _%>
+            client-id: web_app
+            client-secret: web_app
+  <%_ } _%>
+            scope: openid, profile, email, offline_access # last one for refresh tokens
+<%_ } _%>
 
 jhipster:
 <%_ if (serviceDiscoveryEureka) { _%>

generators/spring-boot/templates/src/main/resources/config/application.yml.ejs

@@ -345,32 +345,21 @@ spring:
     representation:
       uuid: standard
 <%_ } _%>
-<%_ if (authenticationTypeOauth2 || authenticationTypeJwt) { _%>
+<%_ if (authenticationTypeOauth2) { _%>
   security:
-  <%_ if (authenticationTypeOauth2) { _%>
     oauth2:
       client:
-        provider:
-          oidc:
-            issuer-uri: http://localhost:9080/realms/jhipster
         registration:
           oidc:
-    <%_ if (applicationTypeMicroservice) { _%>
-            client-id: internal
-            client-secret: internal
-    <%_ } else { _%>
-            client-id: web_app
-            client-secret: web_app
-    <%_ } _%>
-            scope: openid, profile, email, offline_access # last one for refresh tokens
-  <%_ } _%>
-  <%_ if (authenticationTypeJwt) { _%>
+            scope: openid, profile
+<%_ } _%>
+<%_ if (authenticationTypeJwt) { _%>
+  security:
     oauth2:
       resourceserver:
         jwt:
           authority-prefix: ''
           authorities-claim-name: auth
-  <%_ } _%>
 <%_ } _%>
   task:
     execution: