Merge branch 'sam/vpn-ui-improvements' into sam/vpn-ui-improvements-2…

…-lottie-animation

* sam/vpn-ui-improvements:
  Point to BSK hotfix (#2558)
  Prevent redeeming invite codes after the VPN test ends (#2559)
  Updates Kingfisher to 7.11.0 (#2545)
  Makes network path metadata description anonymous (#2544)
  Adds pixels to track main VPN funnels (#2543)
  Cleanup after rolling out autoconsent enabled by default (#2537)
  Add #URL macro (#2540)
  Handle expired entitlement in NetP (#2525)
  Remove isSubscriptionEnabled check when attempting to delete NetP token (#2548)
  Validate correct environment (#2546)
  Remove CGNAT range (#2524)
  Add preliminary support for subscription keychain sharing (#2538)
  fix opening tabs with transitional (#2542)
  Integrate confirm entitlements endpoint (#2541)
  Makes dbSaveBloomFilterError daily and count (#2526)
  16. Subscription: Display "Activation in progress" message (#2535)
  Autofill support for deleting all passwords  (#2497)
  Bump BrowserServicesKit (#2532)
  Release 7.111.0-0 (#2534)
  if dax dialogs are showing then dismiss (#2506)

.github/workflows/codeql.yml

@@ -44,6 +44,7 @@ jobs:
         -scheme "DuckDuckGo" \
         -destination "platform=iOS Simulator,name=iPhone 14,OS=16.4"
         -skipPackagePluginValidation \
+        -skipMacroValidation \
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/end-to-end.yml

@@ -3,6 +3,7 @@ name: End-to-End tests
 on:
   schedule:
     - cron: '0 4 * * *' # run at 4 AM UTC
+  workflow_dispatch:
 
 jobs:
   end-to-end-tests:
@@ -43,6 +44,7 @@ jobs:
           -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
+          -skipMacroValidation \
           ONLY_ACTIVE_ARCH=NO \
         | tee xcodebuild.log
 

.github/workflows/nightly.yml

@@ -47,6 +47,7 @@ jobs:
           -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
+          -skipMacroValidation \
           | tee xcodebuild.log \
           | xcbeautify --report junit --report-path . --junit-report-filename unittests.xml
 
@@ -89,6 +90,7 @@ jobs:
           -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
+          -skipMacroValidation \
           | xcbeautify --report junit --report-path . --junit-report-filename unittests.xml
 
     - name: Publish unit tests report

.github/workflows/pr.yml

@@ -82,6 +82,7 @@ jobs:
           -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
+          -skipMacroValidation \
           DDG_SLOW_COMPILE_CHECK_THRESHOLD=250 \
           | tee xcodebuild.log \
           | xcbeautify --report junit --report-path . --junit-report-filename unittests.xml
@@ -188,6 +189,7 @@ jobs:
         -derivedDataPath "DerivedData" \
         -configuration "Release" \
         -skipPackagePluginValidation \
+        -skipMacroValidation \
         | xcbeautify
 
   create-asana-task:

.github/workflows/sync-end-to-end.yml

@@ -44,6 +44,7 @@ jobs:
           -destination "platform=iOS Simulator,name=iPhone 15" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
+          -skipMacroValidation \
           ONLY_ACTIVE_ARCH=NO \
         | tee xcodebuild.log
 

.maestro/data_clearing_tests/02_duckduckgo_settings.yml

@@ -5,9 +5,10 @@ tags:
 ---
 
 # Set up 
+- clearKeychain
 - clearState
 - launchApp
-- runFlow: 
+- runFlow:
     when: 
       visible: 
         text: "Let’s Do It!"
@@ -22,6 +23,13 @@ tags:
 - inputText: "privacy blogs"
 - pressKey: Enter
 
+# Dismiss Dax Dialogs if visible
+- runFlow:
+    when:
+        visible: "Phew!"
+    commands:
+        - tapOn: "Phew!"
+
 # Change settings
 - tapOn: "Safe search: moderate ▼"
 - tapOn: "Off"

Configuration/Configuration-Alpha.xcconfig

@@ -26,3 +26,6 @@ APP_ID = com.duckduckgo.mobile.ios.alpha
 
 // A prefix for group ids. Must start with "group.".
 GROUP_ID_PREFIX = group.com.duckduckgo.alpha
+
+// The keychain access group for subscriptions
+SUBSCRIPTION_APP_GROUP = com.duckduckgo.subscriptions.alpha

Configuration/DuckDuckGoDeveloper.xcconfig

@@ -27,3 +27,6 @@ CODE_SIGN_STYLE = Manual
 
 // The manually specified provisioning profile
 PROVISIONING_PROFILE_SPECIFIER = Development - App
+
+// The keychain access group for subscriptions
+SUBSCRIPTION_APP_GROUP = com.duckduckgo.subscriptions

Configuration/Version.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 7.110.0
+MARKETING_VERSION = 7.111.0

DuckDuckGo/Subscription/UserScripts/Subscription.swift → Core/AccountManagerExtension.swift

@@ -1,5 +1,5 @@
 //
-//  Subscription.swift
+//  AccountManagerExtension.swift
 //  DuckDuckGo
 //
 //  Copyright © 2024 DuckDuckGo. All rights reserved.
@@ -17,8 +17,15 @@
 //  limitations under the License.
 //
 
+#if SUBSCRIPTION
+
 import Foundation
+import Subscription
 
-struct Subscription: Encodable {
-    let token: String
+public extension AccountManager {
+    convenience init() {
+        self.init(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
+    }
 }
+
+#endif

Core/AppPrivacyConfigurationDataProvider.swift

@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"20ceae04600e9d3c46898ac4471fcd70\""
-        public static let embeddedDataSHA = "987f63a393724a34fe9d190c335f14b58398d2e9e02ccf38b84a7bd57c37b8ab"
+        public static let embeddedDataETag = "\"a427a69043b2baa27604bc10edb13de1\""
+        public static let embeddedDataSHA = "1d5c2e4113713fbf02bc617fc689981604ea53be172569a9fd744054b7355c39"
     }
 
     public var embeddedDataEtag: String {

Core/AppURLs.swift

@@ -17,8 +17,9 @@
 //  limitations under the License.
 //
 
-import Foundation
 import BrowserServicesKit
+import Foundation
+import Macros
 
 public extension URL {
 
@@ -48,7 +49,7 @@ public extension URL {
     static let exti = URL(string: "\(base)/exti/\(devMode)")!
     static let feedback = URL(string: "\(base)/feedback.js?type=app-feedback")!
 
-    static let appStore = URL(string: "https://apps.apple.com/app/duckduckgo-privacy-browser/id663592361")!
+    static let appStore = #URL("https://apps.apple.com/app/duckduckgo-privacy-browser/id663592361")
 
     static let mac = URL(string: "\(base)/mac")!
     static let windows = URL(string: "\(base)/windows")!

Core/BookmarksImporter.swift

@@ -17,11 +17,12 @@
 //  limitations under the License.
 //
 
+import Bookmarks
 import Common
 import Foundation
-import SwiftSoup
-import Bookmarks
+import Macros
 import Persistence
+import SwiftSoup
 
 public enum BookmarksImportError: Error {
     case invalidHtmlNoDLTag
@@ -217,7 +218,7 @@ final public class BookmarksImporter {
         static let FavoritesFolder = "DuckDuckGo Favorites"
         static let BookmarksFolder = "DuckDuckGo Bookmarks"
         static let bookmarkURLString = "https://duckduckgo.com"
-        static let bookmarkURL = URL(string: "https://duckduckgo.com")!
+        static let bookmarkURL = #URL("https://duckduckgo.com")
         static let favoriteAttribute = "duckduckgo:favorite"
         static let isFavorite = "true"
         static let idAttribute = "id"

Core/BundleExtension.swift

@@ -0,0 +1,40 @@
+//
+//  BundleExtension.swift
+//  DuckDuckGo
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+extension Bundle {
+    public func appGroup(bundle: BundleGroup) -> String {
+        var appGroupName: String
+
+        switch bundle {
+        case .subs:
+            appGroupName = "SUBSCRIPTION_APP_GROUP"
+        }
+
+        guard let appGroup = object(forInfoDictionaryKey: appGroupName) as? String else {
+            fatalError("Info.plist is missing \(appGroupName)")
+        }
+        return appGroup
+    }
+}
+
+public enum BundleGroup {
+    case subs
+}

Core/BundleExtensions.swift

@@ -0,0 +1,40 @@
+//
+//  BundleExtensions.swift
+//  DuckDuckGo
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+extension Bundle {
+    public func appGroup(bundle: BundleGroup) -> String {
+        var appGroupName: String
+
+        switch bundle {
+        case .subs:
+            appGroupName = "SUBSCRIPTION_APP_GROUP"
+        }
+
+        guard let appGroup = object(forInfoDictionaryKey: appGroupName) as? String else {
+            fatalError("Info.plist is missing \(appGroupName)")
+        }
+        return appGroup
+    }
+}
+
+public enum BundleGroup {
+    case subs
+}

Core/DataStoreWarmup.swift

@@ -18,6 +18,7 @@
 //
 
 import Combine
+import Macros
 import WebKit
 
 /// WKWebsiteDataStore is basically non-functional until a web view has been instanciated and a page is successfully loaded.
@@ -27,7 +28,7 @@ public class DataStoreWarmup {
 
     @MainActor
     public func ensureReady() async {
-        await BlockingNavigationDelegate().loadInBackgroundWebView(url: URL(string: "about:blank")!)
+        await BlockingNavigationDelegate().loadInBackgroundWebView(url: #URL("about:blank"))
     }
 
 }

Core/FeatureFlag.swift

@@ -36,7 +36,6 @@ public enum FeatureFlag: String {
     case networkProtectionWaitlistActive
     case subscription
     case swipeTabs
-    case autoconsentOnByDefault
     case history
 }
 
@@ -67,8 +66,6 @@ extension FeatureFlag: FeatureFlagSourceProviding {
             return .remoteReleasable(.subfeature(AutofillSubfeature.onByDefault))
         case .incontextSignup:
             return .remoteReleasable(.feature(.incontextSignup))
-        case .autoconsentOnByDefault:
-            return .remoteReleasable(.subfeature(AutoconsentSubfeature.onByDefault))
         case .history:
             return .remoteReleasable(.feature(.history))
         }

Core/Pixel.swift

@@ -249,14 +249,27 @@ extension Pixel {
     }
 }
 
+/// NSError supports this through `NSUnderlyingError`, but there's no support for this for Swift's `Error`.  This protocol does that.
+///
+/// The reason why this protocol returns a code and a domain instead of just an `Error` or `NSError` is so that the error implementing
+/// this protocol has full control over these values, and is able to override them as it best sees fit.
+///
+protocol ErrorWithUnderlyingError: Error {
+    var underlyingErrorCode: Int { get }
+    var underlyingErrorDomain: String { get }
+}
+
 extension Dictionary where Key == String, Value == String {
     mutating func appendErrorPixelParams(error: Error) {
         let nsError = error as NSError
 
         self[PixelParameters.errorCode] = "\(nsError.code)"
         self[PixelParameters.errorDomain] = nsError.domain
 
-        if let underlyingError = nsError.userInfo["NSUnderlyingError"] as? NSError {
+        if let underlyingError = error as? ErrorWithUnderlyingError {
+            self[PixelParameters.underlyingErrorCode] = "\(underlyingError.underlyingErrorCode)"
+            self[PixelParameters.underlyingErrorDomain] = underlyingError.underlyingErrorDomain
+        } else if let underlyingError = nsError.userInfo["NSUnderlyingError"] as? NSError {
             self[PixelParameters.underlyingErrorCode] = "\(underlyingError.code)"
             self[PixelParameters.underlyingErrorDomain] = underlyingError.domain
         } else if let sqlErrorCode = nsError.userInfo["NSSQLiteErrorDomain"] as? NSNumber {