Tests for login success with oauth2

Author: R-Sandor

server/src/main/java/dev/findfirst/security/conditions/OAuthClientsCondition.java

@@ -14,6 +14,7 @@ public class OAuthClientsCondition implements Condition {
 
   Map<String, ClientPair> clients = new HashMap<>();
 
+  @SuppressWarnings("null")
   @Override
   public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
     Binder binder = Binder.get(context.getEnvironment());

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

@@ -68,9 +68,10 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
         user = userOpt.get();
       }
     }
-    if (user.getUserId() != null) {
+    if (user != null && user.getUserId() != null) {
+      int userRole = user.getRole().getId() != null? user.getUserId(): 0;
       GrantedAuthority authority =
-          new SimpleGrantedAuthority(URole.values()[user.getRole().getId()].toString());
+          new SimpleGrantedAuthority(URole.values()[userRole].toString());
       String userNameAttributeName = userRequest.getClientRegistration().getProviderDetails()
           .getUserInfoEndpoint().getUserNameAttributeName();
       log.debug("USER ATTRIBUTE NAME: {}", userNameAttributeName);

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

@@ -10,6 +10,7 @@
 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.http.ResponseCookie;
@@ -21,6 +22,7 @@
 @Component
 @Slf4j
 @RequiredArgsConstructor
+@Setter
 public class Oauth2LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler {
 
   @Value("${findfirst.app.frontend-url}")

server/src/test/java/dev/findfirst/security/oauth2/Oauth2LoginSuccessHandlerTest.java

@@ -1,12 +1,23 @@
 package dev.findfirst.security.oauth2;
 
+import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import dev.findfirst.security.jwt.JwtService;
+import dev.findfirst.security.jwt.service.RefreshTokenService;
+import dev.findfirst.security.jwt.service.TokenService;
+import dev.findfirst.security.oauth2client.handlers.Oauth2LoginSuccessHandler;
+import dev.findfirst.users.repository.UserRepo;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -15,30 +26,21 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 import org.springframework.security.oauth2.core.user.OAuth2User;
-
-import dev.findfirst.security.jwt.JwtService;
-import dev.findfirst.security.jwt.service.RefreshTokenService;
-import dev.findfirst.security.jwt.service.TokenService;
-import dev.findfirst.security.oauth2client.handlers.Oauth2LoginSuccessHandler;
-import dev.findfirst.security.userauth.models.RefreshToken;
-import dev.findfirst.users.model.user.User;
-import dev.findfirst.users.repository.UserRepo;
-import jakarta.servlet.http.Cookie;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+import org.springframework.test.context.TestPropertySource;
 
 /**
- * Tests borrowed from:
+ * _Found using github search._ Test borrowed from:
  * https://github.com/vadof/vplay-backend/blob/15e355f9f2283feb389e55e75aa4f620b62becea/user-service/src/test/java/com/vcasino/user/oauth2/OAuth2LoginSuccessHandlerTests.java
  */
 @ExtendWith(MockitoExtension.class)
 class Oauth2LoginSuccessHandlerTest {
 
-   private final int ID = 1111111111;
-  private final String EMAIL = "johndoe@gmail.com";
-  private final String NAME = "John Doe";
+  private final int ID = 1111111111;
   private final String USERNAME = "johndoe";
 
   @Mock
@@ -56,74 +58,38 @@ class Oauth2LoginSuccessHandlerTest {
   @InjectMocks
   private Oauth2LoginSuccessHandler oAuthHandler;
 
- @Test
+  @Test
   @DisplayName("Authenticate active Github user")
   void authenticateGithubUser() throws Exception {
+    oAuthHandler.setRedirectURL("localhost");
     authenticateUserByProvider("github");
   }
 
 
-  private User getUserMock(String provider, boolean active) {
-    return new User(USERNAME, EMAIL, null, true);
-  }
-
   private void authenticateUserByProvider(String provider) throws Exception {
-    OAuth2AuthenticationToken oAuthToken = mockAuthentication(provider.toString().toLowerCase(), ID).getFirst();
-
-    User user = getUserMock(provider, true);
-
-    Entry<List<Cookie>, String> cookiesAndUrl = mockAuthenticationCookies(user);
+    OAuth2AuthenticationToken oAuthToken =
+        mockAuthentication(provider.toString().toLowerCase(), ID).getFirst();
 
     MockHttpServletResponse response = new MockHttpServletResponse();
     oAuthHandler.onAuthenticationSuccess(new MockHttpServletRequest(), response, oAuthToken);
 
-    checkCookies(cookiesAndUrl.getFirst(), response);
-
-    assertEquals(cookiesAndUrl.getSecond(), response.getRedirectedUrl());
+    assertTrue(response.getHeader("Set-Cookie") != null);
+    assertEquals("localhost/account/login/oauth2", response.getRedirectedUrl());
   }
 
-  private Entry<List<Cookie>, String> mockAuthenticationCookies(User user) {
-    String jwtToken = "AAA-BBB-CCC";
-    var refreshToken = new RefreshToken(1l, null, "fasfsaf-asfsf", null);
-
-    when(ts.generateTokenFromUser(ID)).thenReturn(jwtToken);
-
-    when(rs.createRefreshToken(user)).thenReturn(refreshToken);
-
-    Cookie jwtCookie = new Cookie("jwt", "AAA-BBB-CCC");
-    Cookie refreshCookie = new Cookie("refresh", refreshToken.getToken());
-
-    String expectedUrl = "%s/login/success?name=%s&username=%s&email=%s"
-        .formatted("localhost", user.getUsername(), user.getUsername(), user.getEmail());
-
-    return new Entry<>(List.of(jwtCookie, refreshCookie), expectedUrl);
-  }
-
-  private Entry<OAuth2AuthenticationToken, OAuth2User> mockAuthentication(String provider, int id, String email) {
-    var entry = mockAuthentication(provider, id);
-    when(entry.getFirst().getPrincipal()).thenReturn(entry.getSecond());
-    when(entry.getSecond().getAttribute("email")).thenReturn(email);
-    return entry;
-  }
 
   private Entry<OAuth2AuthenticationToken, OAuth2User> mockAuthentication(String provider, int id) {
     OAuth2AuthenticationToken oauthToken = mock(OAuth2AuthenticationToken.class);
     OAuth2User principal = mock(OAuth2User.class);
-    when(oauthToken.getAuthorizedClientRegistrationId()).thenReturn(provider);
-    when(oauthToken.getName()).thenReturn(id + "");
+    Map<String, Object> attributes = new HashMap<>();
+    attributes.put("name", USERNAME);
+    attributes.put("userID", ID);
+    Collection<GrantedAuthority> authorities = List.of(new SimpleGrantedAuthority("ROLE_USER"));
+    OAuth2User user = new DefaultOAuth2User(authorities, attributes, "name");
+    when(oauthToken.getPrincipal()).thenReturn(user);
     return new Entry<>(oauthToken, principal);
   }
 
-  private void checkCookies(List<Cookie> expectedCookies, MockHttpServletResponse response) {
-    if (expectedCookies != null && !expectedCookies.isEmpty()) {
-      for (Cookie expectedCookie : expectedCookies) {
-        Cookie actualCookie = response.getCookie(expectedCookie.getName());
-        assertNotNull(actualCookie);
-        assertEquals(expectedCookie.getValue(), actualCookie.getValue());
-      }
-    }
-  }
-
   @Getter
   @AllArgsConstructor
   static class Entry<F, S> {