Merge pull request #58 from redlink-gmbh/umm/401-resolve-incompatibilitis-with-studymanager-services-module

MORE-Platform#401: Refactoring and Removal of not strictly needed classes

Author: westei

studymanager-auth-token/src/main/java/io/redlink/more/auth/event/ParticipantUpdateAction.java

@@ -8,7 +8,7 @@
  */
 package io.redlink.more.auth.token.configuration;
 
-import io.redlink.more.auth.token.model.LoginTokenUserDetails;
+import io.redlink.more.auth.token.model.TokenAuthUserDetails;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
@@ -29,11 +29,11 @@ public Authentication getAuthentication() {
     /**
      * Asserts that hte current authentication context contains the provided authority ("role").
      * @param authority the required authority
-     * @return the authentication principal as {@link LoginTokenUserDetails}.
+     * @return the authentication principal as {@link TokenAuthUserDetails}.
      * @throws IllegalArgumentException if authority is {@code null}
      * @throws AccessDeniedException if not authentication context is available or the required authority is not present.
      */
-    public LoginTokenUserDetails assertAuthority(String authority) {
+    public TokenAuthUserDetails assertAuthority(String authority) {
         if (authority == null) throw new IllegalArgumentException("authority must not be null");
 
         final Authentication authentication = getAuthentication();
@@ -45,7 +45,7 @@ public LoginTokenUserDetails assertAuthority(String authority) {
                 .map(GrantedAuthority::getAuthority)
                 .anyMatch(authority::equals)) {
             final Object principal = authentication.getPrincipal();
-            if (principal instanceof LoginTokenUserDetails userDetails) {
+            if (principal instanceof TokenAuthUserDetails userDetails) {
                 return userDetails;
             }
         }

studymanager-auth-token/src/main/java/io/redlink/more/auth/event/ParticipantUpdateEvent.java

@@ -1,6 +1,6 @@
 package io.redlink.more.auth.token.configuration;
 
-import io.redlink.more.auth.token.service.LoginTokenUserDetailService;
+import io.redlink.more.auth.token.service.TokenAuthUserDetailService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
@@ -17,17 +17,17 @@
 @Configuration
 public class DaoAuthenticationConfiguration {
 
-    private final LoginTokenUserDetailService loginTokenUserDetailService;
+    private final TokenAuthUserDetailService tokenAuthUserDetailService;
 
-    DaoAuthenticationConfiguration(LoginTokenUserDetailService loginTokenUserDetailService) {
-        this.loginTokenUserDetailService = loginTokenUserDetailService;
+    DaoAuthenticationConfiguration(TokenAuthUserDetailService tokenAuthUserDetailService) {
+        this.tokenAuthUserDetailService = tokenAuthUserDetailService;
     }
 
     @Bean
     public DaoAuthenticationProvider authenticationProvider(PasswordEncoder passwordEncoder) {
         DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
         provider.setPasswordEncoder(passwordEncoder);
-        provider.setUserDetailsService(loginTokenUserDetailService);
+        provider.setUserDetailsService(tokenAuthUserDetailService);
         return provider;
     }
 

studymanager-auth-token/src/main/java/io/redlink/more/auth/token/configuration/AuthenticationFacade.java

@@ -16,11 +16,11 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class LoginTokenUserDetails extends User {
+public class TokenAuthUserDetails extends User {
 
     private final RoutingInfo routingInfo;
 
-    public LoginTokenUserDetails(String username, String password, Set<String> roles, RoutingInfo routingInfo) {
+    public TokenAuthUserDetails(String username, String password, Set<String> roles, RoutingInfo routingInfo) {
         super(username, password, roles.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toSet()));
         this.routingInfo = routingInfo;
     }
@@ -34,7 +34,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         if (!super.equals(o)) return false;
-        LoginTokenUserDetails that = (LoginTokenUserDetails) o;
+        TokenAuthUserDetails that = (TokenAuthUserDetails) o;
         return Objects.equals(routingInfo, that.routingInfo);
     }
 

studymanager-auth-token/src/main/java/io/redlink/more/auth/token/configuration/DaoAuthenticationConfiguration.java

@@ -8,7 +8,7 @@
  */
 package io.redlink.more.auth.token.repository;
 
-import io.redlink.more.auth.token.model.LoginTokenUserDetails;
+import io.redlink.more.auth.token.model.TokenAuthUserDetails;
 import io.redlink.more.auth.model.RoutingInfo;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -21,18 +21,18 @@
 import java.util.Set;
 
 @Service
-public class LoginTokenUserRepository {
+public class TokenAuthUserRepository {
 
     private static final String GET_AUTH_ROUTING_INFO =
             "SELECT * FROM auth_routing_info WHERE api_id = :api_id";
 
     private final NamedParameterJdbcTemplate jdbcTemplate;
 
-    public LoginTokenUserRepository(JdbcTemplate jdbcTemplate) {
+    public TokenAuthUserRepository(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
     }
 
-    public Optional<LoginTokenUserDetails> findByApiId(String apiId, Set<String> roles) {
+    public Optional<TokenAuthUserDetails> findByApiId(String apiId, Set<String> roles) {
         try (var stream = jdbcTemplate.queryForStream(
                 GET_AUTH_ROUTING_INFO,
                 Map.of("api_id", apiId),
@@ -42,8 +42,8 @@ public Optional<LoginTokenUserDetails> findByApiId(String apiId, Set<String> rol
         }
     }
 
-    private static LoginTokenUserDetails readUserDetails(ResultSet rs, Set<String> roles) throws SQLException {
-        return new LoginTokenUserDetails(
+    private static TokenAuthUserDetails readUserDetails(ResultSet rs, Set<String> roles) throws SQLException {
+        return new TokenAuthUserDetails(
                 rs.getString("api_id"),
                 rs.getString("api_secret"),
                 roles,