averello/lockdown-iOS-mirror
1
0
Fork 0
mirror of https://github.com/confirmedcode/Lockdown-iOS.git synced 2025-12-21 12:14:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always enable VPN after successful subscription

Browse Source
This commit is contained in:
Johnny Lin
2020-10-28 19:24:27 -07:00
parent 1e83da4548
commit 5597e760a5
3 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LockdowniOS/AccountVC.swift
View File

@@ -485,10 +485,8 @@ final class AccountViewController: BaseViewController, Loadable {
vc.parentVC = self
if activePlans.isEmpty {
vc.mode = .newSubscription
vc.enableVPNAfterSubscribe = true
} else {
vc.mode = .upgrade(active: activePlans)
vc.enableVPNAfterSubscribe = true
}
}
default:

2
LockdowniOS/HomeViewController.swift
View File

@@ -747,10 +747,8 @@ class HomeViewController: BaseViewController, AwesomeSpotlightViewDelegate, Load
if let vc = segue.destination as? SignupViewController {
if activePlans.isEmpty {
vc.mode = .newSubscription
vc.enableVPNAfterSubscribe = true
} else {
vc.mode = .upgrade(active: activePlans)
vc.enableVPNAfterSubscribe = true
}
}
default:

99
LockdowniOS/SignupViewController.swift
View File

@@ -23,7 +23,6 @@ class SignupViewController: BaseViewController {
case upgrade(active: [Subscription.PlanType])
}
var enableVPNAfterSubscribe = true
var mode = Mode.newSubscription
@IBOutlet var monthlyPlanContainer: UIView!
@@ -175,61 +174,59 @@ class SignupViewController: BaseViewController {
if let presentingViewController = self.parentVC as? AccountViewController {
presentingViewController.reloadTable()
}
if self.enableVPNAfterSubscribe {
// 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)
// 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
}
.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 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
}
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
}
.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)")
}
else if let apiError = error as? ApiError {
switch apiError.code {
default:
_ = self.popupErrorAsApiError("API Error activating Secure Tunnel: \(error)")
}
}
}