Hardcode `paymentActivation` flag to `true`
This commit is contained in:
parent
a9d0ab271d
commit
d002e5dda8
|
@ -439,7 +439,7 @@ public class ProfileController {
|
||||||
return new BaseProfileResponse(account.getIdentityKey(IdentityType.ACI),
|
return new BaseProfileResponse(account.getIdentityKey(IdentityType.ACI),
|
||||||
account.getUnidentifiedAccessKey().map(UnidentifiedAccessChecksum::generateFor).orElse(null),
|
account.getUnidentifiedAccessKey().map(UnidentifiedAccessChecksum::generateFor).orElse(null),
|
||||||
account.isUnrestrictedUnidentifiedAccess(),
|
account.isUnrestrictedUnidentifiedAccess(),
|
||||||
UserCapabilities.createForAccount(account),
|
new UserCapabilities(),
|
||||||
profileBadgeConverter.convert(
|
profileBadgeConverter.convert(
|
||||||
getAcceptableLanguagesForRequest(containerRequestContext),
|
getAcceptableLanguagesForRequest(containerRequestContext),
|
||||||
account.getBadges(),
|
account.getBadges(),
|
||||||
|
@ -451,7 +451,7 @@ public class ProfileController {
|
||||||
return new BaseProfileResponse(account.getIdentityKey(IdentityType.PNI),
|
return new BaseProfileResponse(account.getIdentityKey(IdentityType.PNI),
|
||||||
null,
|
null,
|
||||||
false,
|
false,
|
||||||
UserCapabilities.createForAccount(account),
|
new UserCapabilities(),
|
||||||
Collections.emptyList(),
|
Collections.emptyList(),
|
||||||
new PniServiceIdentifier(account.getPhoneNumberIdentifier()));
|
new PniServiceIdentifier(account.getPhoneNumberIdentifier()));
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
package org.whispersystems.textsecuregcm.entities;
|
package org.whispersystems.textsecuregcm.entities;
|
||||||
|
|
||||||
import org.whispersystems.textsecuregcm.storage.Account;
|
public record UserCapabilities(
|
||||||
|
// TODO: Remove the paymentActivation capability entirely sometime soon after 2024-06-30
|
||||||
|
boolean paymentActivation,
|
||||||
|
// TODO Remove the PNI and PNP capabilities entirely on or after 2024-05-18
|
||||||
|
boolean pni,
|
||||||
|
boolean pnp,
|
||||||
|
// TODO Remove the giftBadges capability on or after 2024-05-26
|
||||||
|
boolean giftBadges) {
|
||||||
|
|
||||||
public record UserCapabilities(boolean paymentActivation,
|
public UserCapabilities() {
|
||||||
// TODO Remove the PNI and PNP capabilities entirely on or after 2024-05-18
|
this(true, true, true, true);
|
||||||
boolean pni,
|
|
||||||
boolean pnp,
|
|
||||||
// TODO Remove the giftBadges capability on or after 2024-05-26
|
|
||||||
boolean giftBadges) {
|
|
||||||
|
|
||||||
public static UserCapabilities createForAccount(final Account account) {
|
|
||||||
return new UserCapabilities(account.isPaymentActivationSupported(), true, true, true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -105,7 +105,7 @@ public class ProfileGrpcHelper {
|
||||||
final ProfileBadgeConverter profileBadgeConverter) {
|
final ProfileBadgeConverter profileBadgeConverter) {
|
||||||
final GetUnversionedProfileResponse.Builder responseBuilder = GetUnversionedProfileResponse.newBuilder()
|
final GetUnversionedProfileResponse.Builder responseBuilder = GetUnversionedProfileResponse.newBuilder()
|
||||||
.setIdentityKey(ByteString.copyFrom(targetAccount.getIdentityKey(targetIdentifier.identityType()).serialize()))
|
.setIdentityKey(ByteString.copyFrom(targetAccount.getIdentityKey(targetIdentifier.identityType()).serialize()))
|
||||||
.setCapabilities(buildUserCapabilities(org.whispersystems.textsecuregcm.entities.UserCapabilities.createForAccount(targetAccount)));
|
.setCapabilities(buildUserCapabilities(new org.whispersystems.textsecuregcm.entities.UserCapabilities()));
|
||||||
|
|
||||||
switch (targetIdentifier.identityType()) {
|
switch (targetIdentifier.identityType()) {
|
||||||
case ACI -> {
|
case ACI -> {
|
||||||
|
|
|
@ -391,7 +391,7 @@ class ProfileControllerTest {
|
||||||
.get(BaseProfileResponse.class);
|
.get(BaseProfileResponse.class);
|
||||||
|
|
||||||
assertThat(profile.getCapabilities().pni()).isTrue();
|
assertThat(profile.getCapabilities().pni()).isTrue();
|
||||||
assertThat(profile.getCapabilities().paymentActivation()).isFalse();
|
assertThat(profile.getCapabilities().paymentActivation()).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -161,7 +161,7 @@ public class ProfileAnonymousGrpcServiceTest extends SimpleBaseGrpcTest<ProfileA
|
||||||
.setIdentityKey(ByteString.copyFrom(identityKey.serialize()))
|
.setIdentityKey(ByteString.copyFrom(identityKey.serialize()))
|
||||||
.setUnidentifiedAccess(ByteString.copyFrom(unidentifiedAccessChecksum))
|
.setUnidentifiedAccess(ByteString.copyFrom(unidentifiedAccessChecksum))
|
||||||
.setUnrestrictedUnidentifiedAccess(false)
|
.setUnrestrictedUnidentifiedAccess(false)
|
||||||
.setCapabilities(ProfileGrpcHelper.buildUserCapabilities(UserCapabilities.createForAccount(account)))
|
.setCapabilities(ProfileGrpcHelper.buildUserCapabilities(new UserCapabilities()))
|
||||||
.addAllBadges(ProfileGrpcHelper.buildBadges(badges))
|
.addAllBadges(ProfileGrpcHelper.buildBadges(badges))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
|
|
@ -436,7 +436,7 @@ public class ProfileGrpcServiceTest extends SimpleBaseGrpcTest<ProfileGrpcServic
|
||||||
.setIdentityKey(ByteString.copyFrom(identityKey.serialize()))
|
.setIdentityKey(ByteString.copyFrom(identityKey.serialize()))
|
||||||
.setUnidentifiedAccess(ByteString.copyFrom(unidentifiedAccessChecksum))
|
.setUnidentifiedAccess(ByteString.copyFrom(unidentifiedAccessChecksum))
|
||||||
.setUnrestrictedUnidentifiedAccess(true)
|
.setUnrestrictedUnidentifiedAccess(true)
|
||||||
.setCapabilities(ProfileGrpcHelper.buildUserCapabilities(UserCapabilities.createForAccount(account)))
|
.setCapabilities(ProfileGrpcHelper.buildUserCapabilities(new UserCapabilities()))
|
||||||
.addAllBadges(ProfileGrpcHelper.buildBadges(badges))
|
.addAllBadges(ProfileGrpcHelper.buildBadges(badges))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue