Remove deprecated identity key and signed pre-key methods

service/src/main/java/org/whispersystems/textsecuregcm/auth/CertificateGenerator.java

@@ -13,6 +13,7 @@ import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPrivateKey;
 import org.whispersystems.textsecuregcm.entities.MessageProtos.SenderCertificate;
 import org.whispersystems.textsecuregcm.entities.MessageProtos.ServerCertificate;
+import org.whispersystems.textsecuregcm.identity.IdentityType;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.Device;
 
@@ -32,11 +33,11 @@ public class CertificateGenerator {
 
   public byte[] createFor(Account account, Device device, boolean includeE164) throws InvalidKeyException {
     SenderCertificate.Certificate.Builder builder = SenderCertificate.Certificate.newBuilder()
-                                                                                 .setSenderDevice(Math.toIntExact(device.getId()))
-                                                                                 .setExpires(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(expiresDays))
-                                                                                 .setIdentityKey(ByteString.copyFrom(account.getIdentityKey().serialize()))
-                                                                                 .setSigner(serverCertificate)
-                                                                                 .setSenderUuid(account.getUuid().toString());
+        .setSenderDevice(Math.toIntExact(device.getId()))
+        .setExpires(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(expiresDays))
+        .setIdentityKey(ByteString.copyFrom(account.getIdentityKey(IdentityType.ACI).serialize()))
+        .setSigner(serverCertificate)
+        .setSenderUuid(account.getUuid().toString());
 
     if (includeE164) {
       builder.setSender(account.getNumber());

service/src/main/java/org/whispersystems/textsecuregcm/controllers/CertificateController.java

@@ -38,6 +38,7 @@ import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount;
 import org.whispersystems.textsecuregcm.auth.CertificateGenerator;
 import org.whispersystems.textsecuregcm.entities.DeliveryCertificate;
 import org.whispersystems.textsecuregcm.entities.GroupCredentials;
+import org.whispersystems.textsecuregcm.identity.IdentityType;
 
 @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 @Path("/v1/certificate")
@@ -72,7 +73,7 @@ public class CertificateController {
       @QueryParam("includeE164") @DefaultValue("true") boolean includeE164)
       throws InvalidKeyException {
 
-    if (auth.getAccount().getIdentityKey() == null) {
+    if (auth.getAccount().getIdentityKey(IdentityType.ACI) == null) {
       throw new WebApplicationException(Response.Status.BAD_REQUEST);
     }
 

service/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java

@@ -57,6 +57,7 @@ import org.whispersystems.textsecuregcm.entities.DeviceInfoList;
 import org.whispersystems.textsecuregcm.entities.DeviceResponse;
 import org.whispersystems.textsecuregcm.entities.LinkDeviceRequest;
 import org.whispersystems.textsecuregcm.entities.PreKeySignatureValidator;
+import org.whispersystems.textsecuregcm.identity.IdentityType;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
 import org.whispersystems.textsecuregcm.storage.Account;
@@ -359,9 +360,10 @@ public class DeviceController {
       assert deviceActivationRequest.aciPqLastResortPreKey().isPresent();
       assert deviceActivationRequest.pniPqLastResortPreKey().isPresent();
 
-      final boolean allKeysValid = PreKeySignatureValidator.validatePreKeySignatures(account.getIdentityKey(),
+      final boolean allKeysValid = PreKeySignatureValidator.validatePreKeySignatures(account.getIdentityKey(
+              IdentityType.ACI),
           List.of(deviceActivationRequest.aciSignedPreKey().get(), deviceActivationRequest.aciPqLastResortPreKey().get()))
-          && PreKeySignatureValidator.validatePreKeySignatures(account.getPhoneNumberIdentityKey(),
+          && PreKeySignatureValidator.validatePreKeySignatures(account.getIdentityKey(IdentityType.PNI),
           List.of(deviceActivationRequest.pniSignedPreKey().get(), deviceActivationRequest.pniPqLastResortPreKey().get()));
 
       if (!allKeysValid) {

service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java

@@ -56,6 +56,7 @@ import org.whispersystems.textsecuregcm.entities.PreKeyResponse;
 import org.whispersystems.textsecuregcm.entities.PreKeyResponseItem;
 import org.whispersystems.textsecuregcm.entities.PreKeyState;
 import org.whispersystems.textsecuregcm.experiment.Experiment;
+import org.whispersystems.textsecuregcm.identity.IdentityType;
 import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil;
@@ -137,11 +138,13 @@ public class KeysController {
     final boolean usePhoneNumberIdentity = usePhoneNumberIdentity(identityType);
 
     if (preKeys.getSignedPreKey() != null &&
-        !preKeys.getSignedPreKey().equals(usePhoneNumberIdentity ? device.getPhoneNumberIdentitySignedPreKey() : device.getSignedPreKey())) {
+        !preKeys.getSignedPreKey().equals(usePhoneNumberIdentity ? device.getSignedPreKey(IdentityType.PNI)
+            : device.getSignedPreKey(IdentityType.ACI))) {
       updateAccount = true;
     }
 
-    final IdentityKey oldIdentityKey = usePhoneNumberIdentity ? account.getPhoneNumberIdentityKey() : account.getIdentityKey();
+    final IdentityKey oldIdentityKey =
+        usePhoneNumberIdentity ? account.getIdentityKey(IdentityType.PNI) : account.getIdentityKey(IdentityType.ACI);
     if (!Objects.equals(preKeys.getIdentityKey(), oldIdentityKey)) {
       updateAccount = true;
 
@@ -242,10 +245,7 @@ public class KeysController {
     List<PreKeyResponseItem> responseItems = new ArrayList<>(devices.size());
 
     for (Device device : devices) {
-      ECSignedPreKey signedECPreKey = switch (targetIdentifier.identityType()) {
-        case ACI -> device.getSignedPreKey();
-        case PNI -> device.getPhoneNumberIdentitySignedPreKey();
-      };
+      ECSignedPreKey signedECPreKey = device.getSignedPreKey(targetIdentifier.identityType());
 
       ECPreKey unsignedECPreKey = keys.takeEC(targetIdentifier.uuid(), device.getId()).join().orElse(null);
       KEMSignedPreKey pqPreKey = returnPqKey ? keys.takePQ(targetIdentifier.uuid(), device.getId()).join().orElse(null) : null;
@@ -263,10 +263,7 @@ public class KeysController {
       }
     }
 
-    final IdentityKey identityKey = switch (targetIdentifier.identityType()) {
-      case ACI -> target.getIdentityKey();
-      case PNI -> target.getPhoneNumberIdentityKey();
-    };
+    final IdentityKey identityKey = target.getIdentityKey(targetIdentifier.identityType());
 
     if (responseItems.isEmpty()) {
       throw new WebApplicationException(Response.Status.NOT_FOUND);

service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java

@@ -87,6 +87,7 @@ import org.whispersystems.textsecuregcm.entities.UserCapabilities;
 import org.whispersystems.textsecuregcm.entities.VersionedProfileResponse;
 import org.whispersystems.textsecuregcm.grpc.ProfileHelper;
 import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
+import org.whispersystems.textsecuregcm.identity.IdentityType;
 import org.whispersystems.textsecuregcm.identity.PniServiceIdentifier;
 import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
@@ -430,7 +431,7 @@ public class ProfileController {
       final boolean isSelf,
       final ContainerRequestContext containerRequestContext) {
 
-    return new BaseProfileResponse(account.getIdentityKey(),
+    return new BaseProfileResponse(account.getIdentityKey(IdentityType.ACI),
         UnidentifiedAccessChecksum.generateFor(account.getUnidentifiedAccessKey()),
         account.isUnrestrictedUnidentifiedAccess(),
         UserCapabilities.createForAccount(account),
@@ -442,7 +443,7 @@ public class ProfileController {
   }
 
   private BaseProfileResponse buildBaseProfileResponseForPhoneNumberIdentity(final Account account) {
-    return new BaseProfileResponse(account.getPhoneNumberIdentityKey(),
+    return new BaseProfileResponse(account.getIdentityKey(IdentityType.PNI),
         null,
         false,
         UserCapabilities.createForAccount(account),

service/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java

@@ -317,24 +317,6 @@ public class Account {
     };
   }
 
-  /**
-   * @deprecated Please use {@link #getIdentityKey(IdentityType)} instead.
-   */
-  @Deprecated
-  public IdentityKey getIdentityKey() {
-    requireNotStale();
-
-    return identityKey;
-  }
-
-  /**
-   * @deprecated Please use {@link #getIdentityKey(IdentityType)} instead.
-   */
-  @Deprecated
-  public IdentityKey getPhoneNumberIdentityKey() {
-    return phoneNumberIdentityKey;
-  }
-
   public void setPhoneNumberIdentityKey(final IdentityKey phoneNumberIdentityKey) {
     this.phoneNumberIdentityKey = phoneNumberIdentityKey;
   }

service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java

@@ -52,6 +52,7 @@ import org.whispersystems.textsecuregcm.entities.AccountAttributes;
 import org.whispersystems.textsecuregcm.entities.ECSignedPreKey;
 import org.whispersystems.textsecuregcm.entities.KEMSignedPreKey;
 import org.whispersystems.textsecuregcm.experiment.ExperimentEnrollmentManager;
+import org.whispersystems.textsecuregcm.identity.IdentityType;
 import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
 import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
@@ -397,8 +398,8 @@ public class AccountsManager {
       throw new IllegalArgumentException("PNI identity key, signed pre-keys, and registration IDs must be all null or all non-null");
     }
 
-    boolean changed = !Objects.equals(pniIdentityKey, account.getPhoneNumberIdentityKey());
-    
+    boolean changed = !Objects.equals(pniIdentityKey, account.getIdentityKey(IdentityType.PNI));
+
     for (Device device : account.getDevices()) {
         if (!device.isEnabled()) {
             continue;
@@ -406,11 +407,11 @@ public class AccountsManager {
         ECSignedPreKey signedPreKey = pniSignedPreKeys.get(device.getId());
         int registrationId = pniRegistrationIds.get(device.getId());
         changed = changed ||
-            !signedPreKey.equals(device.getPhoneNumberIdentitySignedPreKey()) ||
+            !signedPreKey.equals(device.getSignedPreKey(IdentityType.PNI)) ||
             device.getRegistrationId() != registrationId;
         device.setPhoneNumberIdentitySignedPreKey(signedPreKey);
         device.setPhoneNumberIdentityRegistrationId(registrationId);
-    }   
+    }
 
     account.setPhoneNumberIdentityKey(pniIdentityKey);
 

service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java

@@ -238,26 +238,10 @@ public class Device {
     };
   }
 
-  /**
-   * @deprecated Please use {@link #getSignedPreKey(IdentityType)} instead.
-   */
-  @Deprecated
-  public ECSignedPreKey getSignedPreKey() {
-    return signedPreKey;
-  }
-
   public void setSignedPreKey(ECSignedPreKey signedPreKey) {
     this.signedPreKey = signedPreKey;
   }
 
-  /**
-   * @deprecated Please use {@link #getSignedPreKey(IdentityType)} instead.
-   */
-  @Deprecated
-  public ECSignedPreKey getPhoneNumberIdentitySignedPreKey() {
-    return phoneNumberIdentitySignedPreKey;
-  }
-
   public void setPhoneNumberIdentitySignedPreKey(final ECSignedPreKey phoneNumberIdentitySignedPreKey) {
     this.phoneNumberIdentitySignedPreKey = phoneNumberIdentitySignedPreKey;
   }

service/src/main/java/org/whispersystems/textsecuregcm/workers/MigrateSignedECPreKeysCommand.java

@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import org.whispersystems.textsecuregcm.entities.ECSignedPreKey;
+import org.whispersystems.textsecuregcm.identity.IdentityType;
 import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.KeysManager;
@@ -42,12 +43,13 @@ public class MigrateSignedECPreKeysCommand extends AbstractSinglePassCrawlAccoun
             .flatMap(device -> {
               final List<Tuple3<UUID, Long, ECSignedPreKey>> keys = new ArrayList<>(2);
 
-              if (device.getSignedPreKey() != null) {
-                keys.add(Tuples.of(account.getUuid(), device.getId(), device.getSignedPreKey()));
+              if (device.getSignedPreKey(IdentityType.ACI) != null) {
+                keys.add(Tuples.of(account.getUuid(), device.getId(), device.getSignedPreKey(IdentityType.ACI)));
               }
 
-              if (device.getPhoneNumberIdentitySignedPreKey() != null) {
-                keys.add(Tuples.of(account.getPhoneNumberIdentifier(), device.getId(), device.getPhoneNumberIdentitySignedPreKey()));
+              if (device.getSignedPreKey(IdentityType.PNI) != null) {
+                keys.add(Tuples.of(account.getPhoneNumberIdentifier(), device.getId(),
+                    device.getSignedPreKey(IdentityType.PNI)));
               }
 
               return Flux.fromIterable(keys);