Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: Bump [email protected] and BSK@211 #3588

Merged
merged 4 commits into from
Nov 19, 2024
+14 −8
Merged

deps: Bump [email protected] and BSK@211 #3588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a14a58
bump css + bsk
Nov 18, 2024
335c72b
bump
Nov 19, 2024
e496fb8
updated ref
Nov 19, 2024
32dfd99
CSS: adding a new messageSecret properties for injected scripts
Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11036,7 +11036,7 @@
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 210.0.3;
version = 211.0.0;
};
};
9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down
14 changes: 7 additions & 7 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
"state" : {
"revision" : "a296f015a572fdfe53a81de653efb9a6d7fc3eba",
"version" : "210.0.3"
"revision" : "7033b0d6f166ac8152cff602f1a1301641f4da60",
"version" : "211.0.0"
}
},
{
"identity" : "content-scope-scripts",
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/content-scope-scripts",
"state" : {
"revision" : "adca39c379b1a124f9990e9d0308c374f32f5018",
"version" : "6.32.0"
"revision" : "f2caf4ff814f4714d07d6fc2cf02498cb54a1389",
"version" : "6.36.0"
}
},
{
Expand Down Expand Up @@ -122,8 +122,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/privacy-dashboard",
"state" : {
"revision" : "53fd1a0f8d91fcf475d9220f810141007300dffd",
"version" : "7.1.1"
"revision" : "757bbbae1e2afbb421caee9bfca04ee5c56c3af8",
"version" : "7.2.0"
}
},
{
Expand All @@ -138,7 +138,7 @@
{
"identity" : "swift-argument-parser",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser.git",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
"revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
"version" : "1.4.0"
Expand Down
1 change: 1 addition & 0 deletions DuckDuckGo/EmailSignupViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ extension EmailSignupViewController: SecureVaultManagerDelegate {
func secureVaultManager(_: SecureVaultManager, didRequestRuntimeConfigurationForDomain domain: String, completionHandler: @escaping (String?) -> Void) {
let contentScopeProperties = ContentScopeProperties(gpcEnabled: AppDependencyProvider.shared.appSettings.sendDoNotSell,
sessionKey: "",
messageSecret: "",
featureToggles: ContentScopeFeatureToggles.supportedFeaturesOniOS)

let runtimeConfig = DefaultAutofillSourceProvider.Builder(privacyConfigurationManager: ContentBlocking.shared.privacyConfigurationManager,
Expand Down
4 changes: 4 additions & 0 deletions DuckDuckGo/ScriptSourceProviding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ protocol ScriptSourceProviding {
var autofillSourceProvider: AutofillUserScriptSourceProvider { get }
var contentScopeProperties: ContentScopeProperties { get }
var sessionKey: String { get }
var messageSecret: String { get }

}

Expand All @@ -45,6 +46,7 @@ struct DefaultScriptSourceProvider: ScriptSourceProviding {
let autofillSourceProvider: AutofillUserScriptSourceProvider
let contentScopeProperties: ContentScopeProperties
let sessionKey: String
let messageSecret: String

let privacyConfigurationManager: PrivacyConfigurationManaging
let contentBlockingManager: ContentBlockerRulesManagerProtocol
Expand All @@ -63,8 +65,10 @@ struct DefaultScriptSourceProvider: ScriptSourceProviding {
surrogatesConfig = Self.buildSurrogatesConfig(contentBlockingManager: contentBlockingManager,
privacyConfigurationManager: privacyConfigurationManager)
sessionKey = Self.generateSessionKey()
messageSecret = Self.generateSessionKey()
contentScopeProperties = ContentScopeProperties(gpcEnabled: appSettings.sendDoNotSell,
sessionKey: sessionKey,
messageSecret: messageSecret,
featureToggles: ContentScopeFeatureToggles.supportedFeaturesOniOS)
autofillSourceProvider = Self.makeAutofillSource(privacyConfigurationManager: privacyConfigurationManager,
properties: contentScopeProperties)
Expand Down
1 change: 1 addition & 0 deletions DuckDuckGo/TabViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2976,6 +2976,7 @@ extension TabViewController: SecureVaultManagerDelegate {

return ContentScopeProperties(gpcEnabled: appSettings.sendDoNotSell,
sessionKey: autofillUserScript?.sessionKey ?? "",
messageSecret: autofillUserScript?.messageSecret ?? "",
featureToggles: supportedFeatures)
}

Expand Down
Loading