Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-26 19:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor a large portion of the payments code to prep it for PayPal support.

Browse Source
This commit is contained in:
Alex Hart
2022-11-10 12:57:21 -04:00
committed by Greyson Parrelli
parent c563ef27da
commit 9d71c4df81
39 changed files with 839 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java
View File

@@ -9,8 +9,8 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription;
import org.whispersystems.signalservice.api.subscriptions.StripeClientSecret;
import org.whispersystems.signalservice.api.subscriptions.SubscriberId;
import org.whispersystems.signalservice.api.subscriptions.SubscriptionClientSecret;
import org.whispersystems.signalservice.api.subscriptions.SubscriptionLevels;
import org.whispersystems.signalservice.api.util.CredentialsProvider;
import org.whispersystems.signalservice.internal.EmptyResponse;
@@ -43,7 +43,8 @@ public class DonationsService {
String signalAgent,
GroupsV2Operations groupsV2Operations,
boolean automaticNetworkRetry
) {
)
{
this(new PushServiceSocket(configuration, credentialsProvider, signalAgent, groupsV2Operations.getProfileOperations(), automaticNetworkRetry));
}
@@ -71,12 +72,12 @@ public class DonationsService {
/**
* Submits price information to the server to generate a payment intent via the payment gateway.
*
* @param amount Price, in the minimum currency unit (e.g. cents or yen)
* @param currencyCode The currency code for the amount
* @return A ServiceResponse containing a DonationIntentResult with details given to us by the payment gateway.
* @param amount Price, in the minimum currency unit (e.g. cents or yen)
* @param currencyCode The currency code for the amount
* @return A ServiceResponse containing a DonationIntentResult with details given to us by the payment gateway.
*/
public ServiceResponse<SubscriptionClientSecret> createDonationIntentWithAmount(String amount, String currencyCode, long level) {
return wrapInServiceResponse(() -> new Pair<>(pushServiceSocket.createBoostPaymentMethod(currencyCode, Long.parseLong(amount), level), 200));
public ServiceResponse<StripeClientSecret> createDonationIntentWithAmount(String amount, String currencyCode, long level) {
return wrapInServiceResponse(() -> new Pair<>(pushServiceSocket.createStripeOneTimePaymentIntent(currencyCode, Long.parseLong(amount), level), 200));
}
/**
@@ -165,9 +166,10 @@ public class DonationsService {
String currencyCode,
String idempotencyKey,
Object mutex
) {
)
{
return wrapInServiceResponse(() -> {
synchronized(mutex) {
synchronized (mutex) {
pushServiceSocket.updateSubscriptionLevel(subscriberId.serialize(), level, currencyCode, idempotencyKey);
}
return new Pair<>(EmptyResponse.INSTANCE, 200);
@@ -188,11 +190,11 @@ public class DonationsService {
* Creates a subscriber record on the signal server and stripe. Can be called idempotently as-is. After receiving 200 from this endpoint,
* clients should save subscriberId locally and to storage service for the account. If you get a 403 from this endpoint and you did not
* use an account authenticated connection, then the subscriberId has been corrupted in some way.
*
* <p>
* Clients MUST periodically hit this endpoint to update the access time on the subscription record. Recommend trying to call it approximately
* every 3 days. Not accessing this endpoint for an extended period of time will result in the subscription being canceled.
*
* @param subscriberId The subscriber ID for the user polling their subscription
* @param subscriberId The subscriber ID for the user polling their subscription
*/
public ServiceResponse<EmptyResponse> putSubscription(SubscriberId subscriberId) {
return wrapInServiceResponse(() -> {
@@ -204,7 +206,7 @@ public class DonationsService {
/**
* Cancels any current subscription at the end of the current subscription period.
*
* @param subscriberId The subscriber ID for the user cancelling their subscription
* @param subscriberId The subscriber ID for the user cancelling their subscription
*/
public ServiceResponse<EmptyResponse> cancelSubscription(SubscriberId subscriberId) {
return wrapInServiceResponse(() -> {
@@ -213,7 +215,7 @@ public class DonationsService {
});
}
public ServiceResponse<EmptyResponse> setDefaultPaymentMethodId(SubscriberId subscriberId, String paymentMethodId) {
public ServiceResponse<EmptyResponse> setDefaultStripePaymentMethod(SubscriberId subscriberId, String paymentMethodId) {
return wrapInServiceResponse(() -> {
pushServiceSocket.setDefaultSubscriptionPaymentMethod(subscriberId.serialize(), paymentMethodId);
return new Pair<>(EmptyResponse.INSTANCE, 200);
@@ -226,9 +228,9 @@ public class DonationsService {
* @return Client secret for a SetupIntent. It should not be used with the PaymentIntent stripe APIs
* but instead with the SetupIntent stripe APIs.
*/
public ServiceResponse<SubscriptionClientSecret> createSubscriptionPaymentMethod(SubscriberId subscriberId) {
public ServiceResponse<StripeClientSecret> createStripeSubscriptionPaymentMethod(SubscriberId subscriberId) {
return wrapInServiceResponse(() -> {
SubscriptionClientSecret clientSecret = pushServiceSocket.createSubscriptionPaymentMethod(subscriberId.serialize());
StripeClientSecret clientSecret = pushServiceSocket.createSubscriptionPaymentMethod(subscriberId.serialize());
return new Pair<>(clientSecret, 200);
});
}

4
libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionClientSecret.java → libsignal/service/src/main/java/org/whispersystems/signalservice/api/subscriptions/StripeClientSecret.java
View File

@@ -3,13 +3,13 @@ package org.whispersystems.signalservice.api.subscriptions;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
public final class SubscriptionClientSecret {
public final class StripeClientSecret {
private final String id;
private final String clientSecret;
@JsonCreator
public SubscriptionClientSecret(@JsonProperty("clientSecret") String clientSecret) {
public StripeClientSecret(@JsonProperty("clientSecret") String clientSecret) {
this.id = clientSecret.replaceFirst("_secret.*", "");
this.clientSecret = clientSecret;
}

12
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
View File

@@ -86,7 +86,7 @@ import org.whispersystems.signalservice.api.push.exceptions.UsernameMalformedExc
import org.whispersystems.signalservice.api.push.exceptions.UsernameTakenException;
import org.whispersystems.signalservice.api.storage.StorageAuthResponse;
import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription;
import org.whispersystems.signalservice.api.subscriptions.SubscriptionClientSecret;
import org.whispersystems.signalservice.api.subscriptions.StripeClientSecret;
import org.whispersystems.signalservice.api.subscriptions.SubscriptionLevels;
import org.whispersystems.signalservice.api.util.CredentialsProvider;
import org.whispersystems.signalservice.api.util.Tls12SocketFactory;
@@ -1017,10 +1017,10 @@ public class PushServiceSocket {
makeServiceRequest(DONATION_REDEEM_RECEIPT, "POST", payload);
}
public SubscriptionClientSecret createBoostPaymentMethod(String currencyCode, long amount, long level) throws IOException {
String payload = JsonUtil.toJson(new DonationIntentPayload(amount, currencyCode, level));
public StripeClientSecret createStripeOneTimePaymentIntent(String currencyCode, long amount, long level) throws IOException {
String payload = JsonUtil.toJson(new StripeOneTimePaymentIntentPayload(amount, currencyCode, level));
String result = makeServiceRequestWithoutAuthentication(CREATE_BOOST_PAYMENT_INTENT, "POST", payload);
return JsonUtil.fromJsonResponse(result, SubscriptionClientSecret.class);
return JsonUtil.fromJsonResponse(result, StripeClientSecret.class);
}
public Map<String, List<BigDecimal>> getBoostAmounts() throws IOException {
@@ -1082,9 +1082,9 @@ public class PushServiceSocket {
makeServiceRequestWithoutAuthentication(String.format(SUBSCRIPTION, subscriberId), "DELETE", null);
}
public SubscriptionClientSecret createSubscriptionPaymentMethod(String subscriberId) throws IOException {
public StripeClientSecret createSubscriptionPaymentMethod(String subscriberId) throws IOException {
String response = makeServiceRequestWithoutAuthentication(String.format(CREATE_SUBSCRIPTION_PAYMENT_METHOD, subscriberId), "POST", "");
return JsonUtil.fromJson(response, SubscriptionClientSecret.class);
return JsonUtil.fromJson(response, StripeClientSecret.class);
}
public void setDefaultSubscriptionPaymentMethod(String subscriberId, String paymentMethodId) throws IOException {

4
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/DonationIntentPayload.java → libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/StripeOneTimePaymentIntentPayload.java
View File

@@ -2,7 +2,7 @@ package org.whispersystems.signalservice.internal.push;
import com.fasterxml.jackson.annotation.JsonProperty;
class DonationIntentPayload {
class StripeOneTimePaymentIntentPayload {
@JsonProperty
private long amount;
@@ -12,7 +12,7 @@ class DonationIntentPayload {
@JsonProperty
private long level;
public DonationIntentPayload(long amount, String currency, long level) {
public StripeOneTimePaymentIntentPayload(long amount, String currency, long level) {
this.amount = amount;
this.currency = currency;
this.level = level;