Fix token not being redacted from error log (#1792)

mlemgroup · Feb 22, 2025 · 15a6f94 · 15a6f94
1 parent f66f328
commit 15a6f94
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Mlem/App/Globals/Definitions/ErrorsTracker.swift b/Mlem/App/Globals/Definitions/ErrorsTracker.swift
@@ -22,7 +22,7 @@ class ErrorsTracker {
         var ret = ""
 
         for details in errors {
-            ret += "\(details.when.formatted(.iso8601))\t\(details.title ?? "Error")\t\(details.errorText)\n"
+            ret += "\(details.when.formatted(.iso8601))\t\(details.title ?? "Error")\t\(details.errorText())\n"
         }
 
         return ret

diff --git a/Mlem/App/Models/ErrorDetails.swift b/Mlem/App/Models/ErrorDetails.swift
@@ -66,9 +66,9 @@ struct ErrorDetails: Hashable {
         lhs.hashValue == rhs.hashValue
     }
 
-    var errorText: String {
+    func errorText(includingLocation: Bool = true) -> String {
         var output = String(describing: error)
-        if let location {
+        if includingLocation, let location {
             output += " (\(location))"
         }
         for account in AccountsTracker.main.userAccounts {

diff --git a/Mlem/App/Views/Root/Tabs/Settings/ErrorLogView.swift b/Mlem/App/Views/Root/Tabs/Settings/ErrorLogView.swift
@@ -59,7 +59,7 @@ struct ErrorLogView: View {
                 Spacer()
 
                 Button {
-                    UIPasteboard.general.string = details.errorText
+                    UIPasteboard.general.string = details.errorText()
                     ToastModel.main.add(.success(String("Copied")))
                 } label: {
                     Text(Image(systemName: Icons.copy))
@@ -68,7 +68,7 @@ struct ErrorLogView: View {
                 }
             }
 
-            Text(String(describing: details.error))
+            Text(details.errorText(includingLocation: false))
 
             if let location = details.location {
                 HStack(alignment: .top, spacing: 2) {

diff --git a/Mlem/App/Views/Shared/ErrorView.swift b/Mlem/App/Views/Shared/ErrorView.swift
@@ -29,7 +29,7 @@ struct ErrorView: View {
     var body: some View {
         VStack(spacing: 15) {
             if showingFullError {
-                errorDetails(errorDetails.errorText)
+                errorDetails(errorDetails.errorText())
             } else {
                 if let systemImage = errorDetails.systemImage {
                     Image(systemName: systemImage)

diff --git a/Mlem/App/Views/Shared/Toast/ToastView.swift b/Mlem/App/Views/Shared/Toast/ToastView.swift
@@ -160,15 +160,15 @@ struct ToastView: View {
                 VStack(alignment: .leading, spacing: 0) {
                     if isExpanded {
                         ScrollView {
-                            Text(details.errorText)
+                            Text(details.errorText())
                                 .foregroundStyle(.red)
                                 .padding(8)
                                 .multilineTextAlignment(.leading)
                         }
                         .frame(maxWidth: .infinity)
 
                         Button("Copy", systemImage: Icons.copy) {
-                            UIPasteboard.general.string = details.errorText
+                            UIPasteboard.general.string = details.errorText()
                         }
                         .font(.caption)
                         .buttonStyle(.borderedProminent)