summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrew Bulhak <andrew.bulhak@mullvad.net>2025-10-14 11:39:53 +0200
committerJon Petersson <jon.petersson@mullvad.net>2025-10-15 15:53:07 +0200
commit3722dc0097a80955581a2f1d3d479f6d93314e02 (patch)
treeac942a79f78625c2923a4ea441555352f1f8653e
parent2787639218615d89d83912b64589ec663963e29d (diff)
downloadmullvadvpn-3722dc0097a80955581a2f1d3d479f6d93314e02.tar.xz
mullvadvpn-3722dc0097a80955581a2f1d3d479f6d93314e02.zip
Remove access token logic from SetAccountOperation and TunnelManager
-rw-r--r--ios/MullvadVPN/AppDelegate.swift1
-rw-r--r--ios/MullvadVPN/TunnelManager/SetAccountOperation.swift6
-rw-r--r--ios/MullvadVPN/TunnelManager/TunnelManager.swift4
3 files changed, 0 insertions, 11 deletions
diff --git a/ios/MullvadVPN/AppDelegate.swift b/ios/MullvadVPN/AppDelegate.swift
index 58ae5fcb78..4871b07e5a 100644
--- a/ios/MullvadVPN/AppDelegate.swift
+++ b/ios/MullvadVPN/AppDelegate.swift
@@ -213,7 +213,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
accountsProxy: accountsProxy,
devicesProxy: devicesProxy,
apiProxy: apiProxy,
- accessTokenManager: proxyFactory.configuration.accessTokenManager,
relaySelector: relaySelector
)
}
diff --git a/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift b/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift
index c8f55b2b0a..897c87d0ee 100644
--- a/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift
+++ b/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift
@@ -42,7 +42,6 @@ class SetAccountOperation: ResultOperation<StoredAccountData?>, @unchecked Senda
private let accountsProxy: RESTAccountHandling
private let devicesProxy: DeviceHandling
private let action: SetAccountAction
- private let accessTokenManager: RESTAccessTokenManagement
private let logger = Logger(label: "SetAccountOperation")
private var tasks: [Cancellable] = []
@@ -52,13 +51,11 @@ class SetAccountOperation: ResultOperation<StoredAccountData?>, @unchecked Senda
interactor: TunnelInteractor,
accountsProxy: RESTAccountHandling,
devicesProxy: DeviceHandling,
- accessTokenManager: RESTAccessTokenManagement,
action: SetAccountAction
) {
self.interactor = interactor
self.accountsProxy = accountsProxy
self.devicesProxy = devicesProxy
- self.accessTokenManager = accessTokenManager
self.action = action
super.init(dispatchQueue: dispatchQueue)
@@ -70,7 +67,6 @@ class SetAccountOperation: ResultOperation<StoredAccountData?>, @unchecked Senda
switch action {
case .new:
startLogoutFlow { [self] in
- self.accessTokenManager.invalidateAllTokens()
startNewAccountFlow { [self] result in
finish(result: result.map { .some($0) })
}
@@ -78,7 +74,6 @@ class SetAccountOperation: ResultOperation<StoredAccountData?>, @unchecked Senda
case let .existing(accountNumber):
startLogoutFlow { [self] in
- self.accessTokenManager.invalidateAllTokens()
startExistingAccountFlow(accountNumber: accountNumber) { [self] result in
finish(result: result.map { .some($0) })
}
@@ -86,7 +81,6 @@ class SetAccountOperation: ResultOperation<StoredAccountData?>, @unchecked Senda
case .unset:
startLogoutFlow { [self] in
- self.accessTokenManager.invalidateAllTokens()
finish(result: .success(nil))
}
diff --git a/ios/MullvadVPN/TunnelManager/TunnelManager.swift b/ios/MullvadVPN/TunnelManager/TunnelManager.swift
index d70ec27da1..fde0ec5216 100644
--- a/ios/MullvadVPN/TunnelManager/TunnelManager.swift
+++ b/ios/MullvadVPN/TunnelManager/TunnelManager.swift
@@ -48,7 +48,6 @@ final class TunnelManager: StorePaymentObserver, @unchecked Sendable {
private let accountsProxy: RESTAccountHandling
private let devicesProxy: DeviceHandling
private let apiProxy: APIQuerying
- private let accessTokenManager: RESTAccessTokenManagement
private let logger = Logger(label: "TunnelManager")
private var nslock = NSRecursiveLock()
@@ -89,7 +88,6 @@ final class TunnelManager: StorePaymentObserver, @unchecked Sendable {
accountsProxy: RESTAccountHandling,
devicesProxy: DeviceHandling,
apiProxy: APIQuerying,
- accessTokenManager: RESTAccessTokenManagement,
relaySelector: RelaySelectorProtocol
) {
self.backgroundTaskProvider = backgroundTaskProvider
@@ -100,7 +98,6 @@ final class TunnelManager: StorePaymentObserver, @unchecked Sendable {
self.apiProxy = apiProxy
self.operationQueue.name = "TunnelManager.operationQueue"
self.operationQueue.underlyingQueue = internalQueue
- self.accessTokenManager = accessTokenManager
self.relaySelector = relaySelector
NotificationCenter.default.addObserver(
@@ -386,7 +383,6 @@ final class TunnelManager: StorePaymentObserver, @unchecked Sendable {
interactor: TunnelInteractorProxy(self),
accountsProxy: accountsProxy,
devicesProxy: devicesProxy,
- accessTokenManager: accessTokenManager,
action: action
)