cleanup

Author: R-Sandor

server/src/main/java/dev/findfirst/security/config/Oauth2BeanConfig.java

@@ -3,13 +3,9 @@
 import dev.findfirst.security.conditions.OAuthClientsCondition;
 import dev.findfirst.security.jwt.service.RefreshTokenService;
 import dev.findfirst.security.jwt.service.TokenService;
-import dev.findfirst.security.oauth2client.OauthUserService;
 import dev.findfirst.security.oauth2client.handlers.Oauth2LoginSuccessHandler;
-import dev.findfirst.users.repository.UserRepo;
-import dev.findfirst.users.service.UserManagementService;
-import lombok.RequiredArgsConstructor;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
@@ -34,8 +30,7 @@ public Oauth2LoginSuccessHandler oauth2Success() {
   }
 
   @Bean
-  @Qualifier("defaultOauthService")
-  public OAuth2UserService<OAuth2UserRequest, OAuth2User> defaultOAuth2UserService() {
+  @Qualifier("defaultOauthService") public OAuth2UserService<OAuth2UserRequest, OAuth2User> defaultOAuth2UserService() {
     return new DefaultOAuth2UserService();
   }
 }

server/src/main/java/dev/findfirst/security/oauth2client/OauthUserService.java

@@ -17,17 +17,13 @@
 import dev.findfirst.users.repository.UserRepo;
 import dev.findfirst.users.service.UserManagementService;
 
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Primary;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
 import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
@@ -47,8 +43,7 @@ public class OauthUserService implements OAuth2UserService<OAuth2UserRequest, OA
 
   private final UserManagementService ums;
 
-  @Qualifier("defaultOauthService")
-  private final OAuth2UserService<OAuth2UserRequest, OAuth2User> delegate;
+  @Qualifier("defaultOauthService") private final OAuth2UserService<OAuth2UserRequest, OAuth2User> delegate;
 
   @Transactional
   @Override
@@ -71,7 +66,8 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
 
     var username = attrs.get(userNameAttributeName).toString();
     final var registrationId = userRequest.getClientRegistration().getClientId();
-    final var oauth2PlaceholderEmail = "generated-" + username + registrationId + "@noemail.invalid";
+    final var oauth2PlaceholderEmail =
+        "generated-" + username + registrationId + "@noemail.invalid";
 
     Supplier<User> signup = () -> {
       try {
@@ -101,10 +97,12 @@ else if (username != null && !username.isEmpty()) {
       throw new RuntimeException("Error with user signup/signin");
     }
 
-    int userRole = (user.getRole() == null || user.getRole().getId() == null) ? 0 : user.getRole().getId();
+    int userRole =
+        (user.getRole() == null || user.getRole().getId() == null) ? 0 : user.getRole().getId();
 
     GrantedAuthority authority = new SimpleGrantedAuthority(URole.values()[userRole].toString());
-    var attributes = customAttribute(attrs, userNameAttributeName, user.getUserId(), registrationId);
+    var attributes =
+        customAttribute(attrs, userNameAttributeName, user.getUserId(), registrationId);
 
     return new DefaultOAuth2User(Collections.singletonList(authority), attributes,
         userNameAttributeName);