Merge pull request #337 from SourcePointUSA/develop

Merge develop to master

Author: vilasma

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 6.1.7 (August, 25, 2021)
+* Added `acceptedCategories` property to `SPGDPRConsent` class. The `acceptedCategories` is an array of ids of the categories (purposes) consented by the user and that are consented in all vendors involved with it. If a single vendor of a given purpose is disabled by the user, that purpose won't be part of `acceptedCategories`. [#335](https://github.com/SourcePointUSA/ios-cmp-app/pull/335)
+* Fixed an issue preventing using the SDK with Carthage. [#334](https://github.com/SourcePointUSA/ios-cmp-app/pull/334)
+
 # 6.1.6 (August, 17, 2021)
 * Added `IDFAAccepted` & `IDFADenied` to `SPActionType` to load the messages based on IDFA status [#330](https://github.com/SourcePointUSA/ios-cmp-app/pull/330)
 

ConsentViewController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'ConsentViewController'
-  s.version          = '6.1.6'
+  s.version          = '6.1.7'
   s.summary          = 'SourcePoint\'s ConsentViewController to handle privacy consents.'
   s.homepage         = 'https://www.sourcepoint.com'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

ConsentViewController/Classes/Consents/SPGDPRConsent.swift

@@ -67,6 +67,19 @@ public typealias SPGDPRPurposeId = String
     /// that's the internal Sourcepoint id we give to this consent profile
     public var uuid: String?
 
+    /// a list of ids of the categories accepted by the user in all its vendors.
+    /// If a category has been rejected in a single vendor, its id won't part of the `acceptedCategories` list.
+    public var acceptedCategories: [String] {
+        let categoryGrants = vendorGrants
+            .flatMap { $0.value.purposeGrants }
+        return Set<String>(categoryGrants.map { $0.key })
+            .filter { id in
+                categoryGrants
+                    .filter { $0.key == id }
+                    .allSatisfy { $0.value }
+            }
+    }
+
     public init(
         uuid: String? = nil,
         vendorGrants: SPGDPRVendorGrants,

Example/ConsentViewController.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/SourcePointUSA/ios-cmp-app.git",
         "state": {
           "branch": null,
-          "revision": "a7bf6b6a795b5909d69846fa6a5873065d511296",
-          "version": "6.1.2"
+          "revision": "118d527955040e507c04dc886d46bcfc66dfb8a3",
+          "version": "6.1.5"
         }
       }
     ]

Example/ConsentViewController_ExampleTests/GDPRUserConsentsSpec.swift

@@ -36,5 +36,26 @@ class SPGDPRConsentsSpec: QuickSpec {
                 expect(SPGDPRConsent.CodingKeys.tcfData.rawValue).to(equal("TCData"))
             }
         }
+
+        describe("acceptedCategories") {
+            it("contains all purposes accepted in *all* vendors") {
+                let consent = SPGDPRConsent(
+                    vendorGrants: [
+                        "vendor1": SPGDPRVendorGrant(granted: false, purposeGrants: [
+                            "purpose1": true,
+                            "purpose2": false
+                        ]),
+                        "vendor2": SPGDPRVendorGrant(granted: false, purposeGrants: [
+                            "purpose1": true,
+                            "purpose3": true
+                        ])
+                    ],
+                    euconsent: "",
+                    tcfData: SPJson()
+                )
+                expect(consent.acceptedCategories).to(contain(["purpose1", "purpose3"]))
+                expect(consent.acceptedCategories).notTo(contain(["purpose2"]))
+            }
+        }
     }
 }

Example/ConsentViewController_ExampleTests/Helpers/InMemoryStorageMock.swift

@@ -11,14 +11,18 @@ import Foundation
 
 /// A class that uses [String: Any] as its storage
 class InMemoryStorageMock: Storage {
+    func integer(forKey defaultName: String) -> Int {
+        storage[defaultName] as? Int ?? 0
+    }
+
     var storage = [String: Any]()
 
     func string(forKey defaultName: String) -> String? {
-        return storage[defaultName] as? String
+        storage[defaultName] as? String
     }
 
     func object<T>(ofType type: T.Type, forKey defaultName: String) -> T? where T: Decodable {
-        return storage[defaultName] as? T
+        storage[defaultName] as? T
     }
 
     func set(_ value: Any?, forKey defaultName: String) {
@@ -42,6 +46,6 @@ class InMemoryStorageMock: Storage {
     }
 
     func dictionaryRepresentation() -> [String: Any] {
-        return storage
+        storage
     }
 }

Example/ConsentViewController_ExampleTests/Helpers/SourcePointClientMock.swift

@@ -23,10 +23,6 @@ class SourcePointClientMock: SourcePointProtocol {
         print("getNativePrivacyManager")
     }
 
-    func mmsMessage(messageId: Int, handler: @escaping MMSMessageHandler) {
-        print("mmsMessage")
-    }
-
     func privacyManagerView(propertyId: Int, consentLanguage: SPMessageLanguage, handler: @escaping PrivacyManagerViewHandler) {
         print("privacyManagerView")
     }

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - ConsentViewController (6.1.6)
+  - ConsentViewController (6.1.7)
   - IQKeyboardManagerSwift (6.5.6)
   - Nimble (9.2.0)
   - Quick (4.0.0)
@@ -27,7 +27,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  ConsentViewController: 43e5c9463a6eacdffb15a227d34b4ab609968e53
+  ConsentViewController: 04f325671502479b8774f3a8a12bc64190e9ac3c
   IQKeyboardManagerSwift: c7df9d2deb356c04522f5c4b7b6e4ce4d8ed94fe
   Nimble: 4f4a345c80b503b3ea13606a4f98405974ee4d0b
   Quick: 6473349e43b9271a8d43839d9ba1c442ed1b7ac4
@@ -36,4 +36,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: f8658d9830917d40ea1c48103e6c8fd3421a7fb5
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.0.beta.2