Upstream
/
bitwarden-desktop
mirror of https://github.com/bitwarden/desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

purchase promise

This commit is contained in:
Kyle Spearrin 2019-09-19 09:09:25 -04:00
parent a092631fa4
commit 2f84e2fd82
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/accounts/premium.component.html
View File

@ -51,7 +51,8 @@
<button type="button" class="primary" appBlurClick (click)="manage()" *ngIf="isPremium">
<b>{{'premiumManage' | i18n}}</b>
</button>
<button type="button" class="primary" appBlurClick (click)="purchase()" *ngIf="!isPremium">
<button #purchaseBtn type="button" class="primary" appBlurClick (click)="purchase()" *ngIf="!isPremium"
[disabled]="purchaseBtn.loading" [appApiAction]="purchasePromise">
<b>{{'premiumPurchase' | i18n}}</b>
</button>
<button type="button" data-dismiss="modal">{{'close' | i18n}}</button>

10
src/app/accounts/premium.component.ts
View File

@ -26,7 +26,7 @@ import { Utils } from 'jslib/misc/utils';
templateUrl: 'premium.component.html',
})
export class PremiumComponent extends BasePremiumComponent {
formPromise: Promise<any>;
purchasePromise: Promise<any>;
canMakeMacAppStorePayments = false;
constructor(i18nService: I18nService, platformUtilsService: PlatformUtilsService,
@ -51,7 +51,7 @@ export class PremiumComponent extends BasePremiumComponent {
return;
}
// Check each transaction.
transactions.forEach((transaction) => {
transactions.forEach(async (transaction) => {
const payment = transaction.payment;
switch (transaction.transactionState) {
case 'purchasing':
@ -72,11 +72,12 @@ export class PremiumComponent extends BasePremiumComponent {
fd.append('paymentToken', receiptB64);
fd.append('additionalStorageGb', '0');
try {
this.formPromise = this.apiService.postPremium(fd).then((paymentResponse) => {
this.purchasePromise = this.apiService.postPremium(fd).then((paymentResponse) => {
if (paymentResponse.success) {
return this.finalizePremium();
}
});
await this.purchasePromise;
} catch { }
// Finish the transaction.
remote.inAppPurchase.finishTransactionByDate(transaction.transactionDate);
@ -111,7 +112,8 @@ export class PremiumComponent extends BasePremiumComponent {
try {
const request = new IapCheckRequest();
request.paymentMethodType = PaymentMethodType.AppleInApp;
await this.apiService.postIapCheck(request);
this.purchasePromise = this.apiService.postIapCheck(request);
await this.purchasePromise;
remote.inAppPurchase.purchaseProduct('premium_annually', 1, (isValid) => {
if (!isValid) {
// TODO?