minor refactoring

urlaubsverwaltung · Jun 28, 2024 · 45d69c7 · 45d69c7
1 parent 2be0e99
commit 45d69c7
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/de/focusshift/zeiterfassung/security/OAuth2TenantUserService.java b/src/main/java/de/focusshift/zeiterfassung/security/OAuth2TenantUserService.java
@@ -26,20 +26,22 @@ abstract class OAuth2TenantUserService implements OAuth2UserService<OidcUserRequ
     public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2AuthenticationException {
 
         final OidcUser oidcUser = delegate.loadUser(userRequest);
-        final Optional<TenantUser> tenantUser = loadTenantUser(userRequest, oidcUser);
+        final Optional<TenantUser> maybeTenantUser = loadTenantUser(userRequest, oidcUser);
 
-        if (tenantUser.isEmpty()) {
+        if (maybeTenantUser.isEmpty()) {
             return oidcUser;
         }
 
-        if (!tenantUser.get().isActive()) {
+        final TenantUser tenantUser = maybeTenantUser.get();
+
+        if (!tenantUser.isActive()) {
             // prevent login of non-active users
-            throw new UserNotActiveException(tenantUser.get().id());
+            throw new UserNotActiveException(tenantUser.id());
         }
 
         final List<GrantedAuthority> combinedAuthorities = Stream.concat(
             oidcUser.getAuthorities().stream(),
-            tenantUser.get().authorities().stream().map(SecurityRole::authority)
+            tenantUser.authorities().stream().map(SecurityRole::authority)
         ).toList();
 
         return new DefaultOidcUser(combinedAuthorities, oidcUser.getIdToken(), oidcUser.getUserInfo());