Fix tests

Author: blacelle

server/src/test/java/eu/solven/kumite/app/it/security/TestSecurity_WithFakeUser.java

@@ -1,13 +1,17 @@
 package eu.solven.kumite.app.it.security;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.nio.charset.StandardCharsets;
+import java.util.List;
 import java.util.Map;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
@@ -29,6 +33,24 @@
 @Slf4j
 public class TestSecurity_WithFakeUser extends TestSecurity_WithOAuth2User {
 
+	@Override
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	protected void onLoginOptions(Map loginOptions) {
+		Map<String, ?> asMap = (Map<String, ?>) loginOptions.get("map");
+		assertThat(asMap).hasSize(3).containsKeys("github", "google", "fakeuser");
+
+		Assertions.assertThat((Map) asMap.get("github")).containsEntry("login_url", "/oauth2/authorization/github");
+
+		List<Map<String, ?>> asList = (List<Map<String, ?>>) loginOptions.get("list");
+		assertThat(asList).hasSize(3).anySatisfy(m -> {
+			Assertions.assertThat((Map) m).containsEntry("login_url", "/oauth2/authorization/github").hasSize(3);
+		}).anySatisfy(m -> {
+			Assertions.assertThat((Map) m).containsEntry("login_url", "/oauth2/authorization/google");
+		}).anySatisfy(m -> {
+			Assertions.assertThat((Map) m).containsEntry("login_url", "/html/login/basic");
+		});
+	}
+
 	@Test
 	@Override
 	public void testLoginAccessToken() {
@@ -77,4 +99,25 @@ public void testLoginAccessToken_invalidUser() {
 				.expectStatus()
 				.isUnauthorized();
 	}
+
+	@Test
+	public void testLoginBasic() {
+		log.debug("About {}", KumiteLoginController.class);
+
+		webTestClient
+
+				// https://www.baeldung.com/spring-security-csrf
+				.mutateWith(SecurityMockServerConfigurers.csrf())
+
+				.post()
+				.uri("/api/login/v1/basic")
+				.accept(MediaType.APPLICATION_JSON)
+				.header(HttpHeaders.AUTHORIZATION,
+						"Basic " + HttpHeaders
+								.encodeBasicAuth("someUnknownUser", "no_password", StandardCharsets.UTF_8))
+				.exchange()
+
+				.expectStatus()
+				.isUnauthorized();
+	}
 }

server/src/test/java/eu/solven/kumite/app/it/security/TestSecurity_WithJwtUser.java

@@ -3,7 +3,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.Duration;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -63,10 +62,8 @@ protected String generateAccessToken() {
 	}
 
 	protected String generateRefreshToken() {
-		return tokenService.generateAccessToken(RandomPlayer.user(),
-				Set.of(RandomPlayer.PLAYERID_1),
-				Duration.ofMinutes(1),
-				true);
+		return tokenService
+				.generateAccessToken(RandomPlayer.user(), Set.of(RandomPlayer.PLAYERID_1), Duration.ofMinutes(1), true);
 	}
 
 	@Test
@@ -120,23 +117,7 @@ public void testLoginOptions() {
 
 				.expectStatus()
 				.isOk()
-				.expectBody(Map.class)
-				.value(greeting -> {
-					Map<String, ?> asMap = (Map<String, ?>) greeting.get("map");
-					assertThat(asMap).hasSize(2).containsOnlyKeys("github", "google");
-
-					Assertions.assertThat((Map) asMap.get("github"))
-							.containsEntry("login_url", "/oauth2/authorization/github");
-
-					List<Map<String, ?>> asList = (List<Map<String, ?>>) greeting.get("list");
-					assertThat(asList).hasSize(2).anySatisfy(m -> {
-						Assertions.assertThat((Map) m)
-								.containsEntry("login_url", "/oauth2/authorization/github")
-								.hasSize(2);
-					}).anySatisfy(m -> {
-						Assertions.assertThat((Map) m).containsEntry("login_url", "/oauth2/authorization/google");
-					});
-				});
+				.expectBody(Map.class);
 	}
 
 	@Test

server/src/test/java/eu/solven/kumite/app/it/security/TestSecurity_WithOAuth2User.java

@@ -111,24 +111,26 @@ public void testLoginOptions() {
 				.expectStatus()
 				.isOk()
 				.expectBody(Map.class)
-				.value(greeting -> {
-					Map<String, ?> asMap = (Map<String, ?>) greeting.get("map");
-					assertThat(asMap).hasSize(2).containsOnlyKeys("github", "google");
-
-					Assertions.assertThat((Map) asMap.get("github"))
-							.containsEntry("login_url", "/oauth2/authorization/github");
-
-					List<Map<String, ?>> asList = (List<Map<String, ?>>) greeting.get("list");
-					assertThat(asList).hasSize(2).anySatisfy(m -> {
-						Assertions.assertThat((Map) m)
-								.containsEntry("login_url", "/oauth2/authorization/github")
-								.hasSize(2);
-					}).anySatisfy(m -> {
-						Assertions.assertThat((Map) m).containsEntry("login_url", "/oauth2/authorization/google");
-					});
+				.value(loginOptions -> {
+					onLoginOptions(loginOptions);
 				});
 	}
 
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	protected void onLoginOptions(Map loginOptions) {
+		Map<String, ?> asMap = (Map<String, ?>) loginOptions.get("map");
+		assertThat(asMap).hasSize(2).containsKeys("github", "google");
+
+		Assertions.assertThat((Map) asMap.get("github")).containsEntry("login_url", "/oauth2/authorization/github");
+
+		List<Map<String, ?>> asList = (List<Map<String, ?>>) loginOptions.get("list");
+		assertThat(asList).hasSize(2).anySatisfy(m -> {
+			Assertions.assertThat((Map) m).containsEntry("login_url", "/oauth2/authorization/github").hasSize(3);
+		}).anySatisfy(m -> {
+			Assertions.assertThat((Map) m).containsEntry("login_url", "/oauth2/authorization/google");
+		});
+	}
+
 	@Test
 	public void testLoginUser() {
 		log.debug("About {}", KumiteLoginController.class);

server/src/test/java/eu/solven/kumite/app/it/security/TestSecurity_WithoutAuth.java

@@ -42,11 +42,6 @@ public class TestSecurity_WithoutAuth {
 	@Autowired
 	private WebTestClient webTestClient;
 
-//	@Bean
-//	public SessionRepository<?> inmemorySessionRepository() {
-//		return new MapSessionRepository(new ConcurrentHashMap<>());
-//	}
-
 	@Test
 	public void testApiPublic() {
 		log.debug("About {}", GreetingHandler.class);