generator-jhipster 7.3.1 → 7.4.0

package/generators/openshift/templates/deployment.yml.ejs

@@ -190,7 +190,7 @@ objects:
 <%_ if (app.databaseTypeCouchbase) { _%>
             - name: SPRING_COUCHBASE_CONNECTION_STRING
               value: ${APPLICATION_NAME}-couchbase
-            - name: JHIPSTER_COUCHBASE_BUCKET_NAME
+            - name: JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME
               value: ${APPLICATION_NAME}
 <%_ } _%>
 <%_ if (app.searchEngineElasticsearch) { _%>

package/generators/page/index.js

@@ -27,8 +27,6 @@ const { PROTRACTOR } = require('../../jdl/jhipster/test-framework-types');
 
 const { VUE } = constants.SUPPORTED_CLIENT_FRAMEWORKS;
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
@@ -61,8 +59,12 @@ module.exports = class extends BaseBlueprintGenerator {
     this.loadRuntimeOptions();
 
     this.rootGenerator = this.env.rootGenerator() === this;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_PAGE);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_PAGE);
+    }
   }
 
   _initializing() {
@@ -81,7 +83,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -92,7 +94,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -110,7 +112,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -130,7 +132,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -147,7 +149,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -165,7 +167,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 
@@ -183,7 +185,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/server/__snapshots__/generator.spec.mjs.snap

@@ -378,6 +378,10 @@ Object {
           "file": "package/security/jwt/JWTFilter.java",
           "renameTo": [Function],
         },
+        Object {
+          "file": "package/management/SecurityMetersService.java",
+          "renameTo": [Function],
+        },
       ],
     },
     Object {
@@ -1130,10 +1134,18 @@ Object {
       "condition": [Function],
       "path": "src/test/java/",
       "templates": Array [
+        Object {
+          "file": "package/management/SecurityMetersServiceTests.java",
+          "renameTo": [Function],
+        },
         Object {
           "file": "package/security/jwt/TokenProviderTest.java",
           "renameTo": [Function],
         },
+        Object {
+          "file": "package/security/jwt/TokenProviderSecurityMetersTests.java",
+          "renameTo": [Function],
+        },
         Object {
           "file": "package/security/jwt/JWTFilterTest.java",
           "renameTo": [Function],

package/generators/server/files.js

@@ -452,6 +452,10 @@ const baseServerFiles = {
           file: 'package/security/jwt/JWTFilter.java',
           renameTo: generator => `${generator.javaDir}security/jwt/JWTFilter.java`,
         },
+        {
+          file: 'package/management/SecurityMetersService.java',
+          renameTo: generator => `${generator.javaDir}management/SecurityMetersService.java`,
+        },
       ],
     },
     {
@@ -1598,10 +1602,18 @@ const baseServerFiles = {
       condition: generator => generator.authenticationType === JWT,
       path: SERVER_TEST_SRC_DIR,
       templates: [
+        {
+          file: 'package/management/SecurityMetersServiceTests.java',
+          renameTo: generator => `${generator.testDir}management/SecurityMetersServiceTests.java`,
+        },
         {
           file: 'package/security/jwt/TokenProviderTest.java',
           renameTo: generator => `${generator.testDir}security/jwt/TokenProviderTest.java`,
         },
+        {
+          file: 'package/security/jwt/TokenProviderSecurityMetersTests.java',
+          renameTo: generator => `${generator.testDir}security/jwt/TokenProviderSecurityMetersTests.java`,
+        },
         {
           file: 'package/security/jwt/JWTFilterTest.java',
           renameTo: generator => `${generator.testDir}security/jwt/JWTFilterTest.java`,

package/generators/server/index.js

@@ -54,8 +54,6 @@ const NO_CACHE = cacheTypes.NO;
 const NO_DATABASE = databaseTypes.NO;
 const NO_WEBSOCKET = websocketTypes.FALSE;
 
-let useBlueprints;
-
 module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -75,11 +73,15 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
 
     // preserve old jhipsterVersion value for cleanup which occurs after new config is written into disk
     this.jhipsterOldVersion = this.jhipsterConfig.jhipsterVersion;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_SERVER);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_SERVER);
+    }
 
     // Not using normal blueprints or this is a normal blueprint.
-    if (!useBlueprints || (this.fromBlueprint && this.sbsBlueprint)) {
+    if ((!this.fromBlueprint && !this.delegateToBlueprint) || (this.fromBlueprint && this.sbsBlueprint)) {
       this.setFeatures({
         customInstallTask: async function customInstallTask(preferredPm, defaultInstallTask) {
           const buildTool = this.jhipsterConfig.buildTool;
@@ -231,7 +233,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -251,7 +253,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -270,27 +272,27 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
   // Public API method used by the getter and also by Blueprints
   _composing() {
     return {
-      composeCommon() {
-        this.composeWithJHipster(GENERATOR_COMMON, true);
+      async composeCommon() {
+        await this.composeWithJHipster(GENERATOR_COMMON, true);
       },
 
-      composeLanguages() {
+      async composeLanguages() {
         // We don't expose client/server to cli, composing with languages is used for test purposes.
         if (this.jhipsterConfig.enableTranslation === false) return;
-        this.composeWithJHipster(GENERATOR_LANGUAGES, true);
+        await this.composeWithJHipster(GENERATOR_LANGUAGES, true);
       },
     };
   }
 
   get composing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._composing();
   }
 
@@ -310,7 +312,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -357,7 +359,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -415,7 +417,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -428,7 +430,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -595,12 +597,24 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
               'concurrently -k -s first "npm run backend:start" "npm start" "wait-on http-get://localhost:9000 && npm run e2e:headless -- -c baseUrl=http://localhost:9000"',
           });
         }
+        // Vue eagerly loads remotes, wait for it.
+        if (this.microfrontend && this.applicationTypeGateway && this.clientFrameworkVue) {
+          const remotesScript = this.remotes
+            .map(
+              app =>
+                `echo "Waiting for microfrontend ${app.baseName} to start" && wait-on http-get://localhost:$npm_package_config_backend_port/${app.endpointPrefix}/remoteEntry.js && echo "Microfrontend ${app.baseName} started"`
+            )
+            .join(' && ');
+          scriptsStorage.set({
+            'ci:server:await': `${scriptsStorage.get('ci:server:await')} && ${remotesScript}`,
+          });
+        }
       },
     };
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 
@@ -632,7 +646,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 

package/generators/server/templates/gradle.properties.ejs

@@ -28,12 +28,12 @@ springBootVersion=<%= SPRING_BOOT_VERSION %>
 # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/<%= SPRING_BOOT_VERSION %> -->
 hibernateVersion=<%= HIBERNATE_VERSION %>
 mapstructVersion=1.4.2.Final
-archunitJunit5Version=0.21.0
+archunitJunit5Version=0.22.0
 <%_ if (enableSwaggerCodegen) { _%>
 jacksonDatabindNullableVersion=<%= JACKSON_DATABIND_NULLABLE_VERSION %>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
-caffeineVersion=3.0.3
+caffeineVersion=3.0.4
 typesafeConfigVersion=1.4.1
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
@@ -47,7 +47,7 @@ commonsBeanutilsVersion=1.9.4
 
 <%_ if (reactive) { _%>
 blockhoundJunitPlatformVersion=1.0.6.RELEASE
-junitPlatformLauncherVersion=1.7.2
+junitPlatformLauncherVersion=1.8.1
 <%_ } _%>
 
 <%_ if (databaseTypeSql) { _%>
@@ -63,21 +63,21 @@ cassandraDriverVersion=4.11.3
 jibPluginVersion=<%= JIB_VERSION %>
 gitPropertiesPluginVersion=2.3.1
 <%_ if (!skipClient) { _%>
-gradleNodePluginVersion=3.1.0
+gradleNodePluginVersion=3.1.1
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
-liquibasePluginVersion=2.0.4
+liquibasePluginVersion=2.1.0
 <%_ } _%>
 sonarqubePluginVersion=3.3
 <%_ if (enableSwaggerCodegen) { _%>
 openapiPluginVersion=5.2.1
 <%_ } _%>
-noHttpCheckstyleVersion=0.0.9
-checkstyleVersion=9.0
-modernizerPluginVersion=1.6.0
+noHttpCheckstyleVersion=0.0.10
+checkstyleVersion=9.1
+modernizerPluginVersion=1.6.1
 <%_ if (enableGradleEnterprise) { _%>
-gradleEnterprisePluginVersion=3.6.4
-gradleCommonCustomUserDataPluginVersion=1.4.2
+gradleEnterprisePluginVersion=3.7.1
+gradleCommonCustomUserDataPluginVersion=1.5
 <%_ } _%>
 # jhipster-needle-gradle-property - JHipster will add additional properties here
 

package/generators/server/templates/pom.xml.ejs

@@ -126,13 +126,13 @@
         https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} -->
         <cassandra-driver.version>4.11.3</cassandra-driver.version>
 <%_ } _%>
-        <archunit-junit5.version>0.21.0</archunit-junit5.version>
+        <archunit-junit5.version>0.22.0</archunit-junit5.version>
         <mapstruct.version>1.4.2.Final</mapstruct.version>
 <%_ if (enableSwaggerCodegen) { _%>
         <jackson-databind-nullable.version><%= JACKSON_DATABIND_NULLABLE_VERSION %></jackson-databind-nullable.version>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
-        <caffeine.version>3.0.3</caffeine.version>
+        <caffeine.version>3.0.4</caffeine.version>
         <typesafe.version>1.4.1</typesafe.version>
 <%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
@@ -151,10 +151,10 @@
         <maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-        <maven-war-plugin.version>3.3.1</maven-war-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-        <checkstyle.version>9.0</checkstyle.version>
-        <nohttp-checkstyle.version>0.0.9</nohttp-checkstyle.version>
+        <checkstyle.version>9.1</checkstyle.version>
+        <nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
 <%_ if (!skipClient) { _%>
         <frontend-maven-plugin.version>1.12.0</frontend-maven-plugin.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
@@ -171,7 +171,7 @@
         <openapi-generator-maven-plugin.version>5.2.1</openapi-generator-maven-plugin.version>
 <%_ } _%>
         <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
-        <sonar-maven-plugin.version>3.9.0.2155</sonar-maven-plugin.version>
+        <sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
         <!-- jhipster-needle-maven-property -->
     </properties>
 

package/generators/server/templates/src/main/docker/app.yml.ejs

@@ -52,7 +52,7 @@ _%>
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
       - SPRING_COUCHBASE_CONNECTION_STRING=<%= baseName.toLowerCase() %>-couchbase
-      - JHIPSTER_COUCHBASE_BUCKET_NAME=<%= baseName %>
+      - JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME=<%= baseName %>
 <%_ } _%>
 <%_ if (cacheProviderMemcached) { _%>
       - JHIPSTER_CACHE_MEMCACHED_SERVERS=<%= baseName.toLowerCase() %>-memcached:11211

package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs

@@ -278,8 +278,8 @@ public class SecurityConfiguration {
             .pathMatchers("/api/admin/**").hasAuthority(AuthoritiesConstants.ADMIN)
             .pathMatchers("/api/**").authenticated()
 <%_ if (applicationTypeGateway) { _%>
-  <%_ if (microfrontend && authenticationTypeJwt) { _%>
-            // microfrontend resources are loaded by webpack without a bearer-token, they need to be public
+  <%_ if (microfrontend && (authenticationTypeJwt || clientFrameworkVue)) { _%>
+            // microfrontend resources are loaded by webpack without authentication, they need to be public
             .pathMatchers("/services/*/*.js").permitAll()
             .pathMatchers("/services/*/*.js.map").permitAll()
   <%_ } _%>

package/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs

@@ -79,7 +79,6 @@ import javax.servlet.*;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
-import java.util.*;
 
 import static java.net.URLDecoder.decode;
     <%_ } _%>

package/generators/server/templates/src/main/java/package/management/SecurityMetersService.java.ejs

@@ -0,0 +1,68 @@
+<%#
+ 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.
+-%>
+package <%= packageName %>.management;
+
+import org.springframework.stereotype.Service;
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+
+@Service
+public class SecurityMetersService {
+
+    public static final String INVALID_TOKENS_METER_NAME = "security.authentication.invalid-tokens";
+    public static final String INVALID_TOKENS_METER_DESCRIPTION = "Indicates validation error count of the tokens presented by the clients.";
+    public static final String INVALID_TOKENS_METER_BASE_UNIT = "errors";
+    public static final String INVALID_TOKENS_METER_CAUSE_DIMENSION = "cause";
+
+    private final Counter tokenInvalidSignatureCounter;
+    private final Counter tokenExpiredCounter;
+    private final Counter tokenUnsupportedCounter;
+    private final Counter tokenMalformedCounter;
+
+    public SecurityMetersService(MeterRegistry registry) {
+        this.tokenInvalidSignatureCounter = invalidTokensCounterForCauseBuilder("invalid-signature").register(registry);
+        this.tokenExpiredCounter = invalidTokensCounterForCauseBuilder("expired").register(registry);
+        this.tokenUnsupportedCounter = invalidTokensCounterForCauseBuilder("unsupported").register(registry);
+        this.tokenMalformedCounter = invalidTokensCounterForCauseBuilder("malformed").register(registry);
+    }
+
+    private Counter.Builder invalidTokensCounterForCauseBuilder(String cause) {
+        return Counter.builder(INVALID_TOKENS_METER_NAME)
+            .baseUnit(INVALID_TOKENS_METER_BASE_UNIT)
+            .description(INVALID_TOKENS_METER_DESCRIPTION)
+            .tag(INVALID_TOKENS_METER_CAUSE_DIMENSION, cause);
+    }
+
+    public void trackTokenInvalidSignature() {
+        this.tokenInvalidSignatureCounter.increment();
+    }
+
+    public void trackTokenExpired() {
+        this.tokenExpiredCounter.increment();
+    }
+
+    public void trackTokenUnsupported() {
+        this.tokenUnsupportedCounter.increment();
+    }
+
+    public void trackTokenMalformed() {
+        this.tokenMalformedCounter.increment();
+    }
+}

package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs

@@ -34,13 +34,17 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
 import tech.jhipster.config.JHipsterProperties;
+
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.io.Decoders;
+import io.jsonwebtoken.security.SignatureException;
 <%_ if (reactive) { _%>
 import io.jsonwebtoken.jackson.io.JacksonSerializer;
 <%_ } _%>
 import io.jsonwebtoken.security.Keys;
 
+import <%= packageName %>.management.SecurityMetersService;
+
 @Component
 public class TokenProvider {
 
@@ -56,7 +60,9 @@ public class TokenProvider {
 
     private final long tokenValidityInMillisecondsForRememberMe;
 
-    public TokenProvider(JHipsterProperties jHipsterProperties) {
+    private final SecurityMetersService securityMetersService;
+
+    public TokenProvider(JHipsterProperties jHipsterProperties, SecurityMetersService securityMetersService) {
         byte[] keyBytes;
         String secret = jHipsterProperties.getSecurity().getAuthentication().getJwt().getBase64Secret();
         if (!ObjectUtils.isEmpty(secret)) {
@@ -75,6 +81,8 @@ public class TokenProvider {
         this.tokenValidityInMillisecondsForRememberMe =
             1000 * jHipsterProperties.getSecurity().getAuthentication().getJwt()
                 .getTokenValidityInSecondsForRememberMe();
+
+        this.securityMetersService = securityMetersService;
     }
 
     public String createToken(Authentication authentication, boolean rememberMe) {
@@ -118,11 +126,28 @@ public class TokenProvider {
     public boolean validateToken(String authToken) {
         try {
             jwtParser.parseClaimsJws(authToken);
+
             return true;
-        } catch (JwtException | IllegalArgumentException e) {
-            log.info("Invalid JWT token.");
-            log.trace("Invalid JWT token trace.", e);
+        } catch (ExpiredJwtException e) {
+            this.securityMetersService.trackTokenExpired();
+
+            log.trace("Invalid JWT token.", e);
+        } catch (UnsupportedJwtException e) {
+            this.securityMetersService.trackTokenUnsupported();
+
+            log.trace("Invalid JWT token.", e);
+        } catch (MalformedJwtException e) {
+            this.securityMetersService.trackTokenMalformed();
+
+            log.trace("Invalid JWT token.", e);
+        } catch (SignatureException e) {
+            this.securityMetersService.trackTokenInvalidSignature();
+
+            log.trace("Invalid JWT token.", e);
+        } catch (IllegalArgumentException e) { // TODO: should we let it bubble (no catch), to avoid defensive programming and follow the fail-fast principle?
+            log.error("Token validation error {}", e.getMessage());
         }
+
         return false;
     }
 }

package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs

@@ -34,6 +34,7 @@ import org.springframework.web.client.RestTemplate;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -62,7 +63,7 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
 
     public Map<String, Object> convert(Map<String, Object> claims) {
         Map<String, Object> convertedClaims = this.delegate.convert(claims);
-        if (RequestContextHolder.getRequestAttributes() != null) {
+        if (RequestContextHolder.getRequestAttributes() != null && ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) != null) {
             // Retrieve and set the token
             String token = bearerTokenResolver.resolve(((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
             HttpHeaders headers = new HttpHeaders();
@@ -83,20 +84,31 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
                 if (user.has("family_name")) {
                     convertedClaims.put("family_name", user.get("family_name").asText());
                 }
+                if (user.has("email")) {
+                    convertedClaims.put("email", user.get("email").asText());
+                }
+                // Allow full name in a name claim - happens with Auth0
+                if (user.has("name")) {
+                    String[] name = user.get("name").asText().split("\\s+");
+                    if (name.length > 0) {
+                        convertedClaims.put("given_name", name[0]);
+                        convertedClaims.put("family_name",
+                            String.join(" ", Arrays.copyOfRange(name, 1, name.length)));
+                    }
+                }
                 if (user.has("groups")) {
                     List<String> groups = StreamSupport.stream(user.get("groups").spliterator(), false)
                         .map(JsonNode::asText)
                         .collect(Collectors.toList());
                     convertedClaims.put("groups", groups);
                 }
-            }
-
-            if (user.has(SecurityUtils.CLAIMS_NAMESPACE + "roles")) {
-                List<String> roles = StreamSupport
-                    .stream(user.get(SecurityUtils.CLAIMS_NAMESPACE + "roles").spliterator(), false)
-                    .map(JsonNode::asText)
-                    .collect(Collectors.toList());
-                convertedClaims.put("roles", roles);
+                if (user.has(SecurityUtils.CLAIMS_NAMESPACE + "roles")) {
+                    List<String> roles = StreamSupport
+                        .stream(user.get(SecurityUtils.CLAIMS_NAMESPACE + "roles").spliterator(), false)
+                        .map(JsonNode::asText)
+                        .collect(Collectors.toList());
+                    convertedClaims.put("roles", roles);
+                }
             }
         }
         return convertedClaims;

package/generators/server/templates/src/main/java/package/service/UserService.java.ejs

@@ -1017,15 +1017,20 @@ public class UserService {
     private static <%= databaseTypeNo ? asDto('AdminUser') : asEntity('User') %> getUser(Map<String, Object> details) {
         <%= databaseTypeNo ? asDto('AdminUser') : asEntity('User') %> user = new <%= databaseTypeNo ? asDto('AdminUser') : asEntity('User') %>();
         Boolean activated = Boolean.TRUE;
+        String sub = String.valueOf(details.get("sub"));
+        String username = null;
+        if (details.get("preferred_username") != null) {
+            username = ((String) details.get("preferred_username")).toLowerCase();
+        }
         // handle resource server JWT, where sub claim is email and uid is ID
         if (details.get("uid") != null) {
             user.setId((String) details.get("uid"));
-            user.setLogin((String) details.get("sub"));
+            user.setLogin(sub);
         } else {
-            user.setId((String) details.get("sub"));
+            user.setId(sub);
         }
-        if (details.get("preferred_username") != null) {
-            user.setLogin(((String) details.get("preferred_username")).toLowerCase());
+        if (username != null) {
+            user.setLogin(username);
         } else if (user.getLogin() == null) {
             user.setLogin(user.getId());
         }
@@ -1042,8 +1047,11 @@ public class UserService {
         }
         if (details.get("email") != null) {
             user.setEmail(((String) details.get("email")).toLowerCase());
+        } else if (sub.contains("|") && (username != null && username.contains("@"))) {
+            // special handling for Auth0
+            user.setEmail(username);
         } else {
-            user.setEmail((String) details.get("sub"));
+            user.setEmail(sub);
         }
         if (details.get("langKey") != null) {
             user.setLangKey((String) details.get("langKey"));