Correctly handle initial post-subscription behavior

hijohnnylin · hijohnnylin · commit 1e83da4548a9 · 2020-10-28T18:48:50.000-07:00
diff --git a/Client.swift b/Client.swift
@@ -22,6 +22,7 @@ let kApiCodeEmailAlreadyUsed = 40
 let kApiCodeReceiptAlreadyUsed = 48
 let kApiCodeInvalidAuth = 401
 let kApiCodeTooManyRequests = 999
+let kApiCodeSandboxReceiptNotAllowed = 9925
 let kApiCodeUnknownError = 99999
 let kApiCodeNegativeError = -1
 
@@ -99,9 +100,9 @@ class Client {
         }
     }
     
-    static func subscriptionEvent() throws -> Promise<SubscriptionEvent> {
+    static func subscriptionEvent(forceRefresh: Bool = false) throws -> Promise<SubscriptionEvent> {
         DDLogInfo("API CALL: subscription-event")
-        return getReceipt(forceRefresh: false)
+        return getReceipt(forceRefresh: forceRefresh)
             .then { receipt -> Promise<(data: Data, response: URLResponse)> in
                 let parameters:[String : Any] = [
                     "authtype": "ios",
diff --git a/Lockdown Tunnel/PacketTunnelProvider.swift b/Lockdown Tunnel/PacketTunnelProvider.swift
@@ -30,7 +30,7 @@ class LDObserverFactory: ObserverFactory {
                 for whitelistedDomain in whitelistedDomains {
                     if (session.host.hasSuffix("." + whitelistedDomain) || session.host == whitelistedDomain) {
                         #if DEBUG
-                        PacketTunnelProviderLogs.log("whitelisted \(session.host), not blocking")
+                        //PacketTunnelProviderLogs.log("whitelisted \(session.host), not blocking")
                         #endif
                         return
                     }
@@ -39,7 +39,7 @@ class LDObserverFactory: ObserverFactory {
                 if (getUserWantsFirewallEnabled()) {
                     updateMetrics(.incrementAndLog(host: session.host), rescheduleNotifications: .withEnergySaving)
                     #if DEBUG
-                    PacketTunnelProviderLogs.log("session host: \(session.host)")
+                    //PacketTunnelProviderLogs.log("session host: \(session.host)")
                     #endif
                     socket.forceDisconnect()
                     return
diff --git a/LockdowniOS/AccountVC.swift b/LockdowniOS/AccountVC.swift
@@ -252,6 +252,12 @@ final class AccountViewController: BaseViewController, Loadable {
                         upgradeButton.backgroundView?.backgroundColor = UIColor.tunnelsDarkBlue
                         upgradeButton.button.setTitleColor(UIColor.white, for: UIControl.State())
                         upgradeButton.button.setTitle(NSLocalizedString("View Upgrade Options", comment:""), for: UIControl.State())
+                    case kApiCodeSandboxReceiptNotAllowed:
+                        upgradeButton.button.isEnabled = true
+                        upgradeButton.selectionStyle = .default
+                        upgradeButton.backgroundView?.backgroundColor = UIColor.tunnelsDarkBlue
+                        upgradeButton.button.setTitleColor(UIColor.white, for: UIControl.State())
+                        upgradeButton.button.setTitle(NSLocalizedString("View Upgrade Options", comment:""), for: UIControl.State())
                     default:
                         DDLogError("Error loading plan: API error code - \(apiError.code)")
                         upgradeButton.button.isEnabled = true
@@ -313,6 +319,12 @@ final class AccountViewController: BaseViewController, Loadable {
                         upgradeButton.backgroundView?.backgroundColor = UIColor.tunnelsDarkBlue
                         upgradeButton.button.setTitleColor(UIColor.white, for: UIControl.State())
                         upgradeButton.button.setTitle(NSLocalizedString("View Upgrade Options", comment:""), for: UIControl.State())
+                    case kApiCodeSandboxReceiptNotAllowed:
+                        upgradeButton.button.isEnabled = true
+                        upgradeButton.selectionStyle = .default
+                        upgradeButton.backgroundView?.backgroundColor = UIColor.tunnelsDarkBlue
+                        upgradeButton.button.setTitleColor(UIColor.white, for: UIControl.State())
+                        upgradeButton.button.setTitle(NSLocalizedString("View Upgrade Options", comment:""), for: UIControl.State())
                     default:
                         DDLogError("Error loading plan: API error code - \(apiError.code)")
                         upgradeButton.button.isEnabled = true
diff --git a/LockdowniOS/SignupViewController.swift b/LockdowniOS/SignupViewController.swift
@@ -176,7 +176,63 @@ class SignupViewController: BaseViewController {
                         presentingViewController.reloadTable()
                     }
                     if self.enableVPNAfterSubscribe {
-                        VPNController.shared.setEnabled(true)
+                        // force refresh receipt, and sync with email if it exists, activate VPNte
+                        if let apiCredentials = getAPICredentials(), getAPICredentialsConfirmed() == true {
+                            DDLogInfo("purchase complete: syncing with confirmed email")
+                            firstly {
+                                try Client.signInWithEmail(email: apiCredentials.email, password: apiCredentials.password)
+                            }
+                            .then { (signin: SignIn) -> Promise<SubscriptionEvent> in
+                                DDLogInfo("purchase complete: signin result: \(signin)")
+                                return try Client.subscriptionEvent(forceRefresh: true)
+                            }
+                            .then { (result: SubscriptionEvent) -> Promise<GetKey> in
+                                DDLogInfo("purchase complete: subscriptionevent result: \(result)")
+                                return try Client.getKey()
+                            }
+                            .done { (getKey: GetKey) in
+                                try setVPNCredentials(id: getKey.id, keyBase64: getKey.b64)
+                                DDLogInfo("purchase complete: setting VPN creds with ID: \(getKey.id)")
+                                VPNController.shared.setEnabled(true)
+                            }
+                            .catch { error in
+                                DDLogError("purchase complete: Error: \(error)")
+                                if (self.popupErrorAsNSURLError("Error activating Secure Tunnel: \(error)")) {
+                                    return
+                                }
+                                else if let apiError = error as? ApiError {
+                                    switch apiError.code {
+                                    default:
+                                        _ = self.popupErrorAsApiError("API Error activating Secure Tunnel: \(error)")
+                                    }
+                                }
+                            }
+                        }
+                        else {
+                            firstly {
+                                try Client.signIn(forceRefresh: true) // this will fetch and set latest receipt, then submit to API to get cookie
+                            }
+                            .then { (signin: SignIn) -> Promise<GetKey> in
+                                // TODO: don't always do this -- if we already have a key, then only do it once per day max
+                                try Client.getKey()
+                            }
+                            .done { (getKey: GetKey) in
+                                try setVPNCredentials(id: getKey.id, keyBase64: getKey.b64)
+                                VPNController.shared.setEnabled(true)
+                            }
+                            .catch { error in
+                                DDLogError("purchase complete - no email: Error: \(error)")
+                                if (self.popupErrorAsNSURLError("Error activating Secure Tunnel: \(error)")) {
+                                    return
+                                }
+                                else if let apiError = error as? ApiError {
+                                    switch apiError.code {
+                                    default:
+                                        _ = self.popupErrorAsApiError("API Error activating Secure Tunnel: \(error)")
+                                    }
+                                }
+                            }
+                        }
                     }
                 })
             },
@@ -191,7 +247,7 @@ class SignupViewController: BaseViewController {
                     case .clientInvalid: errorText = NSLocalizedString("Not allowed to make the payment", comment: "")
                     case .paymentCancelled: errorText = NSLocalizedString("Payment was cancelled", comment: "")
                     case .paymentInvalid: errorText = NSLocalizedString("The purchase identifier was invalid", comment: "")
-                    case .paymentNotAllowed: errorText = NSLocalizedString("The device is not allowed to make the payment", comment: "")
+                    case .paymentNotAllowed: errorText = NSLocalizedString("Payment not allowed.\nEither this device is not allowed to make purchases, or In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again.", comment: "")
                     case .storeProductNotAvailable: errorText = NSLocalizedString("The product is not available in the current storefront", comment: "")
                     case .cloudServicePermissionDenied: errorText = NSLocalizedString("Access to cloud service information is not allowed", comment: "")
                     case .cloudServiceNetworkConnectionFailed: errorText = NSLocalizedString("Could not connect to the network", comment: "")
diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings
@@ -682,3 +682,9 @@
 
 /* No comment provided by engineer. */
 "Please that you have an active subscription. If you're attempting to share a subscription from the same account, you'll need to sign in with the same email address. Otherwise, please start your free trial or e-mail team@lockdownprivacy.com" = "Please that you have an active subscription. If you're attempting to share a subscription from the same account, you'll need to sign in with the same email address. Otherwise, please start your free trial or e-mail team@lockdownprivacy.com";
+
+/* No comment provided by engineer. */
+"In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again." = "In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again.";
+
+/* No comment provided by engineer. */
+"Payment not allowed.\nEither this device is not allowed to make purchases, or In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again." = "Payment not allowed.\nEither this device is not allowed to make purchases, or In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again.";
diff --git a/es.lproj/Localizable.strings b/es.lproj/Localizable.strings
@@ -688,3 +688,9 @@
 
 /* No comment provided by engineer. */
 "Please that you have an active subscription. If you're attempting to share a subscription from the same account, you'll need to sign in with the same email address. Otherwise, please start your free trial or e-mail team@lockdownprivacy.com" = "Please that you have an active subscription. If you're attempting to share a subscription from the same account, you'll need to sign in with the same email address. Otherwise, please start your free trial or e-mail team@lockdownprivacy.com";
+
+/* No comment provided by engineer. */
+"In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again." = "In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again.";
+
+/* No comment provided by engineer. */
+"Payment not allowed.\nEither this device is not allowed to make purchases, or In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again." = "Payment not allowed.\nEither this device is not allowed to make purchases, or In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again.";
diff --git a/fr.lproj/Localizable.strings b/fr.lproj/Localizable.strings
@@ -688,3 +688,9 @@
 
 /* No comment provided by engineer. */
 "Please that you have an active subscription. If you're attempting to share a subscription from the same account, you'll need to sign in with the same email address. Otherwise, please start your free trial or e-mail team@lockdownprivacy.com" = "Please that you have an active subscription. If you're attempting to share a subscription from the same account, you'll need to sign in with the same email address. Otherwise, please start your free trial or e-mail team@lockdownprivacy.com";
+
+/* No comment provided by engineer. */
+"In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again." = "In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again.";
+
+/* No comment provided by engineer. */
+"Payment not allowed.\nEither this device is not allowed to make purchases, or In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again." = "Payment not allowed.\nEither this device is not allowed to make purchases, or In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again.";
diff --git a/ja.lproj/Localizable.strings b/ja.lproj/Localizable.strings
@@ -688,3 +688,9 @@
 
 /* No comment provided by engineer. */
 "Please that you have an active subscription. If you're attempting to share a subscription from the same account, you'll need to sign in with the same email address. Otherwise, please start your free trial or e-mail team@lockdownprivacy.com" = "Please that you have an active subscription. If you're attempting to share a subscription from the same account, you'll need to sign in with the same email address. Otherwise, please start your free trial or e-mail team@lockdownprivacy.com";
+
+/* No comment provided by engineer. */
+"In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again." = "In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again.";
+
+/* No comment provided by engineer. */
+"Payment not allowed.\nEither this device is not allowed to make purchases, or In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again." = "Payment not allowed.\nEither this device is not allowed to make purchases, or In-App Purchases have been disabled. Please allow them in Settings App -> Screen Time -> Restrictions -> App Store -> In-app Purchases. Then try again.";
