Merge pull request Adyen#12 from Adyen/adyen-print-module-name

refactored adyenPrinting to log the module name printing and small other refactoring

Author: mohammedDehairy

AdyenNetworking/APIClient/APIClient.swift

@@ -179,20 +179,20 @@ public final class APIClient: APIClientProtocol, AsyncAPIClientProtocol {
         adyenPrint("---- Request (/\(request.path)) ----")
 
         if let body = urlRequest.httpBody {
-            printAsJSON(body)
+            adyenPrintAsJSON(body)
         }
 
         adyenPrint("---- Request base url (/\(request.path)) ----")
         adyenPrint(apiContext.environment.baseURL)
 
         if let headers = urlRequest.allHTTPHeaderFields {
             adyenPrint("---- Request Headers (/\(request.path)) ----")
-            adyenPrint(headers)
+            adyenPrintAsJSON(headers)
         }
 
         if let queryParams = urlRequest.url?.queryParameters {
             adyenPrint("---- Request query (/\(request.path)) ----")
-            adyenPrint(queryParams)
+            adyenPrintAsJSON(queryParams)
         }
 
     }
@@ -202,10 +202,10 @@ public final class APIClient: APIClientProtocol, AsyncAPIClientProtocol {
         adyenPrint(result.statusCode)
 
         adyenPrint("---- Response Headers (/\(request.path)) ----")
-        adyenPrint(result.headers)
+        adyenPrintAsJSON(result.headers)
 
         adyenPrint("---- Response (/\(request.path)) ----")
-        printAsJSON(result.data)
+        adyenPrintAsJSON(result.data)
     }
 
     /// :nodoc:
@@ -232,18 +232,3 @@ public final class APIClient: APIClientProtocol, AsyncAPIClientProtocol {
     }
 
 }
-
-private func printAsJSON(_ data: Data) {
-    guard Logging.isEnabled else { return }
-    do {
-        let jsonObject = try JSONSerialization.jsonObject(with: data, options: [])
-        let jsonData = try JSONSerialization.data(withJSONObject: jsonObject, options: [.prettyPrinted])
-        guard let jsonString = String(data: jsonData, encoding: .utf8) else { return }
-
-        adyenPrint(jsonString)
-    } catch {
-        if let string = String(data: data, encoding: .utf8) {
-            adyenPrint(string)
-        }
-    }
-}

AdyenNetworking/Helpers/Logging.swift

@@ -5,15 +5,23 @@
 //
 
 import func Darwin.fputs
+import Foundation
 
 /// Provides control over SDK logging.
 public enum Logging {
     /// Indicates whether to enable printing to the console.
     public static var isEnabled: Bool = false
 }
 
-internal func adyenPrint(_ items: Any..., separator: String = " ", terminator: String = "\n") {
+@_spi(AdyenInternal)
+public func adyenPrint(_ items: Any..., separator: String = " ", terminator: String = "\n", fileId: String = #fileID) {
     guard Logging.isEnabled else { return }
+    let moduleName = fileId.split(separator: "/").first ?? "AdyenNetworking"
+    
+    var items = items
+    items.insert("[\(moduleName)]", at: 0)
+    items.insert(ISO8601DateFormatter().string(from: Date()), at: 0)
+    
     var idx = items.startIndex
     let endIdx = items.endIndex
 
@@ -22,3 +30,38 @@ internal func adyenPrint(_ items: Any..., separator: String = " ", terminator: S
         idx += 1
     } while idx < endIdx
 }
+
+@_spi(AdyenInternal)
+public func adyenPrintAsJSON(_ dictionary: [String: Any]) {
+    guard Logging.isEnabled else { return }
+    do {
+        let jsonData = try JSONSerialization.data(withJSONObject: dictionary, options: jsonOptions())
+        adyenPrintAsJSON(jsonData)
+    } catch {
+        adyenPrint(dictionary)
+    }
+}
+
+@_spi(AdyenInternal)
+public func adyenPrintAsJSON(_ data: Data) {
+    guard Logging.isEnabled else { return }
+    do {
+        let jsonObject = try JSONSerialization.jsonObject(with: data, options: [])
+        let jsonData = try JSONSerialization.data(withJSONObject: jsonObject, options: jsonOptions())
+        guard let jsonString = String(data: jsonData, encoding: .utf8) else { return }
+
+        adyenPrint(jsonString)
+    } catch {
+        if let string = String(data: data, encoding: .utf8) {
+            adyenPrint(string)
+        }
+    }
+}
+
+private func jsonOptions() -> JSONSerialization.WritingOptions {
+    if #available(iOS 13.0, *) {
+        return [.prettyPrinted, .withoutEscapingSlashes]
+    } else {
+        return [.prettyPrinted]
+    }
+}