Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add obfuscatedAccountId and obfuscatedProfileId to UpgradePurchasedSubscription #608

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add obfuscatedAccountId and obfuscatedProfileId to UpgradePurchasedSubscription #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04a5130
Add obfuscatedAccountId and obfuscatedProfileId to UpgradePurchasedSu…
NGumby Jun 10, 2024
80a8527
Merge branch 'master' into master
NGumby Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/Plugin.InAppBilling/InAppBilling.android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ public override async Task<IEnumerable<InAppBillingPurchase>> GetPurchasesHistor
/// <param name="purchaseTokenOfOriginalSubscription">Purchase token of original subscription</param>
/// <param name="prorationMode">Proration mode (1 - ImmediateWithTimeProration, 2 - ImmediateAndChargeProratedPrice, 3 - ImmediateWithoutProration, 4 - Deferred)</param>
/// <returns>Purchase details</returns>
public override async Task<InAppBillingPurchase> UpgradePurchasedSubscriptionAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode = SubscriptionProrationMode.ImmediateWithTimeProration)
public override async Task<InAppBillingPurchase> UpgradePurchasedSubscriptionAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode = SubscriptionProrationMode.ImmediateWithTimeProration, string obfuscatedAccountId = null, string obfuscatedProfileId = null)
{
if (BillingClient == null || !IsConnected)
{
Expand All @@ -236,12 +236,12 @@ public override async Task<InAppBillingPurchase> UpgradePurchasedSubscriptionAsy
return null;
}

var purchase = await UpgradePurchasedSubscriptionInternalAsync(newProductId, purchaseTokenOfOriginalSubscription, prorationMode);
var purchase = await UpgradePurchasedSubscriptionInternalAsync(newProductId, purchaseTokenOfOriginalSubscription, prorationMode, obfuscatedAccountId, obfuscatedProfileId);

return purchase;
}

async Task<InAppBillingPurchase> UpgradePurchasedSubscriptionInternalAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode)
async Task<InAppBillingPurchase> UpgradePurchasedSubscriptionInternalAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode, string obfuscatedAccountId, string obfuscatedProfileId)
{
var itemType = ProductType.Subs;

Expand Down Expand Up @@ -282,10 +282,17 @@ async Task<InAppBillingPurchase> UpgradePurchasedSubscriptionInternalAsync(strin

var prodDetailsParams = string.IsNullOrWhiteSpace(t) ? prodDetails.Build() : prodDetails.SetOfferToken(t).Build();

var flowParams = BillingFlowParams.NewBuilder()
var billingFlowParams = BillingFlowParams.NewBuilder()
.SetProductDetailsParamsList(new[] { prodDetailsParams })
.SetSubscriptionUpdateParams(updateParams)
.Build();
.SetSubscriptionUpdateParams(updateParams);

if (!string.IsNullOrWhiteSpace(obfuscatedAccountId))
billingFlowParams.SetObfuscatedAccountId(obfuscatedAccountId);

if (!string.IsNullOrWhiteSpace(obfuscatedProfileId))
billingFlowParams.SetObfuscatedProfileId(obfuscatedProfileId);

var flowParams = billingFlowParams.Build();

tcsPurchase = new TaskCompletionSource<(BillingResult billingResult, IList<Purchase> purchases)>();
var responseCode = BillingClient.LaunchBillingFlow(Activity, flowParams);
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin.InAppBilling/InAppBilling.apple.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ async Task<SKPaymentTransaction> PurchaseAsync(string productId, ItemType itemTy
/// (iOS not supported) Apple store manages upgrades natively when subscriptions of the same group are purchased.
/// </summary>
/// <exception cref="NotImplementedException">iOS not supported</exception>
public override Task<InAppBillingPurchase> UpgradePurchasedSubscriptionAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode = SubscriptionProrationMode.ImmediateWithTimeProration) =>
public override Task<InAppBillingPurchase> UpgradePurchasedSubscriptionAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode = SubscriptionProrationMode.ImmediateWithTimeProration, string obfuscatedProfileId = null, string subOfferToken = null) =>
throw new NotImplementedException("iOS not supported. Apple store manages upgrades natively when subscriptions of the same group are purchased.");


Expand Down
2 changes: 1 addition & 1 deletion src/Plugin.InAppBilling/InAppBilling.uwp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public async override Task<InAppBillingPurchase> PurchaseAsync(string productId,
/// (UWP not supported) Upgrade/Downgrade/Change a previously purchased subscription
/// </summary>
/// <exception cref="NotImplementedException">UWP not supported</exception>
public override Task<InAppBillingPurchase> UpgradePurchasedSubscriptionAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode = SubscriptionProrationMode.ImmediateWithTimeProration) =>
public override Task<InAppBillingPurchase> UpgradePurchasedSubscriptionAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode = SubscriptionProrationMode.ImmediateWithTimeProration, string obfuscatedAccountId = null, string obfuscatedProfileId = null) =>
throw new NotImplementedException("UWP not supported.");

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin.InAppBilling/Shared/BaseInAppBilling.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public abstract class BaseInAppBilling : IInAppBilling, IDisposable
/// <param name="purchaseTokenOfOriginalSubscription">Purchase token of original subscription (can not be null)</param>
/// <param name="prorationMode">Proration mode</param>
/// <returns>Purchase details</returns>
public abstract Task<InAppBillingPurchase> UpgradePurchasedSubscriptionAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode = SubscriptionProrationMode.ImmediateWithTimeProration);
public abstract Task<InAppBillingPurchase> UpgradePurchasedSubscriptionAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode = SubscriptionProrationMode.ImmediateWithTimeProration, string obfuscatedAccountId = null, string obfuscatedProfileId = null);

/// <summary>
/// Consume a purchase with a purchase token.
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin.InAppBilling/Shared/IInAppBilling.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public interface IInAppBilling : IDisposable
/// <param name="prorationMode">Proration mode (1 - ImmediateWithTimeProration, 2 - ImmediateAndChargeProratedPrice, 3 - ImmediateWithoutProration, 4 - Deferred)</param>
/// <returns>Purchase details</returns>
/// <exception cref="InAppBillingPurchaseException">If an error occurs during processing</exception>
Task<InAppBillingPurchase> UpgradePurchasedSubscriptionAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode = SubscriptionProrationMode.ImmediateWithTimeProration);
Task<InAppBillingPurchase> UpgradePurchasedSubscriptionAsync(string newProductId, string purchaseTokenOfOriginalSubscription, SubscriptionProrationMode prorationMode = SubscriptionProrationMode.ImmediateWithTimeProration, string obfuscatedAccountId = null, string obfuscatedProfileId = null);

/// <summary>
/// Consume a purchase with a purchase token.
Expand Down
Loading