From 33d313e17b841db3736c465447913df0cc73d5df Mon Sep 17 00:00:00 2001 From: Kostya Date: Fri, 9 Oct 2026 18:44:33 +0300 Subject: server: add username login and logout endpoints The spec asks for a login by unique name only, with no passwords or sign-up, and an error that lets the user try again if the name exists. Add POST /api/login (form field "username") and POST /api/logout. Sessions maps each name, ignoring case, to the one HTTP session holding it. A second session asking for a held name gets 409 NAME_TAKEN, and a blank name gets 400. When a session ends, by logout or by Tomcat timing it out after a client quits without logging out, an HttpSessionListener frees the name. The account itself (ledger, Market Maker roles) stays, and logging in with that name again resumes it rather than locking the user out for the life of the server. New accounts start with a zero balance and are funded through deposits. Json gives every endpoint the same response shape, with errors as {"error": CODE, "message": text} built from a failed Result. Tomcat setup for the tests moves into a shared TestServer helper, whose clients each keep their own cookie jar and so act as separate users. --- .../test/java/market/guess/server/LoginTest.java | 73 ++++++++++++++++++++ .../java/market/guess/server/ServerBootTest.java | 46 +++---------- .../test/java/market/guess/server/TestServer.java | 77 ++++++++++++++++++++++ 3 files changed, 159 insertions(+), 37 deletions(-) create mode 100644 server/src/test/java/market/guess/server/LoginTest.java create mode 100644 server/src/test/java/market/guess/server/TestServer.java (limited to 'server/src/test/java/market') diff --git a/server/src/test/java/market/guess/server/LoginTest.java b/server/src/test/java/market/guess/server/LoginTest.java new file mode 100644 index 0000000..fc556ae --- /dev/null +++ b/server/src/test/java/market/guess/server/LoginTest.java @@ -0,0 +1,73 @@ +package market.guess.server; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.nio.file.Path; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +class LoginTest { + @TempDir static Path base; + private static TestServer server; + + @BeforeAll + static void start() throws Exception { + server = new TestServer(base); + } + + @AfterAll + static void stop() throws Exception { + server.close(); + } + + @Test + void nameIsHeldByOneSessionUntilLogout() throws Exception { + var alice = TestServer.client(); + var res = server.post(alice, "/login", "username", " Ann "); + assertEquals(200, res.statusCode(), res.body()); + assertTrue(res.body().contains("\"username\":\"Ann\""), res.body()); + + var impostor = TestServer.client(); + var taken = server.post(impostor, "/login", "username", "ann"); + assertEquals(409, taken.statusCode()); + assertTrue(taken.body().contains("NAME_TAKEN"), taken.body()); + + assertEquals(200, server.post(alice, "/login", "username", "Ann").statusCode()); + + assertEquals(200, server.post(alice, "/logout").statusCode()); + var back = server.post(impostor, "/login", "username", "ann"); + assertEquals(200, back.statusCode(), back.body()); + assertTrue(back.body().contains("\"username\":\"Ann\""), back.body()); + } + + @Test + void switchingNameFreesThePreviousOne() throws Exception { + var client = TestServer.client(); + assertEquals(200, server.post(client, "/login", "username", "Ben").statusCode()); + assertEquals(200, server.post(client, "/login", "username", "Bob").statusCode()); + assertEquals(200, server.post(TestServer.client(), "/login", "username", "Ben").statusCode()); + } + + @Test + void rejectsBlankNames() throws Exception { + var res = server.post(TestServer.client(), "/login", "username", " "); + assertEquals(400, res.statusCode()); + assertTrue(res.body().contains("INVALID_USERNAME"), res.body()); + assertEquals(400, server.post(TestServer.client(), "/login").statusCode()); + } + + @Test + void loginRegistersAnAccount() throws Exception { + server.post(TestServer.client(), "/login", "username", "Cleo"); + var health = server.get(TestServer.client(), "/health"); + assertTrue(health.body().matches(".*\"users\":[1-9].*"), health.body()); + } + + @Test + void logoutWithoutSessionIsHarmless() throws Exception { + assertEquals(200, server.post(TestServer.client(), "/logout").statusCode()); + } +} diff --git a/server/src/test/java/market/guess/server/ServerBootTest.java b/server/src/test/java/market/guess/server/ServerBootTest.java index 6fdcdc6..f8b21cf 100644 --- a/server/src/test/java/market/guess/server/ServerBootTest.java +++ b/server/src/test/java/market/guess/server/ServerBootTest.java @@ -5,16 +5,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.net.URI; -import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import java.nio.file.Files; import java.nio.file.Path; -import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.webresources.DirResourceSet; -import org.apache.catalina.webresources.StandardRoot; -import org.apache.tomcat.util.scan.StandardJarScanner; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -22,49 +15,27 @@ import org.junit.jupiter.api.io.TempDir; class ServerBootTest { private static final String ORIGIN = "http://localhost:5173"; - private static final HttpClient HTTP = HttpClient.newHttpClient(); @TempDir static Path base; - private static Tomcat tomcat; - private static String api; + private static TestServer server; @BeforeAll static void start() throws Exception { - tomcat = new Tomcat(); - tomcat.setBaseDir(base.toString()); - tomcat.setPort(0); - tomcat.getConnector(); - - var docBase = Files.createDirectories(base.resolve("webapp")); - var ctx = tomcat.addWebapp("/guess-market", docBase.toString()); - ctx.setParentClassLoader(ServerBootTest.class.getClassLoader()); - ((StandardJarScanner) ctx.getJarScanner()).setScanClassPath(false); - var resources = new StandardRoot(ctx); - resources.addPreResources( - new DirResourceSet( - resources, - "/WEB-INF/classes", - Path.of("build/classes/server").toAbsolutePath().toString(), - "/")); - ctx.setResources(resources); - - tomcat.start(); - api = "http://localhost:" + tomcat.getConnector().getLocalPort() + "/guess-market/api"; + server = new TestServer(base); } @AfterAll static void stop() throws Exception { - tomcat.stop(); - tomcat.destroy(); + server.close(); } private static HttpResponse send(HttpRequest.Builder req) throws Exception { - return HTTP.send(req.build(), HttpResponse.BodyHandlers.ofString()); + return TestServer.client().send(req.build(), HttpResponse.BodyHandlers.ofString()); } @Test void healthReportsEmptyMarket() throws Exception { - var res = send(HttpRequest.newBuilder(URI.create(api + "/health"))); + var res = send(server.request("/health")); assertEquals(200, res.statusCode()); assertTrue(res.headers().firstValue("Content-Type").orElse("").startsWith("application/json")); assertTrue(res.body().contains("\"status\":\"ok\""), res.body()); @@ -75,7 +46,8 @@ class ServerBootTest { void preflightAllowsCredentialedCrossOriginCalls() throws Exception { var res = send( - HttpRequest.newBuilder(URI.create(api + "/health")) + server + .request("/health") .method("OPTIONS", HttpRequest.BodyPublishers.noBody()) .header("Origin", ORIGIN) .header("Access-Control-Request-Method", "POST")); @@ -87,10 +59,10 @@ class ServerBootTest { @Test void corsHeadersOnlyForCrossOriginRequests() throws Exception { - var cross = send(HttpRequest.newBuilder(URI.create(api + "/health")).header("Origin", ORIGIN)); + var cross = send(server.request("/health").header("Origin", ORIGIN)); assertEquals(ORIGIN, cross.headers().firstValue("Access-Control-Allow-Origin").orElse(null)); - var same = send(HttpRequest.newBuilder(URI.create(api + "/health"))); + var same = send(server.request("/health")); assertNull(same.headers().firstValue("Access-Control-Allow-Origin").orElse(null)); assertFalse(same.body().isEmpty()); } diff --git a/server/src/test/java/market/guess/server/TestServer.java b/server/src/test/java/market/guess/server/TestServer.java new file mode 100644 index 0000000..9b77819 --- /dev/null +++ b/server/src/test/java/market/guess/server/TestServer.java @@ -0,0 +1,77 @@ +package market.guess.server; + +import java.net.CookieManager; +import java.net.URI; +import java.net.URLEncoder; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import org.apache.catalina.startup.Tomcat; +import org.apache.catalina.webresources.DirResourceSet; +import org.apache.catalina.webresources.StandardRoot; +import org.apache.tomcat.util.scan.StandardJarScanner; + +final class TestServer implements AutoCloseable { + private final Tomcat tomcat; + final String api; + + TestServer(Path base) throws Exception { + tomcat = new Tomcat(); + tomcat.setBaseDir(base.toString()); + tomcat.setPort(0); + tomcat.getConnector(); + + var docBase = Files.createDirectories(base.resolve("webapp")); + var ctx = tomcat.addWebapp("/guess-market", docBase.toString()); + ctx.setParentClassLoader(TestServer.class.getClassLoader()); + ((StandardJarScanner) ctx.getJarScanner()).setScanClassPath(false); + var resources = new StandardRoot(ctx); + resources.addPreResources( + new DirResourceSet( + resources, + "/WEB-INF/classes", + Path.of("build/classes/server").toAbsolutePath().toString(), + "/")); + ctx.setResources(resources); + + tomcat.start(); + api = "http://localhost:" + tomcat.getConnector().getLocalPort() + "/guess-market/api"; + } + + static HttpClient client() { + return HttpClient.newBuilder().cookieHandler(new CookieManager()).build(); + } + + HttpRequest.Builder request(String path) { + return HttpRequest.newBuilder(URI.create(api + path)); + } + + HttpResponse get(HttpClient client, String path) throws Exception { + return client.send(request(path).build(), HttpResponse.BodyHandlers.ofString()); + } + + HttpResponse post(HttpClient client, String path, String... fields) throws Exception { + var form = new StringBuilder(); + for (var i = 0; i < fields.length; i += 2) { + if (!form.isEmpty()) form.append('&'); + form.append(fields[i]) + .append('=') + .append(URLEncoder.encode(fields[i + 1], StandardCharsets.UTF_8)); + } + var req = + request(path) + .header("Content-Type", "application/x-www-form-urlencoded") + .POST(HttpRequest.BodyPublishers.ofString(form.toString())) + .build(); + return client.send(req, HttpResponse.BodyHandlers.ofString()); + } + + @Override + public void close() throws Exception { + tomcat.stop(); + tomcat.destroy(); + } +} -- cgit v1.2.3