#943: minor code cleanup for readability

puzzle · Jun 14, 2024 · f1fb128 · f1fb128
1 parent 41a852e
commit f1fb128
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/backend/src/main/java/ch/puzzle/okr/security/TenantJwtIssuerValidator.java b/backend/src/main/java/ch/puzzle/okr/security/TenantJwtIssuerValidator.java
@@ -25,15 +25,12 @@ public TenantJwtIssuerValidator(TenantConfigProvider tenantConfigProvider, JwtHe
 
     @Override
     public OAuth2TokenValidatorResult validate(Jwt token) {
-        return this.validators.computeIfAbsent(toTenant(token), this::fromTenant) //
-                .validate(token);
+        String tenant = jwtHelper.getTenantFromToken(token);
+        JwtIssuerValidator validator = validators.computeIfAbsent(tenant, this::createValidatorForTenant);
+        return validator.validate(token);
     }
 
-    private String toTenant(Jwt jwt) {
-        return jwtHelper.getTenantFromToken(jwt);
-    }
-
-    private JwtIssuerValidator fromTenant(String tenant) {
+    private JwtIssuerValidator createValidatorForTenant(String tenant) {
         return this.tenantConfigProvider.getTenantConfigById(tenant) //
                 .map(TenantConfigProvider.TenantConfig::issuerUrl) //
                 .map(this::createValidator) //