Expose Internal User managing from Config

duckduckgo · Dec 21, 2023 · a06ca54 · a06ca54
1 parent d671acc
commit a06ca54
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/Package.swift b/Package.swift
@@ -258,6 +258,7 @@ let package = Package(
         .target(
             name: "TestUtils",
             dependencies: [
+                "BrowserServicesKit",
                 "Networking",
                 "Persistence"
             ],

diff --git a/Sources/BrowserServicesKit/PrivacyConfig/PrivacyConfigurationManager.swift b/Sources/BrowserServicesKit/PrivacyConfig/PrivacyConfigurationManager.swift
@@ -31,6 +31,7 @@ public protocol PrivacyConfigurationManaging: AnyObject {
     var currentConfig: Data { get }
     var updatesPublisher: AnyPublisher<Void, Never> { get }
     var privacyConfig: PrivacyConfiguration { get }
+    var internalUserDecider: InternalUserDecider { get }
 
     @discardableResult func reload(etag: String?, data: Data?) -> PrivacyConfigurationManager.ReloadResult
 }
@@ -53,7 +54,7 @@ public class PrivacyConfigurationManager: PrivacyConfigurationManaging {
     private let embeddedDataProvider: EmbeddedDataProvider
     private let localProtection: DomainsProtectionStore
     private let errorReporting: EventMapping<ContentBlockerDebugEvents>?
-    private let internalUserDecider: InternalUserDecider
+    public let internalUserDecider: InternalUserDecider
     private let installDate: Date?
 
     private let updatesSubject = PassthroughSubject<Void, Never>()

diff --git a/Sources/DDGSync/DDGSync.swift b/Sources/DDGSync/DDGSync.swift
@@ -202,7 +202,9 @@ public class DDGSync: DDGSyncing {
         self.dataProvidersSource = dataProvidersSource
         self.dependencies = dependencies
 
-        featureFlagsCancellable = self.dependencies.privacyConfigurationManager.updatesPublisher
+        featureFlagsCancellable = Publishers.Merge(
+            self.dependencies.privacyConfigurationManager.updatesPublisher,
+            self.dependencies.privacyConfigurationManager.internalUserDecider.isInternalUserPublisher.map { _ in () })
             .compactMap { [weak self] in
                 self?.dependencies.privacyConfigurationManager.privacyConfig
             }

diff --git a/...UserDecider/MockInternalUserStoring.swift → ...s/TestUtils/MockInternalUserStoring.swift b/...UserDecider/MockInternalUserStoring.swift → ...s/TestUtils/MockInternalUserStoring.swift
@@ -19,12 +19,14 @@
 import Foundation
 import BrowserServicesKit
 
-final class MockInternalUserStoring: InternalUserStoring {
-    var isInternalUser: Bool = false
+public final class MockInternalUserStoring: InternalUserStoring {
+    public var isInternalUser: Bool = false
+
+    public init() { }
 }
 
 extension DefaultInternalUserDecider {
-    convenience init(mockedStore: MockInternalUserStoring = MockInternalUserStoring()) {
+    public convenience init(mockedStore: MockInternalUserStoring = MockInternalUserStoring()) {
         self.init(store: mockedStore)
     }
 }
diff --git a/Tests/BrowserServicesKitTests/FeatureFlagging/DefaultFeatureFlaggerTests.swift b/Tests/BrowserServicesKitTests/FeatureFlagging/DefaultFeatureFlaggerTests.swift
@@ -18,6 +18,7 @@
 
 import XCTest
 import BrowserServicesKit
+import TestUtils
 
 final class DefaultFeatureFlaggerTests: XCTestCase {
     var internalUserDeciderStore: MockInternalUserStoring!

diff --git a/Tests/BrowserServicesKitTests/PrivacyConfig/AppPrivacyConfigurationTests.swift b/Tests/BrowserServicesKitTests/PrivacyConfig/AppPrivacyConfigurationTests.swift
@@ -18,6 +18,7 @@
 
 import XCTest
 import BrowserServicesKit
+import TestUtils
 
 class MockEmbeddedDataProvider: EmbeddedDataProvider {
     var embeddedDataEtag: String

diff --git a/Tests/DDGSyncTests/Mocks/Mocks.swift b/Tests/DDGSyncTests/Mocks/Mocks.swift
@@ -138,6 +138,7 @@ class MockPrivacyConfigurationManager: PrivacyConfigurationManaging {
     var updatesSubject = PassthroughSubject<Void, Never>()
     let updatesPublisher: AnyPublisher<Void, Never>
     var privacyConfig: PrivacyConfiguration = MockPrivacyConfiguration()
+    var internalUserDecider: InternalUserDecider = DefaultInternalUserDecider()
     func reload(etag: String?, data: Data?) -> PrivacyConfigurationManager.ReloadResult {
         .downloaded
     }