Use a phased enrollment strategy for the `pnp` compatibility flag

service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java

@@ -901,6 +901,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
             dynamicConfigurationManager, zkSecretParams, spamChecker),
         new PaymentsController(currencyManager, paymentsCredentialsGenerator),
         new ProfileController(clock, rateLimiters, accountsManager, profilesManager, dynamicConfigurationManager,
+            experimentEnrollmentManager,
             profileBadgeConverter, config.getBadges(), cdnS3Client, profileCdnPolicyGenerator, profileCdnPolicySigner,
             config.getCdnConfiguration().bucket(), zkProfileOperations, batchIdentityCheckExecutor),
         new ProvisioningController(rateLimiters, provisioningManager),

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

@@ -81,6 +81,7 @@ import org.whispersystems.textsecuregcm.entities.ExpiringProfileKeyCredentialPro
 import org.whispersystems.textsecuregcm.entities.ProfileAvatarUploadAttributes;
 import org.whispersystems.textsecuregcm.entities.UserCapabilities;
 import org.whispersystems.textsecuregcm.entities.VersionedProfileResponse;
+import org.whispersystems.textsecuregcm.experiment.ExperimentEnrollmentManager;
 import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
 import org.whispersystems.textsecuregcm.identity.IdentityType;
 import org.whispersystems.textsecuregcm.identity.PniServiceIdentifier;
@@ -112,6 +113,7 @@ public class ProfileController {
   private final ProfilesManager  profilesManager;
   private final AccountsManager  accountsManager;
   private final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager;
+  private final ExperimentEnrollmentManager experimentEnrollmentManager;
   private final ProfileBadgeConverter profileBadgeConverter;
   private final Map<String, BadgeConfiguration> badgeConfigurationMap;
 
@@ -129,26 +131,29 @@ public class ProfileController {
   private static final Counter VERSION_NOT_FOUND_COUNTER = Metrics.counter(name(ProfileController.class, "versionNotFound"));
   private static final String INVALID_ACCEPT_LANGUAGE_COUNTER_NAME = name(ProfileController.class, "invalidAcceptLanguage");
 
+  private static final String PNP_FLAG_EXPERIMENT_NAME = "pnpCompatibilityFlag";
+
   public ProfileController(
-      Clock clock,
+          Clock clock,
-      RateLimiters rateLimiters,
+          RateLimiters rateLimiters,
-      AccountsManager accountsManager,
+          AccountsManager accountsManager,
-      ProfilesManager profilesManager,
+          ProfilesManager profilesManager,
-      DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager,
+          DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager, ExperimentEnrollmentManager experimentEnrollmentManager,
-      ProfileBadgeConverter profileBadgeConverter,
+          ProfileBadgeConverter profileBadgeConverter,
-      BadgesConfiguration badgesConfiguration,
+          BadgesConfiguration badgesConfiguration,
-      S3Client s3client,
+          S3Client s3client,
-      PostPolicyGenerator policyGenerator,
+          PostPolicyGenerator policyGenerator,
-      PolicySigner policySigner,
+          PolicySigner policySigner,
-      String bucket,
+          String bucket,
-      ServerZkProfileOperations zkProfileOperations,
+          ServerZkProfileOperations zkProfileOperations,
-      Executor batchIdentityCheckExecutor) {
+          Executor batchIdentityCheckExecutor) {
     this.clock = clock;
     this.rateLimiters        = rateLimiters;
     this.accountsManager     = accountsManager;
     this.profilesManager     = profilesManager;
     this.dynamicConfigurationManager = dynamicConfigurationManager;
-    this.profileBadgeConverter = profileBadgeConverter;
+      this.experimentEnrollmentManager = experimentEnrollmentManager;
+      this.profileBadgeConverter = profileBadgeConverter;
     this.badgeConfigurationMap = badgesConfiguration.getBadges().stream().collect(Collectors.toMap(
         BadgeConfiguration::getId, Function.identity()));
     this.zkProfileOperations = zkProfileOperations;
@@ -437,7 +442,8 @@ public class ProfileController {
     return new BaseProfileResponse(account.getIdentityKey(IdentityType.ACI),
         account.getUnidentifiedAccessKey().map(UnidentifiedAccessChecksum::generateFor).orElse(null),
         account.isUnrestrictedUnidentifiedAccess(),
-        UserCapabilities.createForAccount(account),
+        UserCapabilities.createForAccount(account,
+            experimentEnrollmentManager.isEnrolled(account.getIdentifier(IdentityType.ACI), PNP_FLAG_EXPERIMENT_NAME)),
         profileBadgeConverter.convert(
             getAcceptableLanguagesForRequest(containerRequestContext),
             account.getBadges(),
@@ -449,7 +455,8 @@ public class ProfileController {
     return new BaseProfileResponse(account.getIdentityKey(IdentityType.PNI),
         null,
         false,
-        UserCapabilities.createForAccount(account),
+        UserCapabilities.createForAccount(account,
+            experimentEnrollmentManager.isEnrolled(account.getIdentifier(IdentityType.ACI), PNP_FLAG_EXPERIMENT_NAME)),
         Collections.emptyList(),
         new PniServiceIdentifier(account.getPhoneNumberIdentifier()));
   }

service/src/main/java/org/whispersystems/textsecuregcm/entities/UserCapabilities.java

@@ -12,7 +12,7 @@ public record UserCapabilities(boolean paymentActivation,
                                boolean pni,
                                boolean pnp) {
 
-  public static UserCapabilities createForAccount(final Account account) {
+  public static UserCapabilities createForAccount(final Account account, final boolean includePnpFlag) {
-    return new UserCapabilities(account.isPaymentActivationSupported(), true, true);
+    return new UserCapabilities(account.isPaymentActivationSupported(), true, includePnpFlag);
   }
 }

service/src/main/java/org/whispersystems/textsecuregcm/grpc/ProfileGrpcHelper.java

@@ -105,7 +105,7 @@ public class ProfileGrpcHelper {
       final ProfileBadgeConverter profileBadgeConverter) {
     final GetUnversionedProfileResponse.Builder responseBuilder = GetUnversionedProfileResponse.newBuilder()
         .setIdentityKey(ByteString.copyFrom(targetAccount.getIdentityKey(targetIdentifier.identityType()).serialize()))
-        .setCapabilities(buildUserCapabilities(org.whispersystems.textsecuregcm.entities.UserCapabilities.createForAccount(targetAccount)));
+        .setCapabilities(buildUserCapabilities(org.whispersystems.textsecuregcm.entities.UserCapabilities.createForAccount(targetAccount, true)));
 
     switch (targetIdentifier.identityType()) {
       case ACI -> {

service/src/test/java/org/whispersystems/textsecuregcm/controllers/ProfileControllerTest.java

@@ -88,6 +88,7 @@ import org.whispersystems.textsecuregcm.entities.CreateProfileRequest;
 import org.whispersystems.textsecuregcm.entities.ExpiringProfileKeyCredentialProfileResponse;
 import org.whispersystems.textsecuregcm.entities.ProfileAvatarUploadAttributes;
 import org.whispersystems.textsecuregcm.entities.VersionedProfileResponse;
+import org.whispersystems.textsecuregcm.experiment.ExperimentEnrollmentManager;
 import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
 import org.whispersystems.textsecuregcm.identity.IdentityType;
 import org.whispersystems.textsecuregcm.identity.PniServiceIdentifier;
@@ -157,6 +158,7 @@ class ProfileControllerTest {
           accountsManager,
           profilesManager,
           dynamicConfigurationManager,
+          mock(ExperimentEnrollmentManager.class),
           (acceptableLanguages, accountBadges, isSelf) -> List.of(new Badge("TEST", "other", "Test Badge",
               "This badge is in unit tests.", List.of("l", "m", "h", "x", "xx", "xxx"), "SVG", List.of(new BadgeSvg("sl", "sd"), new BadgeSvg("ml", "md"), new BadgeSvg("ll", "ld")))
           ),

service/src/test/java/org/whispersystems/textsecuregcm/grpc/ProfileAnonymousGrpcServiceTest.java

@@ -162,7 +162,7 @@ public class ProfileAnonymousGrpcServiceTest extends SimpleBaseGrpcTest<ProfileA
         .setIdentityKey(ByteString.copyFrom(identityKey.serialize()))
         .setUnidentifiedAccess(ByteString.copyFrom(unidentifiedAccessChecksum))
         .setUnrestrictedUnidentifiedAccess(false)
-        .setCapabilities(ProfileGrpcHelper.buildUserCapabilities(UserCapabilities.createForAccount(account)))
+        .setCapabilities(ProfileGrpcHelper.buildUserCapabilities(UserCapabilities.createForAccount(account, true)))
         .addAllBadges(ProfileGrpcHelper.buildBadges(badges))
         .build();
 

service/src/test/java/org/whispersystems/textsecuregcm/grpc/ProfileGrpcServiceTest.java

@@ -429,7 +429,7 @@ public class ProfileGrpcServiceTest extends SimpleBaseGrpcTest<ProfileGrpcServic
         .setIdentityKey(ByteString.copyFrom(identityKey.serialize()))
         .setUnidentifiedAccess(ByteString.copyFrom(unidentifiedAccessChecksum))
         .setUnrestrictedUnidentifiedAccess(true)
-        .setCapabilities(ProfileGrpcHelper.buildUserCapabilities(UserCapabilities.createForAccount(account)))
+        .setCapabilities(ProfileGrpcHelper.buildUserCapabilities(UserCapabilities.createForAccount(account, true)))
         .addAllBadges(ProfileGrpcHelper.buildBadges(badges))
         .build();