From 7bb9a5a13e643ece98a41c1484333197970bb0c9 Mon Sep 17 00:00:00 2001 From: Jimmy McDermott Date: Fri, 1 May 2020 09:49:18 -0500 Subject: [PATCH] naming --- Sources/Bugsnag/BugsnagPayload.swift | 13 +++++++++---- Sources/Bugsnag/PayloadTransformer.swift | 6 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Sources/Bugsnag/BugsnagPayload.swift b/Sources/Bugsnag/BugsnagPayload.swift index 124d159..328399e 100644 --- a/Sources/Bugsnag/BugsnagPayload.swift +++ b/Sources/Bugsnag/BugsnagPayload.swift @@ -39,16 +39,16 @@ public final class BugsnagPayload: Content { let app: App let severity: String let user: User - let metadata: Metadata + let metaData: Metadata let request: Request - init(payloadVersion: Int, exceptions: [Exception], app: App, severity: String, user: User, metadata: Metadata, request: Request) { + init(payloadVersion: Int, exceptions: [Exception], app: App, severity: String, user: User, metaData: Metadata, request: Request) { self.payloadVersion = payloadVersion self.exceptions = exceptions self.app = app self.severity = severity self.user = user - self.metadata = metadata + self.metaData = metaData self.request = request } @@ -118,12 +118,17 @@ public final class BugsnagPayload: Content { public final class Metadata: Content { let url: String - var request: RequestObject? + var requestBody: RequestObject? struct RequestObject: Content { let body: String } + enum CodingKeys: String, CodingKey { + case url + case requestBody = "Request Body" + } + init(url: String) { self.url = url } diff --git a/Sources/Bugsnag/PayloadTransformer.swift b/Sources/Bugsnag/PayloadTransformer.swift index 45c03a9..763fd9f 100644 --- a/Sources/Bugsnag/PayloadTransformer.swift +++ b/Sources/Bugsnag/PayloadTransformer.swift @@ -48,7 +48,7 @@ public struct PayloadTransformer: PayloadTransformerType { let metadata = BugsnagPayload.Event.Metadata(url: request?.url.string ?? "") if let requestBodyData = request?.body.data, let requestString = String(data: Data(requestBodyData.readableBytesView), encoding: .utf8) { - metadata.request = .init(body: requestString) + metadata.requestBody = .init(body: requestString.replacingOccurrences(of: "\"", with: "'")) } let exception = BugsnagPayload.Event.Exception(errorClass: message, message: message, stacktrace: [stacktrace]) @@ -59,7 +59,7 @@ public struct PayloadTransformer: PayloadTransformerType { if let req = request { for header in req.headers { // Don't send the authorization header - guard header.name.lowercased() != "Authorization" else { continue } + guard header.name.lowercased() != "authorization" else { continue } headersDict[header.name] = header.value } } @@ -74,7 +74,7 @@ public struct PayloadTransformer: PayloadTransformerType { app: app, severity: severity.rawValue, user: BugsnagPayload.Event.User(id: userId, name: userName, email: userEmail), - metadata: metadata, + metaData: metadata, request: requestContent) let notifier = BugsnagPayload.Notifier(name: "Bugsnag Vapor", version: "2.0.0", url: "https://github.com/gotranseo/bugsnag")