Revert "Move VPNProtocolType serialization to Data layer" (#319)

Reverts #318 `Codable` compliance at the domain layer (`Profile` etc.) makes this change in serialization destructive.
passepartoutvpn · Jul 3, 2023 · e960943 · e960943
1 parent ddf3dc3
commit e960943
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 60 deletions.
diff --git a/PassepartoutLibrary/Sources/PassepartoutCore/Domain/VPNProtocolType.swift b/PassepartoutLibrary/Sources/PassepartoutCore/Domain/VPNProtocolType.swift
@@ -25,10 +25,11 @@
 
 import Foundation
 
-public enum VPNProtocolType: CaseIterable, Codable {
-    case openVPN
+// IMPORTANT: do NOT change these raw values, as they affect serialization
+public enum VPNProtocolType: String, CaseIterable, Codable {
+    case openVPN = "ovpn"
 
-    case wireGuard
+    case wireGuard = "wg"
 }
 
 public protocol VPNProtocolProviding {

diff --git a/PassepartoutLibrary/Sources/PassepartoutProviders/Extensions/Domain+Identifiable.swift b/PassepartoutLibrary/Sources/PassepartoutProviders/Extensions/Domain+Identifiable.swift
@@ -57,7 +57,7 @@ extension ProviderServer: Identifiable {
     }
 
     public static func id(withName providerName: ProviderName, vpnProtocol: VPNProtocolType, apiId: String) -> String? {
-        let idSource = [providerName, "\(vpnProtocol)", apiId].joined(separator: ":")
+        let idSource = [providerName, vpnProtocol.rawValue, apiId].joined(separator: ":")
         guard let data = idSource.data(using: .utf8) else {
             return nil
         }

diff --git a/...brary/Sources/PassepartoutProvidersImpl/Strategies/VPNProtocolType+RawRepresentable.swift b/...brary/Sources/PassepartoutProvidersImpl/Strategies/VPNProtocolType+RawRepresentable.swift