Update after recent API changes

duckduckgo · Dec 21, 2023 · 64b8ad7 · 64b8ad7
1 parent b758192
commit 64b8ad7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -12975,8 +12975,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 97.0.0;
+				branch = "bartek/fix-internal-user-toggling";
+				kind = branch;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "d671accf1bf7097c4e7f5cd55cd1c6dfa005cf92",
-        "version" : "97.0.0"
+        "branch" : "bartek/fix-internal-user-toggling",
+        "revision" : "6584ce53e2ac3220f828a654bdfe866b11df30ec"
       }
     },
     {

diff --git a/DuckDuckGoDBPBackgroundAgent/DBPMocks.swift b/DuckDuckGoDBPBackgroundAgent/DBPMocks.swift
@@ -56,21 +56,23 @@ final class PrivacyConfigurationManagingMock: PrivacyConfigurationManaging {
         guard let privacyConfigurationData = try? PrivacyConfigurationData(data: data) else {
             fatalError("Could not retrieve privacy configuration data")
         }
-        let privacyConfig = privacyConfiguration(withData: privacyConfigurationData)
+        let privacyConfig = privacyConfiguration(withData: privacyConfigurationData, internalUserDecider: internalUserDecider)
         return privacyConfig
     }
 
+    var internalUserDecider: InternalUserDecider = DefaultInternalUserDecider(store: InternalUserDeciderStoreMock())
+
     func reload(etag: String?, data: Data?) -> PrivacyConfigurationManager.ReloadResult {
         .downloaded
     }
 }
 
-func privacyConfiguration(withData data: PrivacyConfigurationData) -> PrivacyConfiguration {
+func privacyConfiguration(withData data: PrivacyConfigurationData, internalUserDecider: InternalUserDecider) -> PrivacyConfiguration {
     let domain = MockDomainsProtectionStore()
     return AppPrivacyConfiguration(data: data,
                                    identifier: UUID().uuidString,
                                    localProtection: domain,
-                                   internalUserDecider: DefaultInternalUserDecider(store: InternalUserDeciderStoreMock()))
+                                   internalUserDecider: internalUserDecider)
 }
 
 final class MockDomainsProtectionStore: DomainsProtectionStore {

diff --git a/...ges/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionUtils.swift b/...ges/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionUtils.swift
@@ -163,6 +163,7 @@ private class PrivacyConfigurationDataBrokerProtectionConfigOverride: PrivacyCon
     var base: Data
     var updatesPublisher: AnyPublisher<(), Never>
     var privacyConfig: PrivacyConfiguration
+    var internalUserDecider: InternalUserDecider
 
     var currentConfig: Data {
         return updateConfigWithBrokerProtection()
@@ -176,6 +177,7 @@ private class PrivacyConfigurationDataBrokerProtectionConfigOverride: PrivacyCon
         base = manager.currentConfig
         updatesPublisher = manager.updatesPublisher
         privacyConfig = manager.privacyConfig
+        internalUserDecider = manager.internalUserDecider
     }
 
     private func updateConfigWithBrokerProtection() -> Data {

diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
@@ -58,13 +58,19 @@ extension DataBrokerScheduleConfig {
     }
 }
 
+final class InternalUserDeciderStoreMock: InternalUserStoring {
+    var isInternalUser: Bool = false
+}
+
 final class PrivacyConfigurationManagingMock: PrivacyConfigurationManaging {
     var currentConfig: Data = Data()
 
     var updatesPublisher: AnyPublisher<Void, Never> = .init(Just(()))
 
     var privacyConfig: BrowserServicesKit.PrivacyConfiguration = PrivacyConfigurationMock()
 
+    var internalUserDecider: InternalUserDecider = DefaultInternalUserDecider(store: InternalUserDeciderStoreMock())
+
     func reload(etag: String?, data: Data?) -> PrivacyConfigurationManager.ReloadResult {
         .downloaded
     }