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

Add additional http status codes to /v1/subscription/boost/receipt_credentials

This commit is contained in:
Ehren Kret 2021-11-19 10:11:33 -06:00
parent 4c80714d19
commit 4f1ef9a039
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.Status;
import org.apache.commons.lang3.StringUtils;
import org.signal.zkgroup.InvalidInputException; import org.signal.zkgroup.InvalidInputException;
import org.signal.zkgroup.VerificationFailedException; import org.signal.zkgroup.VerificationFailedException;
import org.signal.zkgroup.receipts.ReceiptCredentialRequest; import org.signal.zkgroup.receipts.ReceiptCredentialRequest;
@ -562,10 +563,13 @@ public class SubscriptionController {
return stripeManager.getPaymentIntent(request.getPaymentIntentId()) return stripeManager.getPaymentIntent(request.getPaymentIntentId())
.thenCompose(paymentIntent -> { .thenCompose(paymentIntent -> {
if (paymentIntent == null) { if (paymentIntent == null) {
throw new WebApplicationException(Status.NOT_FOUND);
}
if (StringUtils.equalsIgnoreCase("processing", paymentIntent.getStatus())) {
throw new WebApplicationException(Status.NO_CONTENT); throw new WebApplicationException(Status.NO_CONTENT);
} }
if (!"succeeded".equalsIgnoreCase(paymentIntent.getStatus())) { if (!StringUtils.equalsIgnoreCase("succeeded", paymentIntent.getStatus())) {
throw new WebApplicationException(Status.NO_CONTENT); throw new WebApplicationException(Status.PAYMENT_REQUIRED);
} }
ReceiptCredentialRequest receiptCredentialRequest; ReceiptCredentialRequest receiptCredentialRequest;
try { try {