diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java index 1382b18e4..9be38a9d7 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java @@ -261,20 +261,6 @@ public class KeysController { }); } - @Timed - @GET - @Path("/signed") - @Produces(MediaType.APPLICATION_JSON) - public Optional getSignedKey(@Auth final AuthenticatedAccount auth, - @QueryParam("identity") final Optional identityType) { - - Device device = auth.getAuthenticatedDevice(); - ECSignedPreKey signedPreKey = usePhoneNumberIdentity(identityType) ? - device.getPhoneNumberIdentitySignedPreKey() : device.getSignedPreKey(); - - return Optional.ofNullable(signedPreKey); - } - private static boolean usePhoneNumberIdentity(final Optional identityType) { return "pni".equals(identityType.map(String::toLowerCase).orElse("aci")); } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeysControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeysControllerTest.java index 435922cda..2e9fd83f7 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeysControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeysControllerTest.java @@ -53,7 +53,6 @@ import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException; import org.whispersystems.textsecuregcm.entities.ECPreKey; import org.whispersystems.textsecuregcm.entities.ECSignedPreKey; import org.whispersystems.textsecuregcm.entities.KEMSignedPreKey; -import org.whispersystems.textsecuregcm.entities.PreKey; import org.whispersystems.textsecuregcm.entities.PreKeyCount; import org.whispersystems.textsecuregcm.entities.PreKeyResponse; import org.whispersystems.textsecuregcm.entities.PreKeyState; @@ -139,10 +138,6 @@ class KeysControllerTest { @JsonSerialize(using = ByteArrayAdapter.Serializing.class) @JsonDeserialize(using = ByteArrayAdapter.Deserializing.class) byte[] publicKey) { - - static WeaklyTypedPreKey fromPreKey(final PreKey preKey) { - return new WeaklyTypedPreKey(preKey.keyId(), preKey.serializedPublicKey()); - } } private record WeaklyTypedSignedPreKey(long keyId, @@ -268,30 +263,6 @@ class KeysControllerTest { verify(KEYS).getPqCount(AuthHelper.VALID_UUID, 1); } - - @Test - void getSignedPreKeyV2() { - ECSignedPreKey result = resources.getJerseyTest() - .target("/v2/keys/signed") - .request() - .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD)) - .get(ECSignedPreKey.class); - - assertEquals(VALID_DEVICE_SIGNED_KEY, result); - } - - @Test - void getPhoneNumberIdentifierSignedPreKeyV2() { - ECSignedPreKey result = resources.getJerseyTest() - .target("/v2/keys/signed") - .queryParam("identity", "pni") - .request() - .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD)) - .get(ECSignedPreKey.class); - - assertEquals(VALID_DEVICE_PNI_SIGNED_KEY, result); - } - @Test void putSignedPreKeyV2() { ECSignedPreKey test = KeysHelper.signedECPreKey(9998, IDENTITY_KEY_PAIR);