MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support iDEAL

This commit is contained in:
Katherine 2023-10-12 09:54:05 -07:00 committed by GitHub
parent 33c8bbd0ce
commit c6b4e2b71d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java
View File

@ -190,10 +190,10 @@ public class SubscriptionController {
})); }));
} }
// This logic to exclude some iOS client versions from receiving SEPA_DEBIT // This logic to exclude some iOS client versions from receiving SEPA_DEBIT or IDEAL
// as a supported payment method can be removed after 01-23-24. // as a supported payment method can be removed after 01-23-24.
private boolean excludePaymentMethod(@Nullable final UserAgent userAgent, final PaymentMethod paymentMethod) { private boolean excludePaymentMethod(@Nullable final UserAgent userAgent, final PaymentMethod paymentMethod) {
return paymentMethod == PaymentMethod.SEPA_DEBIT return (paymentMethod == PaymentMethod.SEPA_DEBIT || paymentMethod == PaymentMethod.IDEAL)
&& userAgent != null && userAgent != null
&& userAgent.getPlatform() == ClientPlatform.IOS && userAgent.getPlatform() == ClientPlatform.IOS
&& userAgent.getVersion().isLowerThanOrEqualTo(LAST_PROBLEMATIC_IOS_VERSION); && userAgent.getVersion().isLowerThanOrEqualTo(LAST_PROBLEMATIC_IOS_VERSION);
@ -392,7 +392,7 @@ public class SubscriptionController {
private SubscriptionProcessorManager getManagerForPaymentMethod(PaymentMethod paymentMethod) { private SubscriptionProcessorManager getManagerForPaymentMethod(PaymentMethod paymentMethod) {
return switch (paymentMethod) { return switch (paymentMethod) {
case CARD, SEPA_DEBIT -> stripeManager; case CARD, SEPA_DEBIT, IDEAL -> stripeManager;
case PAYPAL -> braintreeManager; case PAYPAL -> braintreeManager;
case UNKNOWN -> throw new BadRequestException("Invalid payment method"); case UNKNOWN -> throw new BadRequestException("Invalid payment method");
}; };

4
service/src/main/java/org/whispersystems/textsecuregcm/subscriptions/PaymentMethod.java
View File

@ -19,4 +19,8 @@ public enum PaymentMethod {
* A SEPA debit account * A SEPA debit account
*/ */
SEPA_DEBIT, SEPA_DEBIT,
/**
* An iDEAL account
*/
IDEAL,
} }

4
service/src/main/java/org/whispersystems/textsecuregcm/subscriptions/StripeManager.java
View File

@ -107,7 +107,9 @@ public class StripeManager implements SubscriptionProcessorManager {
@Override @Override
public boolean supportsPaymentMethod(PaymentMethod paymentMethod) { public boolean supportsPaymentMethod(PaymentMethod paymentMethod) {
return paymentMethod == PaymentMethod.CARD || paymentMethod == PaymentMethod.SEPA_DEBIT; return paymentMethod == PaymentMethod.CARD
|| paymentMethod == PaymentMethod.SEPA_DEBIT
|| paymentMethod == PaymentMethod.IDEAL;
} }
private RequestOptions commonOptions() { private RequestOptions commonOptions() {

6
service/src/test/java/org/whispersystems/textsecuregcm/controllers/SubscriptionControllerTest.java
View File

@ -132,6 +132,8 @@ class SubscriptionControllerTest {
.thenReturn(Set.of("usd", "jpy", "bif", "eur")); .thenReturn(Set.of("usd", "jpy", "bif", "eur"));
when(STRIPE_MANAGER.getSupportedCurrenciesForPaymentMethod(PaymentMethod.SEPA_DEBIT)) when(STRIPE_MANAGER.getSupportedCurrenciesForPaymentMethod(PaymentMethod.SEPA_DEBIT))
.thenReturn(Set.of("eur")); .thenReturn(Set.of("eur"));
when(STRIPE_MANAGER.getSupportedCurrenciesForPaymentMethod(PaymentMethod.IDEAL))
.thenReturn(Set.of("eur"));
when(BRAINTREE_MANAGER.getSupportedCurrenciesForPaymentMethod(PaymentMethod.PAYPAL)) when(BRAINTREE_MANAGER.getSupportedCurrenciesForPaymentMethod(PaymentMethod.PAYPAL))
.thenReturn(Set.of("usd", "jpy")); .thenReturn(Set.of("usd", "jpy"));
} }
@ -733,7 +735,7 @@ class SubscriptionControllerTest {
@ParameterizedTest @ParameterizedTest
@MethodSource @MethodSource
void getSubscriptionConfiguration(final String userAgent, final boolean expectSepa) { void getSubscriptionConfiguration(final String userAgent, final boolean expectNonCardPaymentMethods) {
when(BADGE_TRANSLATOR.translate(any(), eq("B1"))).thenReturn(new Badge("B1", "cat1", "name1", "desc1", when(BADGE_TRANSLATOR.translate(any(), eq("B1"))).thenReturn(new Badge("B1", "cat1", "name1", "desc1",
List.of("l", "m", "h", "x", "xx", "xxx"), "SVG", List.of("l", "m", "h", "x", "xx", "xxx"), "SVG",
List.of(new BadgeSvg("sl", "sd"), new BadgeSvg("ml", "md"), new BadgeSvg("ll", "ld")))); List.of(new BadgeSvg("sl", "sd"), new BadgeSvg("ml", "md"), new BadgeSvg("ll", "ld"))));
@ -811,7 +813,7 @@ class SubscriptionControllerTest {
List.of(BigDecimal.valueOf(5)))); List.of(BigDecimal.valueOf(5))));
assertThat(currency.subscription()).isEqualTo( assertThat(currency.subscription()).isEqualTo(
Map.of("5", BigDecimal.valueOf(5), "15", BigDecimal.valueOf(15),"35", BigDecimal.valueOf(35))); Map.of("5", BigDecimal.valueOf(5), "15", BigDecimal.valueOf(15),"35", BigDecimal.valueOf(35)));
final List<String> expectedPaymentMethods = expectSepa ? List.of("CARD", "SEPA_DEBIT") : List.of("CARD"); final List<String> expectedPaymentMethods = expectNonCardPaymentMethods ? List.of("CARD", "SEPA_DEBIT", "IDEAL") : List.of("CARD");
assertThat(currency.supportedPaymentMethods()).isEqualTo(expectedPaymentMethods); assertThat(currency.supportedPaymentMethods()).isEqualTo(expectedPaymentMethods);
}); });
}); });