fix: pass env param to log functions (#31)

paypal · Mar 19, 2024 · 610d9e3 · 610d9e3
1 parent 83557df
commit 610d9e3
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/Sources/PayPalMessages/IO/MerchantProfileProvider.swift b/Sources/PayPalMessages/IO/MerchantProfileProvider.swift
@@ -69,12 +69,12 @@ class MerchantProfileProvider: MerchantProfileHashGetable {
         ) { [weak self] result in
             switch result {
             case .success(let merchantProfileData):
-                log(.debug, "Merchant Request Hash succeeded with \(merchantProfileData.hash)")
+                log(.debug, "Merchant Request Hash succeeded with \(merchantProfileData.hash)", for: environment)
                 self?.setCachedMerchantProfileData(merchantProfileData, clientID: clientID, merchantID: merchantID)
                 onCompletion(merchantProfileData)
 
             case .failure(let error):
-                log(.debug, "Merchant Request Hash failed with \(error.localizedDescription)")
+                log(.debug, "Merchant Request Hash failed with \(error.localizedDescription)", for: environment)
                 onCompletion(nil)
             }
         }

diff --git a/Sources/PayPalMessages/IO/MerchantProfileRequest.swift b/Sources/PayPalMessages/IO/MerchantProfileRequest.swift
@@ -36,7 +36,7 @@ class MerchantProfileRequest: MerchantProfileRequestable {
             return
         }
 
-        log(.debug, "fetcheMerchantProfile URL is \(url)")
+        log(.debug, "fetcheMerchantProfile URL is \(url)", for: environment)
 
         fetch(url, headers: headers, session: environment.urlSession) { data, _, error in
             guard let data = data, error == nil else {

diff --git a/Sources/PayPalMessages/IO/MessageRequest.swift b/Sources/PayPalMessages/IO/MessageRequest.swift
@@ -73,7 +73,7 @@ class MessageRequest: MessageRequestable {
         }
         let startingTimestamp = Date()
 
-        log(.debug, "fetchMessage URL is \(url)")
+        log(.debug, "fetchMessage URL is \(url)", for: parameters.environment)
 
         fetch(url, headers: headers, session: parameters.environment.urlSession) { data, response, _ in
             let requestDuration = startingTimestamp.timeIntervalSinceNow

diff --git a/Sources/PayPalMessages/PayPalMessageModal.swift b/Sources/PayPalMessages/PayPalMessageModal.swift
@@ -310,12 +310,12 @@ final class PayPalMessageModal: UIViewController, WKUIDelegate {
         }
 
         guard let presentingViewController = UIViewController.getPresentingViewController() else {
-            log(.error, "Unable to retrieve presenting view controller")
+            log(.error, "Unable to retrieve presenting view controller", for: environment)
             return
         }
 
         if presentingViewController == self {
-            log(.warn, "Modal is already presenting")
+            log(.warn, "Modal is already presenting", for: environment)
             return
         }
 

diff --git a/Sources/PayPalMessages/PayPalMessageModalViewModel.swift b/Sources/PayPalMessages/PayPalMessageModalViewModel.swift
@@ -177,7 +177,7 @@ class PayPalMessageModalViewModel: NSObject, WKNavigationDelegate, WKScriptMessa
 
         loadCompletionHandler = completionHandler
 
-        log(.debug, "Load modal webview URL: \(safeUrl)")
+        log(.debug, "Load modal webview URL: \(safeUrl)", for: environment)
 
         webView.load(URLRequest(url: safeUrl))
     }
@@ -207,7 +207,7 @@ class PayPalMessageModalViewModel: NSObject, WKNavigationDelegate, WKScriptMessa
         guard let jsonData = try? JSONEncoder().encode(self.makeConfig()),
               let jsonString = String(data: jsonData, encoding: .utf8) else { return }
 
-        log(.debug, "Update props: \(jsonString)")
+        log(.debug, "Update props: \(jsonString)", for: environment)
 
         self.webView.evaluateJavaScript(
             "window.actions.updateProps(\(jsonString))"
@@ -227,11 +227,11 @@ class PayPalMessageModalViewModel: NSObject, WKNavigationDelegate, WKScriptMessa
               let json = try? JSONSerialization.jsonObject(with: bodyData) as? [String: Any],
               let eventName = json["name"] as? String,
               var eventArgs = json["args"] as? [[String: Any]] else {
-            log(.error, "Unable to parse modal event body")
+            log(.error, "Unable to parse modal event body", for: environment)
             return
         }
 
-        log(.debug, "Modal event: [\(eventName)] \(eventArgs)")
+        log(.debug, "Modal event: [\(eventName)] \(eventArgs)", for: environment)
 
         guard !eventArgs.isEmpty else { return }
 

diff --git a/Sources/PayPalMessages/PayPalMessageViewModel.swift b/Sources/PayPalMessages/PayPalMessageViewModel.swift
@@ -286,7 +286,7 @@ class PayPalMessageViewModel: PayPalMessageModalEventDelegate {
             modal.setConfig(makeModalConfig())
         }
 
-        log(.debug, "onMessageRequestReceived is \(String(describing: response.defaultMainContent))")
+        log(.debug, "onMessageRequestReceived is \(String(describing: response.defaultMainContent))", for: environment)
     }
 
     // MARK: - Message Request Builder

diff --git a/Sources/PayPalMessages/Utils/Log.swift b/Sources/PayPalMessages/Utils/Log.swift
@@ -7,7 +7,7 @@ enum LogLevel: Int {
     case error
 }
 
-func log(_ level: LogLevel, _ message: String, with data: Data? = nil, for environment: Environment = .live) {
+func log(_ level: LogLevel, _ message: String, with data: Data? = nil, for environment: Environment) {
     if level == .debug && environment.isProduction {
         return
     }