mirror of
https://github.com/passepartoutvpn/passepartout-apple.git
synced 2024-12-24 18:32:36 +00:00
0a1886fe31
Let the AppCoordinator take care of the connection requirements via modals: - onInteractiveLogin() - now presented on AppError - onProviderEntityRequired() - onPurchaseRequired() - Any other connection error Subviews must not use tunnel.connect(), rather they route connection requests via the ConnectionFlow callbacks. In particular, migrate to the AppCoordinator the connection logic from: - TunnelToggleButton.perform() - ProviderEntitySelector.onSelect() onInteractiveLogin() and onPurchaseRequired() are now handled internally, while onProviderEntityRequired() is kept public because it's how subviews may present the entity selector. Extras: - Avoid modals overlap with a 500ms delay - Shrink interactive login size on macOS
53 lines
1.8 KiB
Swift
53 lines
1.8 KiB
Swift
//
|
|
// AppCoordinatorConforming+Extensions.swift
|
|
// Passepartout
|
|
//
|
|
// Created by Davide De Rosa on 12/1/24.
|
|
// Copyright (c) 2024 Davide De Rosa. All rights reserved.
|
|
//
|
|
// https://github.com/passepartoutvpn
|
|
//
|
|
// This file is part of Passepartout.
|
|
//
|
|
// Passepartout is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Passepartout is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
|
|
//
|
|
|
|
import CommonLibrary
|
|
import Foundation
|
|
import PassepartoutKit
|
|
|
|
extension AppCoordinatorConforming {
|
|
public func onConnect(_ profile: Profile, force: Bool) async {
|
|
do {
|
|
try iapManager.verify(profile)
|
|
try await tunnel.connect(with: profile, force: force)
|
|
} catch AppError.ineligibleProfile(let requiredFeatures) {
|
|
onPurchaseRequired(requiredFeatures)
|
|
} catch AppError.interactiveLogin {
|
|
onInteractiveLogin(profile) {
|
|
await onConnect($0, force: true)
|
|
}
|
|
} catch let ppError as PassepartoutError {
|
|
switch ppError.code {
|
|
case .missingProviderEntity:
|
|
onProviderEntityRequired(profile, force: force)
|
|
default:
|
|
onError(ppError, profile: profile)
|
|
}
|
|
} catch {
|
|
onError(error, profile: profile)
|
|
}
|
|
}
|
|
}
|