Merge pull request #419 from ivpn/feature/device-management

Add support for Device Management

IVPNClient/AppDelegate.swift

@@ -364,7 +364,7 @@ extension AppDelegate: UIApplicationDelegate {
         }
     }
 
-    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
+    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
         let endpoint = url.lastPathComponent
         handleURLEndpoint(endpoint)
         return true

IVPNClient/Enums/AddressType.swift

@@ -30,9 +30,9 @@ enum AddressType {
     case other
 
     static func validateIpAddress(_ address: String) -> AddressType {
-        if let _ = IPv4Address(address) {
+        if IPv4Address(address) != nil {
             return .IPv4
-        } else if let _ = IPv6Address(address) {
+        } else if IPv6Address(address) != nil {
             return .IPv6
         } else {
             return .other

IVPNClient/Enums/ApiResults/ErrorResultSessionNew.swift

@@ -30,6 +30,8 @@ struct SessionLimitData: Decodable {
     let upgradeToPlan: String
     let upgradeToUrl: String
     let paymentMethod: String
+    let deviceManagement: Bool
+    let deviceManagementUrl: String
 }
 
 struct ErrorResultSessionNew: Decodable {

IVPNClient/Enums/ApiResults/Session.swift

@@ -34,6 +34,7 @@ struct Session: Decodable {
     let token: String?
     let vpnUsername: String?
     let vpnPassword: String?
+    let deviceName: String?
     let serviceStatus: ServiceStatus
     let wireguard: WireGuardResult?
 }

IVPNClient/Enums/ApiResults/SessionStatus.swift

@@ -25,6 +25,7 @@ import Foundation
 
 struct SessionStatus: Decodable {
     let status: Int
+    let deviceName: String?
     let serviceStatus: ServiceStatus
 
     var serviceActive: Bool {

IVPNClient/Managers/KeyChain.swift

@@ -37,6 +37,7 @@ class KeyChain {
     private static let sessionTokenKey = "session_token"
     private static let vpnUsernameKey = "vpn_username"
     private static let vpnPasswordKey = "vpn_password"
+    private static let deviceNameKey = "deviceName"
 
     static let bundle: Keychain = {
         return Keychain(service: "net.ivpn.clients.ios", accessGroup: "WQXXM75BYN.net.ivpn.IVPN-Client").accessibility(.whenPasscodeSetThisDeviceOnly)
@@ -149,12 +150,22 @@ class KeyChain {
         sessionToken = session.token
         vpnUsername = session.vpnUsername
         vpnPassword = session.vpnPassword
+        deviceName = session.deviceName
 
         if let wireguardResult = session.wireguard, let ipAddress = wireguardResult.ipAddress {
             KeyChain.wgIpAddress = ipAddress
         }
     }
 
+    class var deviceName: String? {
+        get {
+            return KeyChain.bundle[deviceNameKey]
+        }
+        set {
+            KeyChain.bundle[deviceNameKey] = newValue
+        }
+    }
+
     static func clearAll() {
         username = nil
         tempUsername = nil
@@ -166,6 +177,7 @@ class KeyChain {
         sessionToken = nil
         vpnUsername = nil
         vpnPassword = nil
+        deviceName = nil
     }
 
 }

IVPNClient/Managers/NavigationManager.swift

@@ -35,11 +35,16 @@ class NavigationManager {
         return viewController
     }
 
-    static func getLoginViewController() -> UIViewController {
+    static func getLoginViewController(showLogoutAlert: Bool = false) -> UIViewController {
         let storyBoard = UIStoryboard(name: "Signup", bundle: nil)
-        let viewController = storyBoard.instantiateViewController(withIdentifier: "loginView")
+        let navController = storyBoard.instantiateViewController(withIdentifier: "loginView") as? UINavigationController
+        navController?.modalPresentationStyle = .formSheet
 
-        return viewController
+        if let viewController = navController?.topViewController as? LoginViewController {
+            viewController.showLogoutAlert = showLogoutAlert
+        }
+
+        return navController!
     }
 
     static func getChangePlanViewController() -> UIViewController {

IVPNClient/Managers/SessionManager.swift

@@ -27,7 +27,7 @@ import Foundation
     func createSessionStart()
     func createSessionSuccess()
     func createSessionFailure(error: Any?)
-    func createSessionTooManySessions(error: Any?)
+    func createSessionTooManySessions(error: Any?, isNewStyleAccount: Bool)
     func createSessionAuthenticationError()
     func createSessionServiceNotActive()
     func createSessionAccountNotActivated(error: Any?)
@@ -67,6 +67,7 @@ class SessionManager {
 
         var kem = KEM()
         let params = sessionNewParams(force: force, username: username, confirmation: confirmation, captcha: captcha, captchaId: captchaId, kem: kem)
+        let isNewStyleAccount = ServiceStatus.isNewStyleAccount(username: username ?? "")
         let request = ApiRequestDI(method: .post, endpoint: Config.apiSessionNew, params: params)
 
         ApiService.shared.requestCustomError(request) { (result: ResultCustomError<Session, ErrorResultSessionNew>) in
@@ -99,7 +100,7 @@ class SessionManager {
                         return
                     case 602:
                         log(.info, message: "Create session error: createSessionTooManySessions")
-                        self.delegate?.createSessionTooManySessions(error: error)
+                        self.delegate?.createSessionTooManySessions(error: error, isNewStyleAccount: isNewStyleAccount)
                         return
                     case 11005:
                         log(.info, message: "Create session error: createSessionAccountNotActivated")
@@ -141,6 +142,7 @@ class SessionManager {
             switch result {
             case .success(let model):
                 Application.shared.serviceStatus = model.serviceStatus
+                KeyChain.deviceName = model.deviceName
                 NotificationCenter.default.post(name: Notification.Name.EvaluatePlanUpdate, object: nil)
 
                 if model.serviceActive {

IVPNClient/Models/ServiceStatus.swift

@@ -35,6 +35,7 @@ struct ServiceStatus: Codable {
     let upgradeToUrl: String?
     let paymentMethod: String?
     let capabilities: [String]?
+    let deviceManagement: Bool
 
     // MARK: - Initialize -
 
@@ -48,6 +49,7 @@ struct ServiceStatus: Codable {
         upgradeToUrl = service?.upgradeToUrl ?? nil
         paymentMethod = service?.paymentMethod ?? nil
         capabilities = service?.capabilities ?? nil
+        deviceManagement = service?.deviceManagement ?? false
     }
 
     // MARK: - Methods -
@@ -89,7 +91,15 @@ struct ServiceStatus: Codable {
     }
 
     func isNewStyleAccount() -> Bool {
-        return paymentMethod == "prepaid"
+        guard let username = username else {
+            return true
+        }
+
+        return username.hasPrefix("i-")
+    }
+
+    static func isNewStyleAccount(username: String) -> Bool {
+        return username.hasPrefix("i-")
     }
 
     func daysUntilSubscriptionExpiration() -> Int {

IVPNClient/Models/V2Ray/V2RayConfig.swift

@@ -112,7 +112,7 @@ struct V2RayConfig: Codable {
                             let connection: [String]
                             let pragma: String
 
-                            enum CodingKeys : String, CodingKey {
+                            enum CodingKeys: String, CodingKey {
                                 case host = "Host"
                                 case userAgent = "User-Agent"
                                 case acceptEncoding = "Accept-Encoding"

IVPNClient/Models/V2Ray/V2RayCore.swift

@@ -36,7 +36,7 @@ class V2RayCore {
 
     func start() -> Error? {
         let _ = close()
-        var error: Error? = nil
+        var error: Error?
 
         guard let config = makeConfig() else {
             return NSError(domain: "", code: 99, userInfo: [NSLocalizedDescriptionKey: "V2Ray configuration cannot be loaded"])
@@ -52,7 +52,7 @@ class V2RayCore {
     }
 
     func close() -> Error? {
-        var error: Error? = nil
+        var error: Error?
 
         if let instance = instance {
             var stopError: NSError?

IVPNClient/Scenes/AccountScreen/AccountViewController.swift

@@ -53,9 +53,7 @@ class AccountViewController: UITableViewController {
     }
 
     @IBAction func deleteAccount(_ sender: UIButton) {
-        if let url = URL(string: "https://www.ivpn.net/account/settings") {
-            UIApplication.shared.open(url, options: [:], completionHandler: nil)
-        }
+        openWebPageInBrowser("https://www.ivpn.net/account/settings")
     }
 
     @IBAction func addMoreTime(_ sender: Any) {
@@ -92,12 +90,14 @@ class AccountViewController: UITableViewController {
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         accountView.initQRCode(viewModel: viewModel)
+        sessionManager.getSessionStatus()
     }
 
     // MARK: - Observers -
 
     func addObservers() {
         NotificationCenter.default.addObserver(self, selector: #selector(subscriptionActivated), name: Notification.Name.SubscriptionActivated, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(subscriptionActivated), name: Notification.Name.ServiceAuthorized, object: nil)
     }
 
     // MARK: - Private methods -
@@ -180,7 +180,7 @@ extension AccountViewController {
             logOut(deleteSession: false, deleteSettings: deleteSettings)
             navigationController?.dismiss(animated: true)
         } else {
-            showActionAlert(title: "Error with removing session", message: "Unable to contact server to log out. Please check Internet connectivity. Do you want to force log out? This device will continue to count towards your device limit.", action: "Force log out", cancelHandler: { _ in
+            showActionAlert(title: "Unable to contact server to log out", message: "Please check Internet connectivity. Do you want to force log out? This device will continue to count towards your device limit.", action: "Force log out", cancelHandler: { _ in
                 NotificationCenter.default.post(name: Notification.Name.UpdateGeoLocation, object: nil)
             }, actionHandler: { [self] _ in
                 forceLogOut = true
@@ -196,6 +196,15 @@ extension AccountViewController {
         }
     }
 
+    override func sessionStatusSuccess() {
+        subscriptionActivated()
+    }
+
+    override func sessionStatusNotFound() {
+        logOut(deleteSession: false)
+        present(NavigationManager.getLoginViewController(showLogoutAlert: true), animated: true)
+    }
+
 }
 
 // MARK: - JGProgressHUDDelegate -

IVPNClient/Scenes/AccountScreen/View/AccountView.swift

@@ -34,6 +34,9 @@ class AccountView: UITableView {
     @IBOutlet weak var activeUntilLabel: UILabel!
     @IBOutlet weak var logOutActionButton: UIButton!
     @IBOutlet weak var activeUntilCell: UITableViewCell!
+    @IBOutlet weak var deviceNameTitle: UILabel!
+    @IBOutlet weak var deviceName: UILabel!
+    @IBOutlet weak var header: UIView!
 
     // MARK: - Properties -
 
@@ -48,6 +51,13 @@ class AccountView: UITableView {
         subscriptionLabel.text = viewModel.subscriptionText
         activeUntilLabel.text = viewModel.activeUntilText
         activeUntilCell.isHidden = Application.shared.serviceStatus.isLegacyAccount()
+        deviceName.text = viewModel.deviceName
+        deviceNameTitle.isHidden = !viewModel.showDeviceName
+        deviceName.isHidden = !viewModel.showDeviceName
+        let headerHeight = viewModel.showDeviceName ? 270 : 210
+        header.frame = CGRect(x: 0, y: 0, width: Int(header.frame.width), height: headerHeight)
+        reloadData()
+        layoutIfNeeded()
     }
 
     func initQRCode(viewModel: AccountViewModel) {