No longer base64 encode customMetadata

duckduckgo · Oct 15, 2024 · a28a854 · a28a854
1 parent 39a9251
commit a28a854
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/DuckDuckGo/Feedback/VPNMetadataCollector.swift b/DuckDuckGo/Feedback/VPNMetadataCollector.swift
@@ -93,6 +93,17 @@ struct VPNMetadata: Encodable {
 
         return String(data: encodedMetadata, encoding: .utf8)
     }
+
+    func toBase64() -> String {
+        let encoder = JSONEncoder()
+
+        do {
+            let encodedMetadata = try encoder.encode(self)
+            return encodedMetadata.base64EncodedString()
+        } catch {
+            return "Failed to encode metadata to JSON, error message: \(error.localizedDescription)"
+        }
+    }
 }
 
 protocol VPNMetadataCollector {

diff --git a/DuckDuckGo/Subscription/Feedback/UnifiedFeedbackSender.swift b/DuckDuckGo/Subscription/Feedback/UnifiedFeedbackSender.swift
@@ -122,7 +122,7 @@ struct DefaultFeedbackSender: UnifiedFeedbackSender {
                                                      category: Category.from(category),
                                                      subcategory: Subcategory.from(subcategory),
                                                      description: description,
-                                                     metadata: metadata?.toBase64() ?? ""),
+                                                     metadata: metadata?.toString() ?? ""),
                             frequency: .regular)
     }
 

diff --git a/DuckDuckGo/Subscription/Feedback/UnifiedMetadataCollector.swift b/DuckDuckGo/Subscription/Feedback/UnifiedMetadataCollector.swift
@@ -26,18 +26,17 @@ protocol UnifiedMetadataCollector {
 }
 
 protocol UnifiedFeedbackMetadata: Encodable {
-    func toBase64() -> String
+    func toString() -> String
 }
 
 extension UnifiedFeedbackMetadata {
-    func toBase64() -> String {
+    func toString() -> String {
         let encoder = JSONEncoder()
-
         do {
             let encodedMetadata = try encoder.encode(self)
-            return encodedMetadata.base64EncodedString()
+            return String(data: encodedMetadata, encoding: .utf8) ?? ""
         } catch {
-            return "Failed to encode metadata to JSON, error message: \(error.localizedDescription)"
+            return "Failed to encode metadata to JSON string, error message: \(error.localizedDescription)"
         }
     }
 }