generator-jhipster 7.3.0 → 7.5.0

package/generators/server/templates/sql/reactive/src/main/java/package/repository/UserSqlHelper.java.ejs

@@ -0,0 +1,48 @@
+<%#
+ 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 %>.repository;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.data.relational.core.sql.Column;
+import org.springframework.data.relational.core.sql.Expression;
+import org.springframework.data.relational.core.sql.Table;
+
+public class UserSqlHelper {
+    public static List<Expression> getColumns(Table table, String columnPrefix) {
+        List<Expression> columns = new ArrayList<>();
+        columns.add(Column.aliased("id", table, columnPrefix + "_id"));
+        columns.add(Column.aliased("login", table, columnPrefix + "_login"));
+  <%_ if (!authenticationTypeOauth2) { _%>
+        columns.add(Column.aliased("password_hash", table, columnPrefix + "_password"));
+  <%_ } _%>
+        columns.add(Column.aliased("first_name", table, columnPrefix + "_first_name"));
+        columns.add(Column.aliased("last_name", table, columnPrefix + "_last_name"));
+        columns.add(Column.aliased("email", table, columnPrefix + "_email"));
+        columns.add(Column.aliased("activated", table, columnPrefix + "_activated"));
+        columns.add(Column.aliased("lang_key", table, columnPrefix + "_lang_key"));
+        columns.add(Column.aliased("image_url", table, columnPrefix + "_image_url"));
+  <%_ if (!authenticationTypeOauth2) { _%>
+        columns.add(Column.aliased("activation_key", table, columnPrefix + "_activation_key"));
+        columns.add(Column.aliased("reset_key", table, columnPrefix + "_reset_key"));
+        columns.add(Column.aliased("reset_date", table, columnPrefix + "_reset_date"));
+  <%_ } _%>
+        return columns;
+    }
+}

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/docker/config/realm-config/jhipster-realm.json.ejs

@@ -321,7 +321,7 @@
       "security-admin-console": [],
       "web_app": [],
       "admin-cli": [],
-      "account-console": [],<% if (serviceDiscoveryType === 'eureka') { %>
+      "account-console": [],<% if (serviceDiscoveryEureka) { %>
       "jhipster-registry": [],<% } %>
       "broker": [
         {
@@ -2491,7 +2491,7 @@
     "clientOfflineSessionIdleTimeout": "0",
     "cibaInterval": "5"
   },
-  "keycloakVersion": "15.0.2",
+  "keycloakVersion": "16.1.0",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []

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

@@ -198,8 +198,9 @@ public class LocaleConfiguration {
                             "'" + (timeZone != null ? " and time zone '" + timeZone.getID() + "'" : ""));
                     }
                 }
-                exchange.getAttributes().put(LOCALE_REQUEST_ATTRIBUTE_NAME,
-                    locale != null ? locale : exchange.getLocaleContext().getLocale());
+                if (locale != null) {
+                    exchange.getAttributes().put(LOCALE_REQUEST_ATTRIBUTE_NAME, locale);
+                }
                 if (timeZone != null) {
                     exchange.getAttributes().put(TIME_ZONE_REQUEST_ATTRIBUTE_NAME, timeZone);
                 } else {

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

@@ -18,72 +18,35 @@
 -%>
 package <%= packageName %>.config;
 
-import tech.jhipster.config.JHipsterConstants;
-import tech.jhipster.config.JHipsterProperties;
-import tech.jhipster.config.apidoc.customizer.SpringfoxCustomizer;
+import org.springdoc.core.GroupedOpenApi;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.ResponseEntity;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-
-import static springfox.documentation.builders.PathSelectors.regex;
+import tech.jhipster.config.JHipsterConstants;
+import tech.jhipster.config.JHipsterProperties;
+import tech.jhipster.config.apidoc.customizer.JHipsterOpenApiCustomizer;
 
 @Configuration
 @Profile(JHipsterConstants.SPRING_PROFILE_API_DOCS)
 public class OpenApiConfiguration {
 
-    @Bean
-    public SpringfoxCustomizer noApiFirstCustomizer() {
-        return docket -> docket.select()
-            .apis(RequestHandlerSelectors.basePackage("<%= packageName %>.web.api").negate());
-    }
+    public static final String API_FIRST_PACKAGE = "<%= packageName %>.web.api";
 
     @Bean
-    public Docket apiFirstDocket(JHipsterProperties jHipsterProperties) {
+    @ConditionalOnMissingBean(name = "apiFirstGroupedOpenAPI")
+    public GroupedOpenApi apiFirstGroupedOpenAPI(
+        JHipsterOpenApiCustomizer jhipsterOpenApiCustomizer,
+        JHipsterProperties jHipsterProperties
+    ) {
         JHipsterProperties.ApiDocs properties = jHipsterProperties.getApiDocs();
-        Contact contact = new Contact(
-            properties.getContactName(),
-            properties.getContactUrl(),
-            properties.getContactEmail()
-        );
-
-        ApiInfo apiInfo = new ApiInfo(
-            "API First " + properties.getTitle(),
-            properties.getDescription(),
-            properties.getVersion(),
-            properties.getTermsOfServiceUrl(),
-            contact,
-            properties.getLicense(),
-            properties.getLicenseUrl(),
-            new ArrayList<>()
-        );
-
-        return new Docket(DocumentationType.OAS_30)
-            .groupName("openapi")
-            .host(properties.getHost())
-            .protocols(new HashSet<>(Arrays.asList(properties.getProtocols())))
-            .apiInfo(apiInfo)
-            .useDefaultResponseMessages(properties.isUseDefaultResponseMessages())
-            .forCodeGeneration(true)
-            .directModelSubstitute(ByteBuffer.class, String.class)
-            .genericModelSubstitutes(ResponseEntity.class)
-            .ignoredParameterTypes(Pageable.class)
-            .select()
-            .apis(RequestHandlerSelectors.basePackage("<%= packageName %>.web.api"))
-            .paths(regex(properties.getDefaultIncludePattern()))
+        return GroupedOpenApi.builder()
+            .group("openapi")
+            .addOpenApiCustomiser(jhipsterOpenApiCustomizer)
+            .packagesToScan(API_FIRST_PACKAGE)
+            .pathsToMatch(properties.getDefaultIncludePattern())
             .build();
     }
-
-
 }

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

@@ -268,14 +268,14 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
   <%_ if (applicationTypeMonolith) { _%>
         .and()
             .httpBasic()
-        <%_ } _%>
+  <%_ } _%>
         .and()
             .apply(securityConfigurerAdapter());
-  <%_ } else if (authenticationTypeOauth2) { _%>
-    <%_ if (applicationTypeMonolith) { _%>
+<%_ } else if (authenticationTypeOauth2) { _%>
+  <%_ if (applicationTypeMonolith) { _%>
         .and()
             .oauth2Login()
-    <%_ } _%>
+  <%_ } _%>
         .and()
             .oauth2ResourceServer()
                 .jwt()
@@ -283,7 +283,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                 .and()
             .and()
                 .oauth2Client();
-  <%_ } _%>
+<%_ } _%>
         // @formatter:on
     }
 <%_ if (authenticationTypeJwt) { _%>

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

@@ -211,7 +211,7 @@ public class SecurityConfiguration {
         // @formatter:off
         http
             .securityMatcher(new NegatedServerWebExchangeMatcher(new OrServerWebExchangeMatcher(
-                pathMatchers("/app/**", "/i18n/**", "/content/**", "/swagger-ui/**", "/swagger-resources/**", "/v2/api-docs", "/v3/api-docs", "/test/**"),
+                pathMatchers("/app/**", "/i18n/**", "/content/**", "/swagger-ui/**", "/v3/api-docs/**", "/test/**"),
                 pathMatchers(HttpMethod.OPTIONS, "/**")
             )))
             .csrf()
@@ -278,11 +278,9 @@ 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
+            // microfrontend resources are loaded by webpack without authentication, they need to be public
             .pathMatchers("/services/*/*.js").permitAll()
             .pathMatchers("/services/*/*.js.map").permitAll()
-  <%_ } _%>
             .pathMatchers("/services/*/v3/api-docs").hasAuthority(AuthoritiesConstants.ADMIN)
 <%_ } _%>
 <%_ if (applicationTypeMonolith || applicationTypeGateway) { _%>
@@ -308,7 +306,7 @@ public class SecurityConfiguration {
     }
 <%_ if (authenticationTypeOauth2) { _%>
 
-    <%_ if (applicationType === 'gateway') { _%>
+  <%_ if (applicationTypeGateway) { _%>
     private ServerOAuth2AuthorizationRequestResolver authorizationRequestResolver(
         ReactiveClientRegistrationRepository clientRegistrationRepository) {
         DefaultServerOAuth2AuthorizationRequestResolver authorizationRequestResolver =
@@ -325,7 +323,7 @@ public class SecurityConfiguration {
                 uriBuilder.queryParam("audience", jHipsterProperties.getSecurity().getOauth2().getAudience())
                     .build());
     }
-    <%_ } _%>
+  <%_ } _%>
 
     Converter<Jwt, Mono<AbstractAuthenticationToken>> jwtAuthenticationConverter() {
         JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();

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;
     <%_ } _%>
@@ -184,9 +183,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
             log.debug("Registering CORS filter");
             source.registerCorsConfiguration("/api/**", config);
             source.registerCorsConfiguration("/management/**", config);
-            source.registerCorsConfiguration("/v2/api-docs", config);
             source.registerCorsConfiguration("/v3/api-docs", config);
-            source.registerCorsConfiguration("/swagger-resources", config);
             source.registerCorsConfiguration("/swagger-ui/**", config);
 <%_ if (applicationTypeGateway) { _%>
             source.registerCorsConfiguration("/*/api/**", config);

package/generators/server/templates/src/main/java/package/config/neo4j/Neo4jMigrations.java.ejs

@@ -20,6 +20,7 @@ package <%= packageName %>.config.neo4j;
 
 import ac.simons.neo4j.migrations.core.JavaBasedMigration;
 import ac.simons.neo4j.migrations.core.MigrationContext;
+import ac.simons.neo4j.migrations.core.MigrationsException;
 
 import java.io.IOException;
 import java.util.List;
@@ -46,11 +47,16 @@ final class Neo4jMigrations {
     static class V0001__CreateUsers implements JavaBasedMigration {
 
         @Override
-        public void apply(MigrationContext context) throws IOException {
+        public void apply(MigrationContext context) {
 
             ObjectMapper om = new ObjectMapper();
             ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
-            Resource[] resources = resourcePatternResolver.getResources("classpath:config/neo4j/migrations/user__*.json");
+            Resource[] resources;
+            try {
+              resources = resourcePatternResolver.getResources("classpath:config/neo4j/migrations/user__*.json");
+            } catch (IOException e) {
+              throw new MigrationsException("Could not load user definition resources.", e);
+            }
 
             JavaType type = om.getTypeFactory().
                 constructMapType(Map.class, String.class, Object.class);
@@ -69,13 +75,17 @@ final class Neo4jMigrations {
             try (Session session = context.getSession()) {
 
                 for (Resource resource : resources) {
-                    Map<String, Object> user = om.readValue(resource.getInputStream(), type);
-                    user.put("user_id", UUID.randomUUID().toString());
-                    List<String> authorities = (List<String>) user.remove("authorities");
-                    user.remove("_class");
-
-                    session.writeTransaction(
-                        t -> t.run(query, Values.parameters("user", user, "authorities", authorities)).consume());
+                    try {
+                        Map<String, Object> user = om.readValue(resource.getInputStream(), type);
+                        user.put("user_id", UUID.randomUUID().toString());
+                        List<String> authorities = (List<String>) user.remove("authorities");
+                        user.remove("_class");
+
+                        session.writeTransaction(
+                            t -> t.run(query, Values.parameters("user", user, "authorities", authorities)).consume());
+                    } catch (IOException e) {
+                        throw new MigrationsException("Could not load resource " + resource.getDescription() + ".", e);
+                    }
                 }
             }
         }

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/repository/AuthorityRepository.java.ejs

@@ -77,12 +77,12 @@ _%>
 public interface AuthorityRepository extends <% if (databaseTypeSql) { %><% if (reactive) { %>R2dbc<% } else { %>Jpa<% } %>Repository<% } else { %><% if (reactive && !databaseTypeCouchbase) { %>Reactive<% } %><% if (databaseTypeMongodb) { %>MongoRepository<% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<% } %><% if (databaseTypeCouchbase) { %>JHipsterCouchbaseRepository<% } %><% } %><Authority, String> {
 <%_ if (databaseTypeNeo4j) { _%>
     <% if (!reactive) { %>// See https://github.com/neo4j/sdn-rx/issues/51<%_ } _%>
-    <% if (reactive) { %>Flux<% } else { %>List<% } %><<%= asEntity('Authority') %>> findAll();
+    <% if (reactive) { %>Flux<% } else { %>List<% } %><Authority> findAll();
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
     @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter}")
     @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><<%= asEntity('Authority') %>> findAll();
+    <%= listOrFlux %><Authority> findAll();
 <%_ } _%>
 
 }

package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs

@@ -224,9 +224,7 @@ public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepositor
     <%_ if (cacheManagerIsAvailable) { _%>
     @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE)
     <%_ } _%>
-    <%_ if (databaseTypeCouchbase) { _%>
     @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%_ } _%>
     default <%= optionalOrMono %><<%= asEntity('User') %>> findOneByLogin(String login) {
         return findById(<%= asEntity('User') %>.PREFIX + ID_DELIMITER + login);
     }
@@ -464,29 +462,6 @@ class UserRepositoryInternalImpl implements UserRepositoryInternal {
     }
 }
 
-class UserSqlHelper {
-    static List<Expression> getColumns(Table table, String columnPrefix) {
-        List<Expression> columns = new ArrayList<>();
-        columns.add(Column.aliased("id", table, columnPrefix + "_id"));
-        columns.add(Column.aliased("login", table, columnPrefix + "_login"));
-  <%_ if (!authenticationTypeOauth2) { _%>
-        columns.add(Column.aliased("password_hash", table, columnPrefix + "_password"));
-  <%_ } _%>
-        columns.add(Column.aliased("first_name", table, columnPrefix + "_first_name"));
-        columns.add(Column.aliased("last_name", table, columnPrefix + "_last_name"));
-        columns.add(Column.aliased("email", table, columnPrefix + "_email"));
-        columns.add(Column.aliased("activated", table, columnPrefix + "_activated"));
-        columns.add(Column.aliased("lang_key", table, columnPrefix + "_lang_key"));
-        columns.add(Column.aliased("image_url", table, columnPrefix + "_image_url"));
-  <%_ if (!authenticationTypeOauth2) { _%>
-        columns.add(Column.aliased("activation_key", table, columnPrefix + "_activation_key"));
-        columns.add(Column.aliased("reset_key", table, columnPrefix + "_reset_key"));
-        columns.add(Column.aliased("reset_date", table, columnPrefix + "_reset_date"));
-  <%_ } _%>
-        return columns;
-    }
-}
-
 <%_ } else if (databaseTypeCassandra) { _%>
 @Repository
 public class UserRepository {

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 {
 
@@ -48,6 +52,8 @@ public class TokenProvider {
 
     private static final String AUTHORITIES_KEY = "auth";
 
+    private static final String INVALID_JWT_TOKEN = "Invalid JWT token.";
+
     private final Key key;
 
     private final JwtParser jwtParser;
@@ -56,7 +62,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 +83,8 @@ public class TokenProvider {
         this.tokenValidityInMillisecondsForRememberMe =
             1000 * jHipsterProperties.getSecurity().getAuthentication().getJwt()
                 .getTokenValidityInSecondsForRememberMe();
+
+        this.securityMetersService = securityMetersService;
     }
 
     public String createToken(Authentication authentication, boolean rememberMe) {
@@ -118,11 +128,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,10 +34,11 @@ 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;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -53,7 +54,7 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
 
     private final ClientRegistration registration;
 
-    private final Map<String, ObjectNode> users = new HashMap<>();
+    private final Map<String, ObjectNode> users = new ConcurrentHashMap<>();
 
     public CustomClaimConverter(ClientRegistration registration, RestTemplate restTemplate) {
         this.registration = registration;
@@ -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;