OAuth2: polish and improve code, reviewed by @Bolo89

jhipster · Mar 4, 2022 · c5b5ad7 · c5b5ad7
1 parent 75d1442
commit c5b5ad7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/src/main/java/tech/jhipster/lite/generator/project/domain/DefaultConfig.java b/src/main/java/tech/jhipster/lite/generator/project/domain/DefaultConfig.java
@@ -12,16 +12,19 @@ public class DefaultConfig {
   public static final String PACKAGE_NAME = "packageName";
   public static final String PRETTIER_DEFAULT_INDENT = "prettierDefaultIndent";
 
+  public static final String DEFAULT_PACKAGE_NAME = "com.mycompany.myapp";
+  public static final String PACKAGE_PATH = "com/mycompany/myapp";
+  public static final String DEFAULT_BASE_NAME = "jhipster";
+  public static final String DEFAULT_PROJECT_NAME = "JHipster Project";
+
   // prettier-ignore
   public static final Map<String, Object> defaultMap = Map.of(
-    BASE_NAME, "jhipster",
-    PROJECT_NAME, "JHipster Project",
-    PACKAGE_NAME, "com.mycompany.myapp",
+    BASE_NAME, DEFAULT_BASE_NAME,
+    PROJECT_NAME, DEFAULT_PROJECT_NAME,
+    PACKAGE_NAME, DEFAULT_PACKAGE_NAME,
     PRETTIER_DEFAULT_INDENT, DEFAULT_INDENTATION
   );
 
-  public static final String PACKAGE_PATH = "com/mycompany/myapp";
-
   private DefaultConfig() {}
 
   public static Optional<Object> get(String key) {

diff --git a/...e/generator/server/springboot/mvc/security/oauth2/domain/OAuth2SecurityDomainService.java b/...e/generator/server/springboot/mvc/security/oauth2/domain/OAuth2SecurityDomainService.java
@@ -103,12 +103,12 @@ private void updateIntegrationTestWithMockUser(Project project) {
 
   private void updateIntegrationTestWithTestSecurityConfiguration(Project project) {
     project.addDefaultConfig(PACKAGE_NAME);
-    String packageName = project.getPackageName().orElse("com.mycompany.myapp");
+    String packageName = project.getPackageName().orElse(DEFAULT_PACKAGE_NAME);
     String packageNamePath = project.getPackageNamePath().orElse(getPath(PACKAGE_PATH));
     String integrationTestPath = getPath(TEST_JAVA, packageNamePath);
 
     project.addDefaultConfig(BASE_NAME);
-    String baseName = project.getBaseName().orElse("jhipster");
+    String baseName = project.getBaseName().orElse(DEFAULT_BASE_NAME);
     String className = WordUtils.upperFirst(baseName);
 
     String oldImport = "import org.springframework.boot.test.context.SpringBootTest;";

diff --git a/.../springboot/mvc/security/oauth2/src/infrastructure/config/AudienceValidator.java.mustache b/.../springboot/mvc/security/oauth2/src/infrastructure/config/AudienceValidator.java.mustache
@@ -25,9 +25,8 @@ public class AudienceValidator implements OAuth2TokenValidator<Jwt> {
     List<String> audience = jwt.getAudience();
     if (audience.stream().anyMatch(allowedAudience::contains)) {
       return OAuth2TokenValidatorResult.success();
-    } else {
-      log.warn("Invalid audience: {}", audience);
-      return OAuth2TokenValidatorResult.failure(error);
     }
+    log.warn("Invalid audience: {}", audience);
+    return OAuth2TokenValidatorResult.failure(error);
   }
 }
diff --git a/...ringboot/mvc/security/oauth2/src/infrastructure/config/CustomClaimConverter.java.mustache b/...ringboot/mvc/security/oauth2/src/infrastructure/config/CustomClaimConverter.java.mustache
@@ -34,6 +34,7 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
   public static final String NAME = "name";
   public static final String PREFERRED_USERNAME = "preferred_username";
   public static final String ROLES = "roles";
+  public static final String SUB = "sub";
   private final BearerTokenResolver bearerTokenResolver = new DefaultBearerTokenResolver();
 
   private final MappedJwtClaimSetConverter delegate = MappedJwtClaimSetConverter.withDefaults(Collections.emptyMap());
@@ -58,11 +59,11 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
       // Retrieve and set the token
       String token = bearerTokenResolver.resolve(servletRequestAttributes.getRequest());
       HttpHeaders headers = new HttpHeaders();
-      headers.set("Authorization", buildBearer(token));
+      headers.set(HttpHeaders.AUTHORIZATION, buildBearer(token));
 
       // Retrieve user infos from OAuth provider if not already loaded
       ObjectNode user = users.computeIfAbsent(
-        claims.get("sub").toString(),
+        claims.get(SUB).toString(),
         s -> {
           ResponseEntity<ObjectNode> userInfo = restTemplate.exchange(
             registration.getProviderDetails().getUserInfoEndpoint().getUri(),