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

Round up by days on receipt expiration

This commit is contained in:
Ehren Kret 2021-10-18 12:11:27 -05:00
parent 08304bf375
commit ee9aa9ce12
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.time.Clock; import java.time.Clock;
import java.time.Instant; import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Base64; import java.util.Base64;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
@ -552,7 +553,8 @@ public class SubscriptionController {
return CompletableFuture.completedFuture(null); return CompletableFuture.completedFuture(null);
} }
return issuedReceiptsManager.recordIssuance( return issuedReceiptsManager.recordIssuance(
receipt.invoiceLineItemId, receiptCredentialRequest, requestData.now).thenApply(unused -> receipt); receipt.getInvoiceLineItemId(), receiptCredentialRequest, requestData.now)
.thenApply(unused -> receipt);
}) })
.thenApply(receipt -> { .thenApply(receipt -> {
if (receipt == null) { if (receipt == null) {
@ -616,7 +618,10 @@ public class SubscriptionController {
InvoiceLineItem subscriptionLineItem = subscriptionLineItems.stream().findAny().get(); InvoiceLineItem subscriptionLineItem = subscriptionLineItems.stream().findAny().get();
return stripeManager.getProductForPrice(subscriptionLineItem.getPrice().getId()).thenApply(product -> new Receipt( return stripeManager.getProductForPrice(subscriptionLineItem.getPrice().getId()).thenApply(product -> new Receipt(
Instant.ofEpochSecond(subscriptionLineItem.getPeriod().getEnd()).plus(config.getBadgeGracePeriod()), Instant.ofEpochSecond(subscriptionLineItem.getPeriod().getEnd())
.plus(config.getBadgeGracePeriod())
.truncatedTo(ChronoUnit.DAYS)
.plus(1, ChronoUnit.DAYS),
stripeManager.getLevelForProduct(product), stripeManager.getLevelForProduct(product),
subscriptionLineItem.getId())); subscriptionLineItem.getId()));
}); });