@usercentrics/react-native-sdk 2.0.3-rc1 → 2.2.1

package/ios/Extensions/BannerSettings+Dict.swift

@@ -0,0 +1,180 @@
+import Foundation
+import UsercentricsUI
+
+extension BannerSettings {
+    init?(from dictionary: NSDictionary?) {
+        guard let dictionary = dictionary else { return nil }
+
+        self.init(font: UIFont(from: dictionary["font"] as? NSDictionary),
+                  logo: UIImage(from: dictionary["logo"] as? NSDictionary))
+    }
+}
+
+extension FirstLayerStyleSettings {
+    init?(from dictionary: NSDictionary?) {
+        guard let dictionary = dictionary else { return nil }
+
+        self.init(headerImage: HeaderImageSettings.from(dictionary: dictionary["headerImage"] as? NSDictionary),
+                  title: TitleSettings(from: dictionary["title"] as? NSDictionary),
+                  message: MessageSettings(from: dictionary["message"] as? NSDictionary),
+                  buttonLayout: ButtonLayout.from(dictionary: dictionary["buttonLayout"] as? NSDictionary),
+                  backgroundColor: UIColor(unsafeHex: dictionary["backgroundColorHex"] as? String),
+                  cornerRadius: dictionary["cornerRadius"] as? CGFloat,
+                  overlayColor: UIColor(unsafeHex: dictionary["overlayColorHex"] as? String))
+    }
+}
+
+
+extension HeaderImageSettings {
+    static func from(dictionary: NSDictionary?) -> HeaderImageSettings? {
+        guard let dictionary = dictionary else { return nil }
+
+        if let isHidden = dictionary["isHidden"] as? Bool, isHidden {
+            return .hidden
+        }
+
+        let logoDict = dictionary["image"] as? NSDictionary
+        let logo = UIImage(from: logoDict)
+
+        if let isExtended = dictionary["isExtended"] as? Bool, isExtended {
+            return .extended(image: logo)
+        }
+
+        let logoUrlString = logoDict?["logoUrl"] as? String
+
+        return .logo(settings: LogoSettings(image: logo,
+                                            url: URL(string: logoUrlString ?? ""),
+                                            position: SectionPosition.from(enumString: dictionary["alignment"] as? String),
+                                            height: dictionary["height"] as? CGFloat))
+    }
+}
+
+extension TitleSettings {
+    init?(from dictionary: NSDictionary?) {
+        guard let dictionary = dictionary else { return nil }
+
+        self.init(font: UIFont(from: dictionary["font"] as? NSDictionary),
+                  textColor: UIColor(unsafeHex: dictionary["textColorHex"] as? String ?? ""),
+                  textAlignment: NSTextAlignment.from(enumString: dictionary["textAlignment"] as? String))
+    }
+}
+
+
+extension MessageSettings {
+    init?(from dictionary: NSDictionary?) {
+        guard let dictionary = dictionary else { return nil }
+
+        self.init(font: UIFont(from: dictionary["font"] as? NSDictionary),
+                  textColor: UIColor(unsafeHex: dictionary["textColorHex"] as? String ?? ""),
+                  textAlignment: NSTextAlignment.from(enumString: dictionary["textAlignment"] as? String),
+                  linkTextColor: UIColor(unsafeHex: dictionary["linkTextColorHex"] as? String ?? ""),
+                  linkTextUnderline: dictionary["linkTextUnderline"] as? Bool ?? true)
+    }
+}
+
+extension ButtonLayout {
+    static func from(dictionary: NSDictionary?) -> ButtonLayout? {
+        guard let dictionary = dictionary else { return nil }
+
+        let layoutDict = dictionary["layout"] as? String
+        let buttons = (dictionary["buttons"] as? [[NSDictionary]]) ?? []
+
+        switch layoutDict {
+            case "ROW":
+                return .row(buttons: buttons.flatMap { $0 }.compactMap { ButtonSettings(from: $0) })
+            case "COLUMN":
+                return .column(buttons: buttons.flatMap { $0 }.compactMap { ButtonSettings(from: $0) })
+            case "GRID":
+                let gridButtons = buttons.map { $0.compactMap { button in ButtonSettings(from: button) }}
+                return .grid(buttons: gridButtons)
+            default:
+                break
+        }
+        
+        return nil
+    }
+}
+
+extension ButtonSettings {
+    init?(from dictionary: NSDictionary?) {
+        guard
+            let dictionary = dictionary,
+            let buttonTypeDict = dictionary["buttonType"] as? String,
+            let buttonType = ButtonType.from(enumString: buttonTypeDict)
+        else { return nil }
+
+        self.init(type: buttonType,
+                  font: UIFont(from: dictionary["font"] as? NSDictionary),
+                  textColor: UIColor(unsafeHex: dictionary["textColorHex"] as? String),
+                  backgroundColor: UIColor(unsafeHex: dictionary["backgroundColorHex"] as? String),
+                  cornerRadius: dictionary["cornerRadius"] as? CGFloat)
+    }
+}
+
+extension ButtonType {
+    static func from(enumString: String) -> ButtonType? {
+        switch enumString {
+            case "ACCEPT_ALL":
+                return .acceptAll
+            case "DENY_ALL":
+                return .denyAll
+            case "MORE":
+                return .more
+            case "SAVE":
+                return .save
+            default:
+                return nil
+        }
+    }
+}
+
+extension UsercentricsLayout {
+    static func from(enumString: String) -> UsercentricsLayout? {
+        switch enumString {
+            case "FULL":
+                return .full
+            case "SHEET":
+                return .sheet
+            case "POPUP_CENTER":
+                return .popup(position: .center)
+            case "POPUP_BOTTOM":
+                return .popup(position: .bottom)
+            default:
+                return nil
+        }
+    }
+}
+
+extension SectionPosition {
+    static func from(enumString: String?) -> SectionPosition? {
+        guard let enumString = enumString else { return nil }
+
+        switch enumString {
+            case "CENTER":
+                return .center
+            case "END":
+                return .right
+            case "START":
+                return .left
+            default:
+                return nil
+        }
+    }
+}
+
+extension NSTextAlignment {
+    static func from(enumString: String?) -> NSTextAlignment? {
+        guard let enumString = enumString else { return nil }
+
+        switch enumString {
+            case "CENTER":
+                return .center
+            case "RIGHT":
+                return .right
+            case "LEFT":
+                return .left
+            default:
+                return nil
+        }
+    }
+}

package/ios/Extensions/TCFData+Dict.swift

@@ -102,7 +102,8 @@ extension TCFVendor {
             "usesNonCookieAccess" : usesNonCookieAccess,
             "deviceStorageDisclosureUrl" : deviceStorageDisclosureUrl  as Any,
             "usesCookies" : usesCookies,
-            "cookieRefresh" : cookieRefresh?.boolValue as Any ,
+            "cookieRefresh" : cookieRefresh?.boolValue as Any,
+            "dataSharedOutsideEU": dataSharedOutsideEU?.boolValue as Any
         ]
     }
 }

package/ios/Extensions/UIColor+Extensions.swift

@@ -0,0 +1,52 @@
+import Foundation
+
+extension UIColor {
+    convenience init?(unsafeHex: String?) {
+        guard let unsafeHex = unsafeHex else { return nil }
+        if unsafeHex.hasPrefix("#") {
+            self.init(hex: unsafeHex)
+        } else {
+            self.init(hex: "#\(unsafeHex)")
+        }
+    }
+
+    convenience init?(hex: String) {
+        let r, g, b, a: CGFloat
+
+        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
+                }
+            }
+
+            if hexColor.count == 6 {
+                let scanner = Scanner(string: hexColor)
+                var hexNumber: UInt64 = 0
+
+                if scanner.scanHexInt64(&hexNumber) {
+                    r = CGFloat((hexNumber & 0xff0000) >> 16) / 255
+                    g = CGFloat((hexNumber & 0x00ff00) >> 8) / 255
+                    b = CGFloat(hexNumber & 0x0000ff) / 255
+
+                    self.init(red: r, green: g, blue: b, alpha: 1.0)
+                    return
+                }
+            }
+        }
+
+        return nil
+    }
+}

package/ios/Extensions/UIFont+UsercentricsFontDict.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+
+extension UIFont {
+    convenience init?(from dictionary: NSDictionary?) {
+        guard let dictionary = dictionary else { return nil }
+
+        if let customFontName = dictionary["fontName"] as? String,
+           let customFontSize = dictionary["fontSize"] as? CGFloat {
+            self.init(name: customFontName, size: customFontSize)
+        } else {
+            return nil
+        }
+    }
+}

package/ios/Extensions/UIImage+UsercentricsLogoDict.swift

@@ -0,0 +1,14 @@
+import Foundation
+
+extension UIImage {
+    convenience init?(from dictionary: NSDictionary?) {
+        guard
+            let dictionary = dictionary,
+            let logoName = dictionary["logoName"] as? String
+        else {
+            return nil
+        }
+
+        self.init(named: logoName)
+    }
+}

package/ios/Extensions/UsercentricsCMPData+Dict.swift

@@ -22,7 +22,7 @@ extension UsercentricsSettings {
             "displayOnlyForEU" : self.displayOnlyForEU,
             "urlConsentInfo" : self.urlConsentInfo,
             "updatedAt" : self.updatedAt as Any,
-            "secondLayer" : self.secondLayer?.toDictionary() as Any,
+            "secondLayer" : self.secondLayer.toDictionary() as Any,
             "cookiePolicyUrl": self.cookiePolicyUrl as Any,
             "tcf2": self.tcf2?.toDictionary() as Any,
             "ccpa": self.ccpa?.toDictionary() as Any,

package/ios/Extensions/UsercentricsServiceConsents+Dict.swift

@@ -14,6 +14,8 @@ public extension UsercentricsServiceConsent {
             "status": self.status,
             "version": self.version,
             "dataProcessor": self.dataProcessor,
+            "isEssential": self.isEssential,
+            "history": self.history.toDictionary()
         ]
 
         if let type = self.type?.ordinal {
@@ -23,3 +25,15 @@ public extension UsercentricsServiceConsent {
         return dict
     }
 }
+
+public extension Array where Element == UsercentricsConsentHistoryEntry {
+    func toDictionary() -> [NSDictionary] {
+        self.map {
+            [
+                "status": $0.status,
+                "type": $0.type.ordinal,
+                "timestampInMillis": $0.timestampInMillis
+            ]
+        }
+    }
+}

package/ios/Extensions/UsercentricsUISettings+Dict.swift

@@ -24,3 +24,4 @@ public extension UsercentricsUISettings {
                   showCloseButton: showCloseButton)
     }
 }
+

package/ios/Manager/UsercentricsManager.swift

@@ -1,16 +1,26 @@
 import Foundation
 import Usercentrics
 import UsercentricsUI
-import RxSwift
 
 public protocol UsercentricsManager {
-    var alreadyConfigured: Bool { get }
     func configure(options: UsercentricsOptions)
 
     func isReady(onSuccess: @escaping ((UsercentricsReadyStatus) -> Void), onFailure: @escaping ((Error) -> Void))
     func restoreUserSession(controllerId: String, onSuccess: @escaping ((UsercentricsReadyStatus) -> Void), onFailure: @escaping ((Error) -> Void))
 
     func getPredefinedUI(settings: UsercentricsUISettings?, dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void) -> UIViewController
+
+    func showFirstLayer(bannerSettings: BannerSettings?,
+                        hostView: UINavigationController,
+                        layout: UsercentricsLayout,
+                        settings: FirstLayerStyleSettings?,
+                        dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void)
+
+    func showSecondLayer(bannerSettings: BannerSettings?,
+                         hostView: UINavigationController,
+                         showCloseButton: Bool,
+                         dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void)
+
     func getTCString() -> String
     func getControllerId() -> String
     func getConsents() -> [UsercentricsServiceConsent]
@@ -40,39 +50,52 @@ public protocol UsercentricsManager {
 
 final class UsercentricsManagerImplementation: UsercentricsManager {
 
-    private var bag: DisposeBag = DisposeBag()
-    private let isConfiguredObservable: BehaviorSubject<Bool> = .init(value: false)
-    var alreadyConfigured: Bool {
-        try! isConfiguredObservable.value()
-    }
-
     func isReady(onSuccess: @escaping ((UsercentricsReadyStatus) -> Void), onFailure: @escaping ((Error) -> Void)) {
-        var subscription: Disposable?
-
-        subscription = isConfiguredObservable
-            .subscribe(onNext: { isConfigured in
-                guard isConfigured else { return }
-                UsercentricsCore.isReady(onSuccess: onSuccess, onFailure: onFailure)
-                subscription?.dispose()
-            })
-
-        subscription?.disposed(by: bag)
+        UsercentricsCore.isReady(onSuccess: onSuccess, onFailure: onFailure)
     }
 
     func configure(options: UsercentricsOptions) {
+        var isConfigured: Bool = false
+        isReady { _ in
+            isConfigured = true
+        } onFailure: { _ in
+            isConfigured = true
+        }
+
+        guard !isConfigured else { return }
+        
         UsercentricsCore.configure(options: options)
-        isConfiguredObservable.onNext(true)
     }
 
     func reset() {
         UsercentricsCore.reset()
-        isConfiguredObservable.onNext(false)
     }
 
     func getPredefinedUI(settings: UsercentricsUISettings?, dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void) -> UIViewController {
         return UsercentricsUserInterface.getPredefinedUI(settings: settings, dismissViewHandler: dismissViewHandler)
     }
 
+    func showFirstLayer(bannerSettings: BannerSettings?,
+                        hostView: UINavigationController,
+                        layout: UsercentricsLayout,
+                        settings: FirstLayerStyleSettings?,
+                        dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void) {
+        UsercentricsBanner(bannerSettings: bannerSettings).showFirstLayer(hostView: hostView,
+                                                                          layout: layout,
+                                                                          settings: settings,
+                                                                          completionHandler: dismissViewHandler)
+    }
+
+    func showSecondLayer(bannerSettings: BannerSettings?,
+                         hostView: UINavigationController,
+                         showCloseButton: Bool,
+                         dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void) {
+        UsercentricsBanner(bannerSettings: bannerSettings).showSecondLayer(hostView: hostView,
+                                                                           showCloseButton: showCloseButton,
+                                                                           presentationMode: .present,
+                                                                           completionHandler: dismissViewHandler)
+    }
+
     func restoreUserSession(controllerId: String, onSuccess: @escaping ((UsercentricsReadyStatus) -> Void), onFailure: @escaping ((Error) -> Void)) {
         UsercentricsCore.shared.restoreUserSession(controllerId: controllerId, onSuccess: onSuccess, onFailure: onFailure)
     }

package/ios/RNUsercentricsModule.m

@@ -14,6 +14,14 @@ RCT_EXTERN_METHOD(showCMP:(NSDictionary *)dict
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(showFirstLayer:(NSDictionary *)dict
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(showSecondLayer:(NSDictionary *)dict
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(restoreUserSession:(NSString *)controllerId
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)