passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow interactive credentials with providers (#796) 

Fixes #795
This commit is contained in:
Davide 2024-11-01 20:01:18 +01:00 committed by GitHub
parent 590b2790fa
commit ca18aadddf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -12,7 +12,7 @@
{
"identity" : "generic-json-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/zoul/generic-json-swift",
"location" : "https://github.com/iwill/generic-json-swift",
"state" : {
"revision" : "0a06575f4038b504e78ac330913d920f1630f510",
"version" : "2.0.2"
@ -41,7 +41,7 @@
"kind" : "remoteSourceControl",
"location" : "git@github.com:passepartoutvpn/passepartoutkit-source",
"state" : {
"revision" : "8b4c47f716120fab3f219593cf4ae0e6e2c86677"
"revision" : "e95c7b54dc11e744d9b40a722fccf752436ac0ef"
}
},
{

2
Passepartout/Library/Package.swift
View File

@ -36,7 +36,7 @@ let package = Package(
],
dependencies: [
// .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.9.0"),
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "8b4c47f716120fab3f219593cf4ae0e6e2c86677"),
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "e95c7b54dc11e744d9b40a722fccf752436ac0ef"),
// .package(path: "../../../passepartoutkit-source"),
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", from: "0.9.1"),
// .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", revision: "031863a1cd683962a7dfe68e20b91fa820a1ecce"),

3
Passepartout/Library/Sources/AppUI/L10n/AppError+L10n.swift
View File

@ -74,6 +74,9 @@ extension PassepartoutError: LocalizedError {
.compactMap { $0 }
.joined(separator: " ")
case .noActiveModules:
return Strings.Errors.App.Passepartout.noActiveModules
case .parsing:
let message = userInfo as? String ?? reason?.localizedDescription

2
Passepartout/Library/Sources/AppUI/L10n/SwiftGen+Strings.swift
View File

@ -137,6 +137,8 @@ public enum Strings {
public static let invalidFields = Strings.tr("Localizable", "errors.app.passepartout.invalid_fields", fallback: "Invalid fields.")
/// No provider server selected.
public static let missingProviderEntity = Strings.tr("Localizable", "errors.app.passepartout.missing_provider_entity", fallback: "No provider server selected.")
/// The profile has no active modules.
public static let noActiveModules = Strings.tr("Localizable", "errors.app.passepartout.no_active_modules", fallback: "The profile has no active modules.")
/// Unable to parse file.
public static let parsing = Strings.tr("Localizable", "errors.app.passepartout.parsing", fallback: "Unable to parse file.")
/// No provider selected.

1
Passepartout/Library/Sources/AppUI/Resources/en.lproj/Localizable.strings
View File

@ -273,6 +273,7 @@
"errors.app.passepartout.incompatible_modules" = "Some active modules are incompatible, try to only activate one of them.";
"errors.app.passepartout.invalid_fields" = "Invalid fields.";
"errors.app.passepartout.missing_provider_entity" = "No provider server selected.";
"errors.app.passepartout.no_active_modules" = "The profile has no active modules.";
"errors.app.passepartout.parsing" = "Unable to parse file.";
"errors.app.passepartout.provider_required" = "No provider selected.";
"errors.app.passepartout.default" = "Unable to complete operation (code=%@).";

6
Passepartout/Library/Tests/AppUITests/ExtendedTunnelTests.swift
View File

@ -39,7 +39,8 @@ extension ExtendedTunnelTests {
let sut = ExtendedTunnel(tunnel: tunnel, environment: env, interval: 0.1)
sut.observeObjects()
let profile = try Profile.Builder().tryBuild()
let module = try DNSModule.Builder().tryBuild()
let profile = try Profile.Builder(modules: [module], activatingModules: true).tryBuild()
try await tunnel.install(profile, connect: true, title: \.name)
env.setEnvironmentValue(.crypto, forKey: TunnelEnvironmentKeys.lastErrorCode)
@ -54,7 +55,8 @@ extension ExtendedTunnelTests {
let sut = ExtendedTunnel(tunnel: tunnel, environment: env, interval: 0.1)
sut.observeObjects()
let profile = try Profile.Builder().tryBuild()
let module = try DNSModule.Builder().tryBuild()
let profile = try Profile.Builder(modules: [module], activatingModules: true).tryBuild()
try await tunnel.install(profile, connect: false, title: \.name)
let dataCount = DataCount(500, 700)