Merge branch 'release/1.2.3' into main

Author: heart

Sources/Pam/HttpClient.swift

@@ -75,6 +75,11 @@ enum HttpClient {
             request.addValue($0.value, forHTTPHeaderField: $0.key)
         }
 
+            
+        if Pam.shared.isEnableLog {
+            print("🛺 Request GET: ", url )
+        }
+        
         let session = URLSession.shared
         session.dataTask(with: request) { data, _, error in
             if error == nil, let data = data {

Sources/Pam/Pam+StandardEvent.swift

@@ -7,19 +7,20 @@
 
 import Foundation
 
-extension Pam {
-    class StandardEvent {
-        struct PageView: PamEvent {
-            
-            let pageURL:String?
-            
-            func getPayload() -> [String : Any] {
-                return [:]
-            }
-            
-            func getEvent() -> String {
-                return ""
-            }
+
+public class PamStandardEvent {
+    
+    public static func pageView(pageName:String,  pageURL:String?, contentID: String?, payload: [String:Any]?) {
+        
+        var payload = payload
+        payload?["page_title"] = pageName
+        payload?["page_url"] = pageURL
+        
+        if let id = contentID {
+            payload?["id"] = id
         }
+            
+        Pam.track(event: "page_view",
+                  payload: payload)
     }
 }

Sources/Pam/Pam+Static.swift

@@ -18,6 +18,14 @@ extension Pam {
 
     }
 
+    public static func getContactID()->String?{
+        return Pam.shared.getContactID()
+    }
+    
+    public static func getDeviceUUID()->String?{
+        return UIDevice.current.identifierForVendor?.uuidString
+    }
+    
     public static func userLogin() {
         Pam.shared.updateCustomerID()
     }
@@ -142,4 +150,35 @@ extension Pam {
         Pam.shared.setDeviceToken(deviceToken: token)
     }
 
+    static public func createNotificationReader(notificationData: [String: Any]?) -> PAMNotificationReader? {
+        
+        if let pamNoti = notificationData?["pam"] as? [String: String] {
+            let url = pamNoti["url"]
+            let flex = pamNoti["flex"]
+            let pixel = pamNoti["pixel"]
+
+            if let flex = flex {
+                let parser = FlexLangParser()
+                if let flexVC = parser.parse(flex: flex)?.render() {
+                    return PAMNotificationReader(.reader, pixel: pixel, viewController: flexVC)
+                }
+            }
+
+            if let url = url {
+                if url.hasPrefix("http") {
+                    return PAMNotificationReader(.url, pixel: pixel, url: url)
+                } else {
+                    return PAMNotificationReader(.scheme, pixel: pixel, url: url)
+                }
+            }
+        }
+
+        return nil
+    }
+    
+    public static func resolvePixel(_ url: String?){
+        guard let url = url else{return}
+        HttpClient.getReturnData(url: url, queryString: nil, headers: nil, onSuccess: nil)
+    }
+    
 }

Sources/Pam/Pam.swift

@@ -339,7 +339,7 @@ public class Pam: NSObject {
             formField["_database"] = config?.publicDBAlias ?? ""
         }
 
-        if let uuid = UIDevice.current.identifierForVendor?.uuidString {
+        if let uuid = Pam.getDeviceUUID() {
             formField["uuid"] = uuid
         }
 
@@ -472,6 +472,8 @@ public class Pam: NSObject {
         }
         dispatch("onToken", data: ["token": deviceToken])
     }
+    
+    
 }
 
 

Sources/Pam/PamEvent.swift

@@ -91,7 +91,7 @@ class ConsentAPI {
             }
 
             Pam.track(event: "allow_consent", payload: payload){ res in
-                self.resultSubmit?["consent.id"] = AllowConsentResult(contactID: res.contactID, database: res.database, consentID: res.consentID)
+                self.resultSubmit?[consent.id] = AllowConsentResult(contactID: res.contactID, database: res.database, consentID: res.consentID)
                 self.startSubmit()
             }
         }
@@ -117,6 +117,8 @@ class ConsentAPI {
         isLoading = true
         let pamServerURL = Pam.shared.config?.pamServer ?? ""
 
+        print("LOAD CONSENT = ","\(pamServerURL)/consent-message/\(consentMessageID)")
+        
         HttpClient.getReturnData(url: "\(pamServerURL)/consent-message/\(consentMessageID)", queryString: nil, headers: nil){ data in
 
             if let data = data {

Sources/Pam/consent/ConsentAPI.swift

@@ -127,6 +127,7 @@ public struct ConsentMessage: BaseConsentMessage{
     public let availableLanguages: [String]
     public let defaultLanguage: String
     public var permission: [ConsentPermission]
+    public let moreInfoButtonText: Text?
 
     public func allowAll(){
         for var item in permission{
@@ -199,6 +200,11 @@ public struct ConsentMessage: BaseConsentMessage{
         let version = setting[\.version].int ?? 0
         let revision = setting[\.version].int ?? 0
         let displayText = getText(json: setting[\.display_text].json)
+        
+        let moreInfoButtonText = getText(json: setting[\.more_info.display_text].json)
+        
+        //let moreInfoCustomURL = getText(json: setting[\.more_info.display_text].json)
+        
         let acceptButtonText = getText(json: setting[\.accept_button_text].json)
         let consentDetailTitle = getText(json: setting[\.consent_detail_title])
 
@@ -228,7 +234,9 @@ public struct ConsentMessage: BaseConsentMessage{
                               consentDetailTitle: consentDetailTitle,
                               availableLanguages: availableLanguages,
                               defaultLanguage: defaultLanguage,
-                              permission: permissions)
+                              permission: permissions,
+                              moreInfoButtonText: moreInfoButtonText
+                            )
     }
 
 }
@@ -260,6 +268,12 @@ public struct ConsentPermission{
 
         if let item = json?[dynamicMember: key.key].json {
 
+            let isEnable = item[\.is_enabled].bool ?? false
+            if !isEnable {
+                return nil
+            }
+            
+            
             let shortDescription = item[\.brief_description].json
             let fullDescription =  item[\.full_description].json
             let fullDescriptionEnabled = item[\.is_full_description_enabled].bool ?? false