diff --git a/fh.fd.ci.client/src/main/java/de/fd/fh/network/UserClient.java b/fh.fd.ci.client/src/main/java/de/fd/fh/network/UserClient.java index ad4cc77..29eaa80 100644 --- a/fh.fd.ci.client/src/main/java/de/fd/fh/network/UserClient.java +++ b/fh.fd.ci.client/src/main/java/de/fd/fh/network/UserClient.java @@ -3,6 +3,7 @@ package de.fd.fh.network; import de.fd.fh.shared.Utils; import de.fd.fh.shared.network.messages.ChangeUserRequest; import de.fd.fh.shared.network.messages.PlayerResponse; +import de.fd.fh.shared.network.messages.UserRequest; import feign.Headers; import feign.Param; import feign.RequestLine; @@ -18,8 +19,14 @@ public interface UserClient @RequestLine("GET /users/{userId}") @Headers(Utils.AUTHENTICATION_HEADER + ":Bearer {authToken}") - PlayerResponse getPlayer( + UserRequest getShortPlayer( @Param("authToken") final String authenticationHeader, @Param("userId") final String userId ); + + @RequestLine("GET /users") + @Headers(Utils.AUTHENTICATION_HEADER + ":Bearer {authToken}") + PlayerResponse getCurrentPlayer( + @Param("authToken") final String authenticationHeader + ); } diff --git a/fh.fd.ci.client/src/test/java/de/fd/fh/network/UserClientTest.java b/fh.fd.ci.client/src/test/java/de/fd/fh/network/UserClientTest.java index f551974..b26ef93 100644 --- a/fh.fd.ci.client/src/test/java/de/fd/fh/network/UserClientTest.java +++ b/fh.fd.ci.client/src/test/java/de/fd/fh/network/UserClientTest.java @@ -3,6 +3,7 @@ package de.fd.fh.network; import de.fd.fh.shared.Utils; import de.fd.fh.shared.network.messages.ChangeUserRequest; import de.fd.fh.shared.network.messages.PlayerResponse; +import de.fd.fh.shared.network.messages.UserRequest; import feign.Feign; import feign.Request; import feign.gson.GsonDecoder; @@ -61,23 +62,46 @@ class UserClientTest } @Test - void getPlayerTest() + void getShortPlayerTest() { mockClient.ok(HttpMethod.GET, "/users/12345", "{\n" + - " \"id\": {\n" + + " \"id\":\"12345\",\n" + + " \"name\":\"TestName\"\n" + + "}"); + + final UserRequest response = client.getShortPlayer("TestAuthHeader", "12345"); + + assertNotNull(response); + assertEquals("TestName", response.getName()); + assertEquals("12345", response.getId()); + + final Request sended = mockClient.verifyOne(HttpMethod.GET, "/users/12345"); + + assertTrue(sended.headers().get(Utils.AUTHENTICATION_HEADER).stream().findFirst().isPresent()); + assertEquals("Bearer TestAuthHeader", + sended.headers().get(Utils.AUTHENTICATION_HEADER).stream().findFirst().get()); + } + + @Test + void getCurrentPlayerTest() + { + mockClient.ok(HttpMethod.GET, "/users", + "{\n" + + " \"id\":\n" + + " {\n" + " \"identifier\":\"12345\"\n" + " },\n" + " \"name\":\"TestName\"\n" + "}"); - final PlayerResponse response = client.getPlayer("TestAuthHeader", "12345"); + final PlayerResponse response = client.getCurrentPlayer("TestAuthHeader"); assertNotNull(response); assertEquals("TestName", response.getName()); assertEquals("12345", response.getId().getIdentifier()); - final Request sended = mockClient.verifyOne(HttpMethod.GET, "/users/12345"); + final Request sended = mockClient.verifyOne(HttpMethod.GET, "/users"); assertTrue(sended.headers().get(Utils.AUTHENTICATION_HEADER).stream().findFirst().isPresent()); assertEquals("Bearer TestAuthHeader", diff --git a/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/UserService.java b/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/UserService.java index 5aa31a2..eff8f8c 100644 --- a/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/UserService.java +++ b/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/UserService.java @@ -3,7 +3,7 @@ package de.fd.fh.server.user; import de.fd.fh.server.user.events.ChangePasswordEvent; import de.fd.fh.server.user.events.ChangeUserNameEvent; import de.fd.fh.shared.network.messages.ChangeUserRequest; -import de.fd.fh.server.user.web.UserRequest; +import de.fd.fh.shared.network.messages.UserRequest; import lombok.RequiredArgsConstructor; import java.util.Observable; diff --git a/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/web/UserController.java b/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/web/UserController.java index f276326..52e076e 100644 --- a/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/web/UserController.java +++ b/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/web/UserController.java @@ -7,6 +7,7 @@ import de.fd.fh.server.user.User; import de.fd.fh.server.user.UserId; import de.fd.fh.server.user.UserService; import de.fd.fh.shared.network.messages.ChangeUserRequest; +import de.fd.fh.shared.network.messages.UserRequest; import lombok.RequiredArgsConstructor; import spark.Request; import spark.Response; diff --git a/fh.fd.ci.server/src/test/java/de/fd/fh/server/user/UserServiceTest.java b/fh.fd.ci.server/src/test/java/de/fd/fh/server/user/UserServiceTest.java index 86b3c7d..18f29ef 100644 --- a/fh.fd.ci.server/src/test/java/de/fd/fh/server/user/UserServiceTest.java +++ b/fh.fd.ci.server/src/test/java/de/fd/fh/server/user/UserServiceTest.java @@ -1,7 +1,7 @@ package de.fd.fh.server.user; import de.fd.fh.shared.network.messages.ChangeUserRequest; -import de.fd.fh.server.user.web.UserRequest; +import de.fd.fh.shared.network.messages.UserRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/fh.fd.ci.server/src/test/java/de/fd/fh/server/user/web/UserControllerTest.java b/fh.fd.ci.server/src/test/java/de/fd/fh/server/user/web/UserControllerTest.java index 65bf4ff..684f294 100644 --- a/fh.fd.ci.server/src/test/java/de/fd/fh/server/user/web/UserControllerTest.java +++ b/fh.fd.ci.server/src/test/java/de/fd/fh/server/user/web/UserControllerTest.java @@ -5,6 +5,7 @@ import de.fd.fh.server.access.AccessToken; import de.fd.fh.server.user.User; import de.fd.fh.server.user.UserId; import de.fd.fh.server.user.UserService; +import de.fd.fh.shared.network.messages.UserRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/web/UserRequest.java b/fh.fd.ci.shared/src/main/java/de/fd/fh/shared/network/messages/UserRequest.java similarity index 81% rename from fh.fd.ci.server/src/main/java/de/fd/fh/server/user/web/UserRequest.java rename to fh.fd.ci.shared/src/main/java/de/fd/fh/shared/network/messages/UserRequest.java index 981861c..77b37ac 100644 --- a/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/web/UserRequest.java +++ b/fh.fd.ci.shared/src/main/java/de/fd/fh/shared/network/messages/UserRequest.java @@ -1,4 +1,4 @@ -package de.fd.fh.server.user.web; +package de.fd.fh.shared.network.messages; import lombok.Getter; import lombok.RequiredArgsConstructor;