Skip to content

[In-app Purchases]Use environment variable to get test site id for IAP #8111

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

Merged
merged 3 commits into from
Nov 15, 2022
Merged

[In-app Purchases]Use environment variable to get test site id for IAP #8111

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1979d79
Use environment variable to get test site id for IAP
toupper Nov 14, 2022
c88c80a
Better text.
toupper Nov 14, 2022
352a970
Simpler name.
toupper Nov 15, 2022
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
2 changes: 1 addition & 1 deletion WooCommerce/Classes/ViewRelated/Hub Menu/HubMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ struct HubMenu: View {
NavigationLink(destination: CouponListView(siteID: viewModel.siteID), isActive: $showingCoupons) {
EmptyView()
}.hidden()
NavigationLink(destination: InAppPurchasesDebugView(siteID: viewModel.siteID), isActive: $showingIAPDebug) {
NavigationLink(destination: InAppPurchasesDebugView(), isActive: $showingIAPDebug) {
EmptyView()
}.hidden()
LazyNavigationLink(destination: viewModel.getReviewDetailDestination(), isActive: $viewModel.showingReviewDetail) {
Expand Down
14 changes: 11 additions & 3 deletions WooCommerce/Classes/ViewRelated/InAppPurchases/InAppPurchasesDebugView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import Yosemite

@MainActor
struct InAppPurchasesDebugView: View {
let siteID: Int64
private let inAppPurchasesForWPComPlansManager = InAppPurchasesForWPComPlansManager()
@State var products: [WPComPlanProduct] = []
@State var entitledProductIDs: Set<String> = []
Expand All @@ -25,7 +24,8 @@ struct InAppPurchasesDebugView: View {
Text("No products")
} else if isPurchasing {
ActivityIndicator(isAnimating: .constant(true), style: .medium)
} else {
} else if let stringSiteID = ProcessInfo.processInfo.environment[Constants.siteIdEnvironmentVariableName],
let siteID = Int64(stringSiteID) {
ForEach(products, id: \.id) { product in
Button(entitledProductIDs.contains(product.id) ? "Entitled: \(product.description)" : product.description) {
Task {
Expand All @@ -36,6 +36,10 @@ struct InAppPurchasesDebugView: View {
}
}
}
} else {
Text("No valid site id could be retrieved to purchase product. " +
"Please set your Int64 test site id to the Xcode environment variable with name \(Constants.siteIdEnvironmentVariableName).")
.foregroundColor(.red)
}
}

Expand Down Expand Up @@ -104,6 +108,10 @@ struct InAppPurchasesDebugView: View {

struct InAppPurchasesDebugView_Previews: PreviewProvider {
static var previews: some View {
InAppPurchasesDebugView(siteID: 0)
InAppPurchasesDebugView()
}
}

private enum Constants {
static let siteIdEnvironmentVariableName = "iap-debug-site-id-purchase-param"
Copy link
Member

@koke koke Nov 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpicky, but maybe iap-debug-site-id is descriptive enough

Copy link
Contributor Author

@toupper toupper Nov 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed! That name is simpler and descriptive enough

}
5 changes: 5 additions & 0 deletions WooCommerce/WooCommerce.xcodeproj/xcshareddata/xcschemes/WooCommerce.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@
value = ""
isEnabled = "NO">
</EnvironmentVariable>
<EnvironmentVariable
key = "iap-debug-site-id-purchase-param"
value = ""
isEnabled = "NO">
</EnvironmentVariable>
</EnvironmentVariables>
</LaunchAction>
<ProfileAction
Expand Down