Oauth2 configuration updates

Author: R-Sandor

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

@@ -0,0 +1,27 @@
+package dev.findfirst.security.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
+
+import dev.findfirst.security.conditions.OAuthClientsCondition;
+import dev.findfirst.security.oauth2client.OauthUserService;
+import dev.findfirst.users.repository.UserRepo;
+import dev.findfirst.users.service.UserManagementService;
+import lombok.RequiredArgsConstructor;
+
+@Configuration
+@RequiredArgsConstructor
+public class Oauth2BeanConfig {
+
+  final UserManagementService ums;
+  final UserRepo userRepo;
+
+  @Conditional(OAuthClientsCondition.class)
+  @Bean
+  public OauthUserService oauthUserService() {
+    return new OauthUserService(userRepo, ums, new DefaultOAuth2UserService());
+  }
+
+}

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

@@ -1,6 +1,5 @@
 package dev.findfirst.security.config;
 
-
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 
@@ -10,6 +9,7 @@
 import dev.findfirst.security.oauth2client.handlers.Oauth2LoginSuccessHandler;
 import dev.findfirst.security.userauth.service.UserDetailsServiceImpl;
 
+import dev.findfirst.security.oauth2client.OauthUserService;
 import com.nimbusds.jose.jwk.JWK;
 import com.nimbusds.jose.jwk.JWKSet;
 import com.nimbusds.jose.jwk.RSAKey;

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

@@ -8,6 +8,7 @@
 import java.util.UUID;
 import java.util.function.Supplier;
 
+import dev.findfirst.security.conditions.OAuthClientsCondition;
 import dev.findfirst.security.userauth.models.payload.request.SignupRequest;
 import dev.findfirst.users.exceptions.EmailAlreadyRegisteredException;
 import dev.findfirst.users.exceptions.UserNameTakenException;
@@ -20,6 +21,7 @@
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
@@ -32,6 +34,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
+@Conditional(OAuthClientsCondition.class)
 @Slf4j
 @AllArgsConstructor
 @NoArgsConstructor
@@ -49,18 +52,25 @@ public class OauthUserService implements OAuth2UserService<OAuth2UserRequest, OA
   @Transactional
   @Override
   public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
+    log.debug("attempt to loadUser");
     OAuth2User oAuth2User = oAuth2UserService.loadUser(userRequest);
     User user = null;
 
     // user exists in database by email
-    final String userNameAttributeName = userRequest.getClientRegistration().getProviderDetails()
+    String userNameAttributeName = userRequest.getClientRegistration().getProviderDetails()
         .getUserInfoEndpoint().getUserNameAttributeName();
+    if (userRequest.getClientRegistration().getClientName().equalsIgnoreCase("github")) {
+      log.debug("set the userNameAttributeName to login");
+      userNameAttributeName = "login";
+    }
+
+    log.debug("userNameAttributeName {}", userNameAttributeName);
     final var attrs = oAuth2User.getAttributes();
     final var email = (String) attrs.get("email");
-    final var username = (String) attrs.get(userNameAttributeName);
+
+    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 {
@@ -90,12 +100,10 @@ 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);

server/src/main/java/dev/findfirst/security/oauth2client/handlers/Oauth2LoginSuccessHandler.java

@@ -5,21 +5,23 @@
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
+import dev.findfirst.security.conditions.OAuthClientsCondition;
 import dev.findfirst.security.jwt.service.RefreshTokenService;
 import dev.findfirst.security.jwt.service.TokenService;
 
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.http.ResponseCookie;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
 
 @Component
+@Conditional(OAuthClientsCondition.class)
 @Slf4j
 @RequiredArgsConstructor
 @Setter