fix: Remove confidential data from Sentry (#1384)

Infomaniak · Apr 12, 2024 · 68fa3fe · 68fa3fe
2 parents 6009ba2 + 345fb77
commit 68fa3fe
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/Mail/MailApp.swift b/Mail/MailApp.swift
@@ -26,7 +26,6 @@ import InfomaniakLogin
 import InfomaniakNotifications
 import MailCore
 import MailResources
-import Sentry
 import SwiftUI
 import UIKit
 

diff --git a/Mail/UserAccountScene.swift b/Mail/UserAccountScene.swift
@@ -26,7 +26,6 @@ import InfomaniakLogin
 import InfomaniakNotifications
 import MailCore
 import MailResources
-import Sentry
 import SwiftUI
 import UIKit
 import VersionChecker

diff --git a/MailCore/Cache/MailboxInfosManager.swift b/MailCore/Cache/MailboxInfosManager.swift
@@ -20,7 +20,6 @@ import Foundation
 import InfomaniakCore
 import Realm
 import RealmSwift
-import Sentry
 
 /// Conforming to `RealmAccessible` to get a standard `.getRealm` function
 extension MailboxInfosManager: RealmAccessible {}

diff --git a/MailCore/Cache/MailboxManager/MailboxManager+Thread.swift b/MailCore/Cache/MailboxManager/MailboxManager+Thread.swift
@@ -456,7 +456,7 @@ public extension MailboxManager {
                         scope.setContext(value: ["Message": ["uid": message.uid,
                                                              "messageId": message.messageId],
                                                  "Folder": ["id": message.folder?.remoteId,
-                                                            "name": message.folder?.name,
+                                                            "name": message.folder?.matomoName,
                                                             "cursor": message.folder?.cursor]],
                                          key: "Message context")
                     }

diff --git a/MailCore/Models/Thread.swift b/MailCore/Models/Thread.swift
@@ -19,7 +19,6 @@
 import Foundation
 import MailResources
 import RealmSwift
-import Sentry
 
 public struct ThreadResult: Decodable {
     public let threads: [Thread]?

diff --git a/MailCore/Utils/SentryDebug.swift b/MailCore/Utils/SentryDebug.swift
@@ -111,11 +111,10 @@ public enum SentryDebug {
             scope.setContext(value: ["threads": Array(threads).map {
                 [
                     "uid": "\($0.uid)",
-                    "subject": $0.subject ?? "No subject",
                     "messageIds": "\($0.messageIds.joined(separator: ","))",
                     "lastMessageFromFolder": $0.lastMessageFromFolder?.uid ?? "nil",
                     "messages": Array($0.messages)
-                        .map { ["message uid": $0.uid, "message subject": $0.subject ?? "No subject", "message date": $0.date] }
+                        .map { ["message uid": $0.uid, "message date": $0.date] }
                 ]
             }],
             key: "threads")
@@ -207,7 +206,7 @@ public enum SentryDebug {
                                                          "references": message.references ?? "nil"],
                                              "Seen": ["Expected": actualSeen, "Actual": liveMessage.seen],
                                              "Folder": ["id": message.folder?.remoteId ?? "nil",
-                                                        "name": message.folder?.name ?? "nil",
+                                                        "name": message.folder?.matomoName ?? "nil",
                                                         "last update": message.folder?.lastUpdate,
                                                         "cursor": message.folder?.cursor ?? "nil"]],
                                      key: "Message context")
@@ -237,23 +236,23 @@ public enum SentryDebug {
 
     static func addBackoffBreadcrumb(folder: Folder, index: Int) {
         let breadcrumb = Breadcrumb()
-        breadcrumb.message = "Backoff \(index) for folder \(folder.name) - \(folder.remoteId)"
+        breadcrumb.message = "Backoff \(index) for folder \(folder.matomoName) - \(folder.remoteId)"
         breadcrumb.level = .warning
         breadcrumb.type = "debug"
         SentrySDK.addBreadcrumb(breadcrumb)
     }
 
     static func addResetingFolderBreadcrumb(folder: Folder) {
         let breadcrumb = Breadcrumb()
-        breadcrumb.message = "Reseting folder after failed backoff \(folder.name) - \(folder.remoteId)"
+        breadcrumb.message = "Reseting folder after failed backoff \(folder.matomoName) - \(folder.remoteId)"
         breadcrumb.level = .warning
         breadcrumb.type = "debug"
         SentrySDK.addBreadcrumb(breadcrumb)
     }
 
     static func failedResetingAfterBackoff(folder: Folder) {
         SentrySDK.capture(message: "Failed reseting folder after backoff") { scope in
-            scope.setContext(value: ["Folder": ["Id": folder.id, "name": folder.name]],
+            scope.setContext(value: ["Folder": ["Id": folder.id, "name": folder.matomoName]],
                              key: "Folder context")
         }
     }