Merge branch 'release/1.2.1' into main

Author: heart

Sources/Pam/Pam+Static.swift

@@ -101,7 +101,7 @@ extension Pam {
     }
 
     public static func submitConsent(
-        consents: [BaseConsentMessage],
+        consents: [BaseConsentMessage?],
         onSubmit: @escaping ([String: AllowConsentResult], String) -> Void
     ) {
         let api = ConsentAPI()
@@ -120,7 +120,7 @@ extension Pam {
     }
 
     public static func submitConsent(
-        consent: BaseConsentMessage,
+        consent: BaseConsentMessage?,
         onSubmit: @escaping (AllowConsentResult, String) -> Void
     ) {
         submitConsent(consents: [consent]) { result, consentIDs in

Sources/Pam/consent/ConsentAPI.swift

@@ -11,14 +11,13 @@ class ConsentAPI {
     private var resultMessages: [String: BaseConsentMessage]?
     private var _onConsentLoadCallBack: OnLoadConsentMessage?
 
-    private var submitConsentQueue: [BaseConsentMessage]?
+    private var submitConsentQueue: [BaseConsentMessage?]?
     private var resultSubmit: [String: AllowConsentResult]?
     private var _onConsentSubmitCallBack: OnSubmitConsent?
 
     private var resultUserConsentLoad: [String: UserConsentPermissions]?
     private var _onPermissionLoadCallBack: OnLoadPermission?
 
-    
     func setOnPermissionLoadCallBack(callBack: @escaping OnLoadPermission){
         _onPermissionLoadCallBack = callBack
     }
@@ -40,7 +39,7 @@ class ConsentAPI {
         }
     }
 
-    func submitConsents(consents: [BaseConsentMessage]){
+    func submitConsents(consents: [BaseConsentMessage?]){
         if (!isLoading) {
             submitConsentQueue = consents
             index = 0
@@ -82,11 +81,11 @@ class ConsentAPI {
             payload["_version"] = consent.version
 
             consent.permission.forEach{ it in
-                payload[it.getSubmitKey()] = it.accept
+                payload[it.getSubmitKey()] = it.allow
 
                 if let trackingConsentMessageID = Pam.shared.config?.trackingConsentMessageID {
                     if(consent.id == trackingConsentMessageID && it.getSubmitKey() == "_allow_preferences_cookies"){
-                        Pam.shared.allowTracking = it.accept
+                        Pam.shared.allowTracking = it.allow
                     }
                 }
             }

Sources/Pam/consent/ConsentMessage.swift

@@ -6,17 +6,17 @@ extension UIColor {
         if hex.hasPrefix("#") {
             let start = hex.index(hex.startIndex, offsetBy: 1)
             let hexColor = String(hex[start...])
-
+            
             if hexColor.count == 8 {
                 let scanner = Scanner(string: hexColor)
                 var hexNumber: UInt64 = 0
-
+                
                 if scanner.scanHexInt64(&hexNumber) {
                     r = CGFloat((hexNumber & 0xff000000) >> 24) / 255
                     g = CGFloat((hexNumber & 0x00ff0000) >> 16) / 255
                     b = CGFloat((hexNumber & 0x0000ff00) >> 8) / 255
                     a = CGFloat(hexNumber & 0x000000ff) / 255
-
+                    
                     self.init(red: r, green: g, blue: b, alpha: a)
                     return
                 }
@@ -53,7 +53,7 @@ public struct ConsentStyleConfiguration {
         let barBackgroundOpacity = (json[\.bar_background_opacity_percentage].double ?? 100.0)/100.0
         let buttonBackgroundColor = json[\.bar_text_color].string ?? "#FFFFFF"
         let buttonTextColor = json[\.button_text_color].string ?? "#000000"
-
+        
         let it = json[\.consent_detail].json
         let icon = it[\.popup_main_icon].string
         let primaryColor = it[\.primary_color].string ?? "#FFFFFF"
@@ -66,7 +66,7 @@ public struct ConsentStyleConfiguration {
                                                           secondaryColor:  UIColor(hex: secondaryColor),
                                                           buttonTextColor: UIColor(hex: dialogButtonTextColor),
                                                           textColor: UIColor(hex: dialogTextColor))
-
+        
         return ConsentStyleConfiguration(backgroundColor: UIColor(hex: backgroundColor),
                                          textColor: UIColor(hex: textColor),
                                          barBackgroundOpacity: barBackgroundOpacity,
@@ -128,29 +128,38 @@ public struct ConsentMessage: BaseConsentMessage{
     public let defaultLanguage: String
     public var permission: [ConsentPermission]
 
-    public func acceptAll(){
+    public func allowAll(){
         for var item in permission{
-            item.accept = true
+            item.allow = true
         }
     }
+    
     public func denyAll(){
         for var item in permission{
-            item.accept = false
+            item.allow = false
         }
     }
-
+    
+    public func setPermission(name: ConsentPermissionName, isAllow: Bool) {
+        for var item in self.permission{
+            if item.name.rawValue == name.rawValue {
+                item.allow = false
+            }
+        }
+    }
+    
     public func validate()-> ValidationResult{
         var pass = true
         var errorField: [String]?
         var errorMessage:String?
 
         for p in permission{
-            if(p.require && !p.accept){
+            if(p.require && !p.allow){
                 pass = false
                 if errorField == nil {
                     errorField = []
                 }
-                errorField?.append(p.name)
+                errorField?.append(p.name.nameStr)
             }
         }
         if(!pass){
@@ -208,20 +217,20 @@ public struct ConsentMessage: BaseConsentMessage{
 
 
         return ConsentMessage(id: id,
-                             type: type,
-                             name: name,
-                             description: description,
-                             style: style,
-                             version: version,
-                             revision: revision,
-                             displayText: displayText,
-                             acceptButtonText: acceptButtonText,
-                             consentDetailTitle: consentDetailTitle,
-                             availableLanguages: availableLanguages,
-                             defaultLanguage: defaultLanguage,
-                             permission: permissions)
+                              type: type,
+                              name: name,
+                              description: description,
+                              style: style,
+                              version: version,
+                              revision: revision,
+                              displayText: displayText,
+                              acceptButtonText: acceptButtonText,
+                              consentDetailTitle: consentDetailTitle,
+                              availableLanguages: availableLanguages,
+                              defaultLanguage: defaultLanguage,
+                              permission: permissions)
     }
-
+    
 }
 
 
@@ -232,14 +241,12 @@ public struct ConsentMessageError: BaseConsentMessage{
 
 public struct ConsentPermission{
 
-    public let name: String
-    public let key: String
+    public let name: ConsentPermissionName
     public let shortDescription: Text?
     public let fullDescription: Text?
     public let fullDescriptionEnabled: Bool
     public let require: Bool
-    public var accept: Bool
-    public var allow = true
+    public var allow = false
 
     private static func getText(_ json:Json?)-> Text?{
         guard let json = json else {return nil}
@@ -248,84 +255,83 @@ public struct ConsentPermission{
             th: json[\.th].string
         )
     }
-
-    private static func parsePermission(json:Json?, key: String, name: String, require: Bool )-> ConsentPermission?{
+    
+    private static func parsePermission(json:Json?, key: ConsentPermissionName, require: Bool )-> ConsentPermission?{
 
-        if let item = json?[dynamicMember: key].json {
+        if let item = json?[dynamicMember: key.key].json {
 
             let shortDescription = item[\.brief_description].json
             let fullDescription =  item[\.full_description].json
             let fullDescriptionEnabled = item[\.is_full_description_enabled].bool ?? false
-           
-            return ConsentPermission(name: name,
-                                     key: key,
+            
+            return ConsentPermission(name: key,
                                      shortDescription: ConsentPermission.getText(shortDescription),
                                      fullDescription: ConsentPermission.getText(fullDescription),
                                      fullDescriptionEnabled: fullDescriptionEnabled,
                                      require: require,
-                                     accept: true)
+                                     allow: true)
         }
-       
+        
         return nil
     }
-
+    
     static public func parse(json: Json?)-> [ConsentPermission]{
         var list:[ConsentPermission] = []
-
-        if let perm = parsePermission(json: json, key: "terms_and_conditions", name: "Terms and Conditions", require: true){
+        
+        if let perm = parsePermission(json: json, key: .termsAndConditions, require: true){
             list.append(perm)
         }
 
-        if let perm = parsePermission(json: json, key: "privacy_overview", name: "Privacy overview", require: true){
+        if let perm = parsePermission(json: json, key: .privacyOverview, require: true){
             list.append(perm)
         }
-
-        if let perm = parsePermission(json: json, key: "necessary_cookies", name: "Necessary cookies", require: true){
+        
+        if let perm = parsePermission(json: json, key: .necessaryCookies, require: true){
             list.append(perm)
         }
 
-        if let perm = parsePermission(json: json, key: "preferences_cookies", name: "Preferences cookies", require: false){
+        if let perm = parsePermission(json: json, key: .preferencesCookies, require: false){
             list.append(perm)
         }
 
-        if let perm = parsePermission(json: json, key: "analytics_cookies", name: "Analytics cookies", require: false){
+        if let perm = parsePermission(json: json, key: .analyticsCookies, require: false){
             list.append(perm)
         }
 
-        if let perm = parsePermission(json: json, key: "marketing_cookies", name: "Marketing cookies", require: false){
+        if let perm = parsePermission(json: json, key: .marketingCookies, require: false){
             list.append(perm)
         }
 
-        if let perm = parsePermission(json: json, key: "social_media_cookies", name: "Social media cookies", require: false){
+        if let perm = parsePermission(json: json, key: .socialMediaCookies, require: false){
             list.append(perm)
         }
-
-        if let perm = parsePermission(json: json, key: "email", name: "Email", require: false){
+        
+        if let perm = parsePermission(json: json, key: .email, require: false){
             list.append(perm)
         }
 
-        if let perm = parsePermission(json: json, key: "sms", name: "SMS", require: false){
+        if let perm = parsePermission(json: json, key: .sms, require: false){
             list.append(perm)
         }
 
-        if let perm = parsePermission(json: json, key: "line", name: "LINE", require: false){
+        if let perm = parsePermission(json: json, key:.line, require: false){
             list.append(perm)
         }
-       
-        if let perm = parsePermission(json: json, key: "facebook_messenger", name: "Facebook Messenger", require: false){
+        
+        if let perm = parsePermission(json: json, key: .facebookMessenger, require: false){
             list.append(perm)
         }
 
-        if let perm = parsePermission(json: json, key: "push_notification", name: "Push notification", require: false){
+        if let perm = parsePermission(json: json, key: .pushNotification, require: false){
             list.append(perm)
         }
-
+        
         return list
     }
-
+    
 
     public func getSubmitKey() -> String{
-        return "_allow_\(key)"
+        return "_allow_\(name)"
     }
 }
 

Sources/Pam/consent/ConsentPermissionName.swift

@@ -0,0 +1,58 @@
+//
+//  ConsentPermissionKey.swift
+//  
+//
+//  Created by narongrit kanhanoi on 1/9/2564 BE.
+
+public enum ConsentPermissionName: String {
+    case termsAndConditions = "terms_and_conditions"
+    case privacyOverview = "privacy_overview"
+    case necessaryCookies = "necessary_cookies"
+    case preferencesCookies = "preferences_cookies"
+    case analyticsCookies = "analytics_cookies"
+    case marketingCookies = "marketing_cookies"
+    case socialMediaCookies = "social_media_cookies"
+    case email = "email"
+    case sms = "sms"
+    case line = "line"
+    case facebookMessenger = "facebook_messenger"
+    case pushNotification = "push_notification"
+    
+    public var nameStr:String{
+        get {
+            switch self {
+            case .termsAndConditions:
+                return "Terms and Conditions"
+            case .privacyOverview:
+                return "Privacy overview"
+            case .necessaryCookies:
+                return "Necessary cookies"
+            case .preferencesCookies:
+                return "Preferences cookies"
+            case .analyticsCookies:
+                return "Analytics cookies"
+            case .marketingCookies:
+                return "Marketing cookies"
+            case .socialMediaCookies:
+                return "Social media cookies"
+            case .email:
+                return "Email"
+            case .sms:
+                return "SMS"
+            case .line:
+                return "LINE"
+            case .facebookMessenger:
+                return "Facebook Messenger"
+            case .pushNotification:
+                return "Push notification"
+            }
+        }
+    }
+    
+    public var key:String{
+        get{
+            return self.rawValue
+        }
+    }
+    
+}