Fix crash when using AnyEncodable payload for alert and background no…

…tifications (#200) fix: encoder issue
swift-server-community · Jul 4, 2024 · c5b6aaf · c5b6aaf
1 parent c84a4c7
commit c5b6aaf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Sources/APNSCore/Alert/APNSAlertNotification.swift b/Sources/APNSCore/Alert/APNSAlertNotification.swift
@@ -212,11 +212,10 @@ public struct APNSAlertNotification<Payload: Encodable & Sendable>: APNSMessage,
     }
 
     public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-
         // First we encode the user payload since this might use the `aps` key
         // and we override it afterward.
         try self.payload.encode(to: encoder)
+        var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(self.aps, forKey: .aps)
     }
 }

diff --git a/Sources/APNSCore/Background/APNSBackgroundNotification.swift b/Sources/APNSCore/Background/APNSBackgroundNotification.swift
@@ -86,11 +86,10 @@ public struct APNSBackgroundNotification<Payload: Encodable & Sendable>: APNSMes
 
     @inlinable
     public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-
         // First we encode the user payload since this might use the `aps` key
         // and we override it afterward.
         try self.payload.encode(to: encoder)
+        var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(self.aps, forKey: .aps)
     }
 }