feat: improve account recovery integration

Jira-Id: CP-7340

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "external/protoncore"]
  path = external/protoncore
  url = ../../shared/protoncore
- tag = 18.0.1
+ tag = 19.0.0
 [submodule "tunnelkit"]
  path = external/tunnelkit
  url = ../tunnelkit

apps/ios/ProtonVPN/AppDelegate.swift

@@ -385,7 +385,8 @@ extension AppDelegate {
  }
  ObservabilityEnv.current.setupWorld(requestPerformer: apiService)
 
- if FeatureFlagsRepository.shared.isEnabled(CoreFeatureFlagType.accountRecovery) {
+ // For now, the Push Notification part of Account Recovery is not ready, so we won't even be registering
+ if false && FeatureFlagsRepository.shared.isEnabled(CoreFeatureFlagType.accountRecovery) {
  pushNotificationService.setup()
 
  let vpnHandler = AccountRecoveryHandler()

apps/ios/ProtonVPN/Scenes/Common/Services/AppSessionManager.swift

@@ -273,6 +273,7 @@ class AppSessionManagerImplementation: AppSessionRefresherImplementation, AppSes
  propertiesManager.userRole = properties.userRole
  propertiesManager.userAccountCreationDate = properties.userCreateTime
  propertiesManager.userLocation = properties.location
+ propertiesManager.userAccountRecovery = properties.userAccountRecovery
  if let clientConfig = properties.clientConfig {
  propertiesManager.openVpnConfig = clientConfig.openVPNConfig
  propertiesManager.wireguardConfig = clientConfig.wireGuardConfig

apps/ios/ProtonVPN/Scenes/Common/Services/NavigationService.swift

@@ -381,7 +381,9 @@ extension NavigationService: SettingsService {
  }
 
  func makeAccountRecoveryViewController() -> AccountRecoveryViewController {
- AccountRecoveryModule.settingsViewController(networking.apiService)
+ AccountRecoveryModule.settingsViewController(networking.apiService) { [weak self] accountRecovery in
+ self?.propertiesManager.userAccountRecovery = accountRecovery
+ }
  }
 }
 
@@ -427,7 +429,7 @@ extension NavigationService: ConnectionStatusService {
 // MARK: Account Recovery
 extension NavigationService {
  func presentAccountRecoveryViewController() {
- guard FeatureFlagsRepository.shared.isEnabled(CoreFeatureFlagType.accountRecovery) else { return }
+ guard FeatureFlagsRepository.shared.isEnabled(AccountRecoveryModule.feature) else { return }
 
  let viewController = makeAccountRecoveryViewController()
  self.windowService.addToStack(viewController, checkForDuplicates: true)

apps/ios/ProtonVPN/Scenes/Settings/ViewModels/SettingsViewModel.swift

@@ -25,6 +25,7 @@ import UIKit
 import Dependencies
 
 import ProtonCoreAccountRecovery
+import ProtonCoreDataModel
 import ProtonCoreFeatureFlags
 import ProtonCoreUIFoundations
 
@@ -96,15 +97,14 @@ final class SettingsViewModel {
  self.protocolService = protocolService
  self.vpnGateway = vpnGateway
 
- isAccountRecoveryEnabled = FeatureFlagsRepository.shared.isEnabled(CoreFeatureFlagType.accountRecovery)
+ isAccountRecoveryEnabled = FeatureFlagsRepository.shared.isEnabled(AccountRecoveryModule.feature)
 
  if appSessionManager.sessionStatus == .established {
  sessionEstablished(vpnGateway: vpnGateway)
  }
 
  if isAccountRecoveryEnabled {
  self.accountRecoveryRepository = AccountRecoveryRepository(apiService: factory.makeNetworking().apiService)
- refreshAccountRecoveryState()
  }
  startObserving()
  }
@@ -141,9 +141,15 @@ final class SettingsViewModel {
  return vpnGateway.connection == .connected || vpnGateway.connection == .disconnected
  }
 
- var shouldShowAccountRecovery: Bool = false
- var accountRecoveryStateText: String = ""
- var accountRecoveryImage: UIImage?
+ var shouldShowAccountRecovery: Bool {
+ accountRecoveryStatus?.isVisibleInSettings ?? false
+ }
+ var accountRecoveryStateText: String {
+ accountRecoveryStatus?.valueForSettingsItem ?? ""
+ }
+ var accountRecoveryImage: UIImage? {
+ accountRecoveryStatus?.imageForSettingsItem
+ }
 
  // MARK: - Header section
  func viewForFooter() -> UIView {
@@ -219,9 +225,6 @@ final class SettingsViewModel {
  }
 
  private var accountSection: TableViewSection {
- if isAccountRecoveryEnabled {
- refreshAccountRecoveryState()
- }
 
  let username: String = authKeychain.username ?? Localizable.unavailable
  let accountPlanName: String
@@ -250,7 +253,12 @@ final class SettingsViewModel {
  return TableViewSection(title: Localizable.account, cells: [cell])
  }
  }
-
+
+ private var accountRecoveryStatus: AccountRecovery? {
+ propertiesManager.userAccountRecovery
+
+ }
+
  private var securitySection: TableViewSection {
  let vpnProtocol = propertiesManager.vpnProtocol
 
@@ -663,22 +671,10 @@ final class SettingsViewModel {
  private func pushAccountRecoveryViewController() {
  assert(isAccountRecoveryEnabled, "This function shall only be called when AccountRecovery flag is true.")
  guard let pushHandler = pushHandler else { return }
- let accountRecoveryViewController = AccountRecoveryModule.settingsViewController(networking.apiService)
+ let accountRecoveryViewController = settingsService.makeAccountRecoveryViewController() 
  pushHandler(accountRecoveryViewController)
  }
 
- private func refreshAccountRecoveryState() {
- assert(isAccountRecoveryEnabled, "This function shall only be called when AccountRecovery flag is true.")
- Task {
-
- guard let accountRecoveryRepository = accountRecoveryRepository, let status = await accountRecoveryRepository.accountRecoveryStatus() 
- else { return }
- shouldShowAccountRecovery = status.shouldShowSettingsItem
- accountRecoveryStateText = status.valueForSettingsItem
- accountRecoveryImage = status.imageForSettingsItem
- }
- }
-
  private func pushProtocolViewController() {
  let vpnProtocolViewModel = VpnProtocolViewModel(connectionProtocol: propertiesManager.connectionProtocol,
  smartProtocolConfig: propertiesManager.smartProtocolConfig,

libraries/LegacyCommon/Sources/LegacyCommon/API/Services/Utils/VpnProperties.swift

@@ -31,14 +31,16 @@ public struct VpnProperties {
  public let clientConfig: ClientConfig?
  public let userRole: UserRole
  public let userCreateTime: Date?
+ public let userAccountRecovery: AccountRecovery?
 
  public init(serverModels: [ServerModel], vpnCredentials: VpnCredentials, location: UserLocation?, clientConfig: ClientConfig?, user: User?) {
  self.serverModels = serverModels
  self.vpnCredentials = vpnCredentials
  self.location = location
  self.clientConfig = clientConfig
  self.userRole = .init(rawValue: user?.role ?? 0) ?? .noOrganization
-
+ self.userAccountRecovery = user?.accountRecovery
+
  if let createTime = user?.createTime {
  self.userCreateTime = Date(timeIntervalSince1970: createTime)
  } else {

libraries/LegacyCommon/Sources/LegacyCommon/Management/Storage/PropertiesManager.swift

@@ -84,6 +84,7 @@ public protocol PropertiesManagerProtocol: AnyObject {
  var userDataDisclaimerAgreed: Bool { get set }
  var userRole: UserRole { get set }
  var userAccountCreationDate: Date? { get set }
+ var userAccountRecovery: AccountRecovery? { get set }
 
  var trialWelcomed: Bool { get set }
  var warnedTrialExpiring: Bool { get set }
@@ -247,6 +248,8 @@ public class PropertiesManager: PropertiesManagerProtocol {
 
  public var onAlternativeRoutingChange: ((Bool) -> Void)?
 
+ public var userAccountRecovery: ProtonCoreDataModel.AccountRecovery?
+
  public var blockOneTimeAnnouncement: Bool {
  defaults.bool(forKey: Keys.blockOneTimeAnnouncement.rawValue)
  }

libraries/LegacyCommon/Sources/LegacyCommon/Mocks/PropertiesManagerMock.swift

@@ -169,6 +169,7 @@ public class PropertiesManagerMock: PropertiesManagerProtocol {
  set { queue.sync { _partnerTypes = newValue } }
  }
 
+ public var userAccountRecovery: ProtonCoreDataModel.AccountRecovery?
  public var userRole: UserRole = .noOrganization
  public var excludeLocalNetworks: Bool = true {
  didSet {