Merge pull request #324 from openziti/fix-can-enroll-keys

smilindave26 · web-flow · commit d5157e5d7fc4 · 2026-04-15T12:07:53.000-04:00
Handle canCertEnroll/canTokenEnroll keys when decoding old .zid
diff --git a/lib/ZitiTunnelEvent.swift b/lib/ZitiTunnelEvent.swift
@@ -275,6 +275,14 @@ import CZitiPrivate
         self.canCertEnroll = provider_c.pointee.can_cert_enroll
         self.canTokenEnroll = provider_c.pointee.can_token_enroll
     }
+
+    public required init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        name = try container.decode(String.self, forKey: .name)
+        issuer = try container.decode(String.self, forKey: .issuer)
+        canCertEnroll = try container.decodeIfPresent(Bool.self, forKey: .canCertEnroll) ?? false
+        canTokenEnroll = try container.decodeIfPresent(Bool.self, forKey: .canTokenEnroll) ?? false
+    }
 }
 
 /// Class encapsulating Ziti Tunnel SDK C External JWT Event

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,14 @@ import CZitiPrivate`
`275`	`275`	`self.canCertEnroll = provider_c.pointee.can_cert_enroll`
`276`	`276`	`self.canTokenEnroll = provider_c.pointee.can_token_enroll`
`277`	`277`	`}`
	`278`	`+`
	`279`	`+ public required init(from decoder: Decoder) throws {`
	`280`	`+ let container = try decoder.container(keyedBy: CodingKeys.self)`
	`281`	`+ name = try container.decode(String.self, forKey: .name)`
	`282`	`+ issuer = try container.decode(String.self, forKey: .issuer)`
	`283`	`+ canCertEnroll = try container.decodeIfPresent(Bool.self, forKey: .canCertEnroll) ?? false`
	`284`	`+ canTokenEnroll = try container.decodeIfPresent(Bool.self, forKey: .canTokenEnroll) ?? false`
	`285`	`+ }`
`278`	`286`	`}`
`279`	`287`
`280`	`288`	`/// Class encapsulating Ziti Tunnel SDK C External JWT Event`