diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryV2Controller.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryV2Controller.java index ed3d3c2ba..51d43f429 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryV2Controller.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryV2Controller.java @@ -13,7 +13,6 @@ import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; import java.time.Clock; import java.util.UUID; import org.whispersystems.textsecuregcm.auth.AuthenticatedDevice; @@ -58,9 +57,8 @@ public class DirectoryV2Controller { """ ) @ApiResponse(responseCode = "200", description = "`JSON` with generated credentials.", useReturnTypeSchema = true) - public Response getAuthToken(final @ReadOnly @Auth AuthenticatedDevice auth) { + public ExternalServiceCredentials getAuthToken(final @ReadOnly @Auth AuthenticatedDevice auth) { final UUID uuid = auth.getAccount().getUuid(); - final ExternalServiceCredentials credentials = directoryServiceTokenGenerator.generateForUuid(uuid); - return Response.ok().entity(credentials).build(); + return directoryServiceTokenGenerator.generateForUuid(uuid); } } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DirectoryControllerV2Test.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DirectoryControllerV2Test.java index b3819c766..55edd6752 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DirectoryControllerV2Test.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/DirectoryControllerV2Test.java @@ -37,11 +37,11 @@ class DirectoryControllerV2Test { final UUID uuid = UUID.fromString("11111111-1111-1111-1111-111111111111"); when(account.getUuid()).thenReturn(uuid); - final ExternalServiceCredentials credentials = (ExternalServiceCredentials) controller.getAuthToken( - new AuthenticatedDevice(account, mock(Device.class))).getEntity(); + final ExternalServiceCredentials credentials = controller.getAuthToken( + new AuthenticatedDevice(account, mock(Device.class))); - assertEquals(credentials.username(), "d369bc712e2e0dd36258"); - assertEquals(credentials.password(), "1633738643:4433b0fab41f25f79dd4"); + assertEquals("d369bc712e2e0dd36258", credentials.username()); + assertEquals("1633738643:4433b0fab41f25f79dd4", credentials.password()); } }