passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extend beta conditions 

Full version in beta and locked features are not exclusive.

Never consider macOS in beta (may accidentally unlock features).
This commit is contained in:
Davide De Rosa 2021-02-05 17:10:19 +01:00
parent 1180590f40
commit 22a80014ba
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Passepartout/Core/Sources/AppConstants.swift
View File

@ -350,6 +350,8 @@ public class AppConstants {
} }
struct InApp { struct InApp {
static let locksBetaFeatures = true
#if os(iOS) #if os(iOS)
static var isBetaFullVersion: Bool { static var isBetaFullVersion: Bool {
return ProcessInfo.processInfo.environment["FULL_VERSION"] != nil return ProcessInfo.processInfo.environment["FULL_VERSION"] != nil

26
Passepartout/Core/Sources/Model/ProductManager.swift
View File

@ -40,14 +40,18 @@ public enum ProductError: Error {
public class ProductManager: NSObject { public class ProductManager: NSObject {
public struct Configuration { public struct Configuration {
public let locksBetaFeatures: Bool
public let isBetaFullVersion: Bool public let isBetaFullVersion: Bool
public let lastFullVersionBuild: Int public let lastFullVersionBuild: Int
public init( public init(
locksBetaFeatures: Bool,
isBetaFullVersion: Bool, isBetaFullVersion: Bool,
lastFullVersionBuild: Int lastFullVersionBuild: Int
) { ) {
self.locksBetaFeatures = locksBetaFeatures
self.isBetaFullVersion = isBetaFullVersion self.isBetaFullVersion = isBetaFullVersion
self.lastFullVersionBuild = lastFullVersionBuild self.lastFullVersionBuild = lastFullVersionBuild
} }
@ -92,11 +96,15 @@ public class ProductManager: NSObject {
} }
public var isBeta: Bool { public var isBeta: Bool {
#if os(iOS)
#if targetEnvironment(simulator) #if targetEnvironment(simulator)
return true return true
#else #else
return Bundle.main.appStoreReceiptURL?.lastPathComponent == "sandboxReceipt" return Bundle.main.appStoreReceiptURL?.lastPathComponent == "sandboxReceipt"
#endif #endif
#else
return false
#endif
} }
public func listProducts(completionHandler: (([SKProduct]?, Error?) -> Void)?) { public func listProducts(completionHandler: (([SKProduct]?, Error?) -> Void)?) {
@ -157,7 +165,7 @@ public class ProductManager: NSObject {
return true return true
} }
#else #else
if cfg.isBetaFullVersion || purchasedFeatures.contains(.fullVersion_macOS) { if (isBeta && cfg.isBetaFullVersion) || purchasedFeatures.contains(.fullVersion_macOS) {
return true return true
} }
#endif #endif
@ -182,7 +190,10 @@ public class ProductManager: NSObject {
public func verifyEligible(forFeature feature: Product) throws { public func verifyEligible(forFeature feature: Product) throws {
if isBeta { if isBeta {
guard cfg.isBetaFullVersion else { if cfg.isBetaFullVersion {
return
}
guard !cfg.locksBetaFeatures else {
throw ProductError.beta throw ProductError.beta
} }
} }
@ -193,7 +204,10 @@ public class ProductManager: NSObject {
public func verifyEligible(forProvider metadata: Infrastructure.Metadata) throws { public func verifyEligible(forProvider metadata: Infrastructure.Metadata) throws {
if isBeta { if isBeta {
guard cfg.isBetaFullVersion else { if cfg.isBetaFullVersion {
return
}
guard !cfg.locksBetaFeatures else {
throw ProductError.beta throw ProductError.beta
} }
} }
@ -204,7 +218,10 @@ public class ProductManager: NSObject {
public func verifyEligibleForTrustedNetworks() throws { public func verifyEligibleForTrustedNetworks() throws {
if isBeta { if isBeta {
guard cfg.isBetaFullVersion else { if cfg.isBetaFullVersion {
return
}
guard !cfg.locksBetaFeatures else {
throw ProductError.beta throw ProductError.beta
} }
} }
@ -304,6 +321,7 @@ extension ProductManager: SKRequestDelegate {
extension ProductManager { extension ProductManager {
public static let shared = ProductManager( public static let shared = ProductManager(
Configuration( Configuration(
locksBetaFeatures: AppConstants.InApp.locksBetaFeatures,
isBetaFullVersion: AppConstants.InApp.isBetaFullVersion, isBetaFullVersion: AppConstants.InApp.isBetaFullVersion,
lastFullVersionBuild: AppConstants.InApp.lastFullVersionBuild lastFullVersionBuild: AppConstants.InApp.lastFullVersionBuild
) )