Integrate Identity Theft Restoration into macOS app (#2186)

miasma13 · web-flow · commit 43e6df41adc4 · 2024-02-12T23:03:50.000+01:00
Task/Issue URL: https://app.asana.com/0/0/1206566157509119/f **Description**: Integrate Identity Theft Restoration into macOS app --- ###### Internal references: [Pull Request Review Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f) [Software Engineering Expectations](https://app.asana.com/0/59792373528535/199064865822552) [Technical Design Template](https://app.asana.com/0/59792373528535/184709971311943) [Pull Request Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -114,6 +114,9 @@
 		1E950E3F2912A10D0051A99B /* ContentBlocking in Frameworks */ = {isa = PBXBuildFile; productRef = 1E950E3E2912A10D0051A99B /* ContentBlocking */; };
 		1E950E412912A10D0051A99B /* PrivacyDashboard in Frameworks */ = {isa = PBXBuildFile; productRef = 1E950E402912A10D0051A99B /* PrivacyDashboard */; };
 		1E950E432912A10D0051A99B /* UserScript in Frameworks */ = {isa = PBXBuildFile; productRef = 1E950E422912A10D0051A99B /* UserScript */; };
+		1ED910D52B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED910D42B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift */; };
+		1ED910D62B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED910D42B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift */; };
+		1ED910D72B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED910D42B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift */; };
 		310E79BF294A19A8007C49E8 /* FireproofingReferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 310E79BE294A19A8007C49E8 /* FireproofingReferenceTests.swift */; };
 		311B262728E73E0A00FD181A /* TabShadowConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 311B262628E73E0A00FD181A /* TabShadowConfig.swift */; };
 		31267C692B640C4200FEF811 /* DataBrokerProtectionFeatureVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C5FFB82AF64D120008A79F /* DataBrokerProtectionFeatureVisibility.swift */; };
@@ -3317,6 +3320,7 @@
 		1E7E2E932902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyDashboardPermissionHandler.swift; sourceTree = "<group>"; };
 		1E862A882A9FC01200F84D4B /* SubscriptionUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = SubscriptionUI; sourceTree = "<group>"; };
 		1E8F997E2B221B3600AC5D34 /* Subscription */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Subscription; sourceTree = "<group>"; };
+		1ED910D42B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityTheftRestorationPagesUserScript.swift; sourceTree = "<group>"; };
 		310E79BE294A19A8007C49E8 /* FireproofingReferenceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FireproofingReferenceTests.swift; sourceTree = "<group>"; };
 		311B262628E73E0A00FD181A /* TabShadowConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabShadowConfig.swift; sourceTree = "<group>"; };
 		3139A1512AA4B3C000969C7D /* DataBrokerProtectionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionManager.swift; sourceTree = "<group>"; };
@@ -8025,6 +8029,7 @@
 				856CADEF271710F400E79BB0 /* HoverUserScript.swift */,
 				4B2E7D6226FF9D6500D2DB17 /* PrintingUserScript.swift */,
 				1E0C72052ABC63BD00802009 /* SubscriptionPagesUserScript.swift */,
+				1ED910D42B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift */,
 				85AC3AEE25D5CE9800C7D2AA /* UserScripts.swift */,
 			);
 			path = UserScripts;
@@ -9669,6 +9674,7 @@
 				3706FB3D293F65D500E42796 /* FocusRingView.swift in Sources */,
 				3706FB3E293F65D500E42796 /* BookmarksBarViewModel.swift in Sources */,
 				3706FB3F293F65D500E42796 /* NSPopUpButtonView.swift in Sources */,
+				1ED910D62B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift in Sources */,
 				3706FB40293F65D500E42796 /* ContextualMenu.swift in Sources */,
 				3706FB41293F65D500E42796 /* NavigationBarViewController.swift in Sources */,
 				4B7534CC2A1FD7EA00158A99 /* NetworkProtectionInviteDialog.swift in Sources */,
@@ -10746,6 +10752,7 @@
 				4B9579D12AC7AE700062CA31 /* SafariVersionReader.swift in Sources */,
 				4B9579D22AC7AE700062CA31 /* LoginFaviconView.swift in Sources */,
 				4B9579D32AC7AE700062CA31 /* FireproofDomainsViewController.swift in Sources */,
+				1ED910D72B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift in Sources */,
 				4B9579D42AC7AE700062CA31 /* URLEventHandler.swift in Sources */,
 				3158B15E2B0BF76F00AF130C /* DataBrokerProtectionAppEvents.swift in Sources */,
 				4B9579D52AC7AE700062CA31 /* SupportedOsChecker.swift in Sources */,
@@ -11374,6 +11381,7 @@
 				3158B15C2B0BF76D00AF130C /* DataBrokerProtectionAppEvents.swift in Sources */,
 				4B723E0E26B0006300E14D75 /* LoginImport.swift in Sources */,
 				4B9DB03E2A983B24000927DB /* JoinWaitlistView.swift in Sources */,
+				1ED910D52B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift in Sources */,
 				37534CA028113101002621E7 /* LazyLoadable.swift in Sources */,
 				EAE42800275D47FA00DAC26B /* ClickToLoadModel.swift in Sources */,
 				0230C0A3272080090018F728 /* KeyedCodingExtension.swift in Sources */,
diff --git a/DuckDuckGo/Common/Extensions/URLExtension.swift b/DuckDuckGo/Common/Extensions/URLExtension.swift
@@ -472,4 +472,8 @@ extension URL {
         }
         return self.absoluteString
     }
+
+    public func isChild(of url: URL) -> Bool {
+        self.absoluteString.hasPrefix(url.absoluteString)
+    }
 }
diff --git a/DuckDuckGo/MainWindow/MainViewController.swift b/DuckDuckGo/MainWindow/MainViewController.swift
@@ -414,7 +414,7 @@ final class MainViewController: NSViewController {
             navigationBarViewController.addressBarViewController?.addressBarTextField.makeMeFirstResponder()
         case .onboarding:
             self.view.makeMeFirstResponder()
-        case .url:
+        case .url, .subscription:
             browserTabViewController.makeWebViewFirstResponder()
         case .settings:
             browserTabViewController.preferencesViewController?.view.makeMeFirstResponder()
diff --git a/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift b/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
@@ -316,6 +316,14 @@ final class AddressBarTextField: NSTextField {
         }
 #endif
 
+#if SUBSCRIPTION
+        if providedUrl.isChild(of: URL.subscriptionBaseURL) || providedUrl.isChild(of: URL.identityTheftRestoration) {
+            selectedTabViewModel.updateAddressBarStrings()
+            self.window?.makeFirstResponder(nil)
+            return
+        }
+#endif
+
         selectedTabViewModel.tab.setUrl(providedUrl, source: .userEntered(userEnteredValue))
         selectedTabViewModel.updateAddressBarStrings()
 
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -1031,7 +1031,7 @@ extension NavigationBarViewController: OptionsButtonMenuDelegate {
 
 #if SUBSCRIPTION
     func optionsButtonMenuRequestedSubscriptionPurchasePage(_ menu: NSMenu) {
-        WindowControllersManager.shared.show(url: .purchaseSubscription, source: .ui, newTab: true)
+        WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
     }
 #endif
 
diff --git a/DuckDuckGo/Preferences/View/PreferencesRootView.swift b/DuckDuckGo/Preferences/View/PreferencesRootView.swift
@@ -100,7 +100,7 @@ enum Preferences {
 #if SUBSCRIPTION
         private func makeSubscriptionView() -> some View {
             let openURL: (URL) -> Void = { url in
-                WindowControllersManager.shared.show(url: url, source: .ui, newTab: true)
+                WindowControllersManager.shared.showTab(with: .subscription(url))
             }
 
             let sheetActionHandler = SubscriptionAccessActionHandlers(restorePurchases: { SubscriptionPagesUseSubscriptionFeature.startAppStoreRestoreFlow() },
diff --git a/DuckDuckGo/RecentlyClosed/Model/RecentlyClosedCoordinator.swift b/DuckDuckGo/RecentlyClosed/Model/RecentlyClosedCoordinator.swift
@@ -242,7 +242,7 @@ extension Tab.TabContent {
         switch self {
         case .url(let url, credential: let credential, source: _):
             .url(url, credential: credential, source: .pendingStateRestoration)
-        case .newtab, .settings, .bookmarks, .onboarding, .none, .dataBrokerProtection:
+        case .newtab, .settings, .bookmarks, .onboarding, .none, .dataBrokerProtection, .subscription:
             self
         }
     }
@@ -252,7 +252,7 @@ extension Tab.TabContent {
         case .url(let url, credential: let credential, source: let source):
             let newSource: URLSource = source == .pendingStateRestoration ? .loadedByStateRestoration : .reload
             return .url(url, credential: credential, source: newSource)
-        case .newtab, .settings, .bookmarks, .onboarding, .none, .dataBrokerProtection:
+        case .newtab, .settings, .bookmarks, .onboarding, .none, .dataBrokerProtection, .subscription:
             return self
         }
     }
diff --git a/DuckDuckGo/RecentlyClosed/View/RecentlyClosedMenu.swift b/DuckDuckGo/RecentlyClosed/View/RecentlyClosedMenu.swift
@@ -76,7 +76,7 @@ private extension NSMenuItem {
         case .bookmarks:
             image = TabViewModel.Favicon.preferences
             title = UserText.tabPreferencesTitle
-        case .url:
+        case .url, .subscription:
             image = recentlyClosedTab.favicon
             image?.size = NSSize.faviconSize
             title = recentlyClosedTab.title ?? recentlyClosedTab.tabContent.url?.absoluteString ?? ""
diff --git a/DuckDuckGo/StateRestoration/Tab+NSSecureCoding.swift b/DuckDuckGo/StateRestoration/Tab+NSSecureCoding.swift
@@ -92,8 +92,10 @@ private extension Tab.TabContent {
         case onboarding = 4
         case duckPlayer = 5
         case dataBrokerProtection = 6
+        case subscription = 7
     }
 
+    // swiftlint:disable:next cyclomatic_complexity
     init?(type: ContentType, url: URL?, videoID: String?, timestamp: String?, preferencePane: PreferencePaneIdentifier?) {
         switch type {
         case .newtab:
@@ -112,6 +114,9 @@ private extension Tab.TabContent {
             self = .url(.duckPlayer(videoID, timestamp: timestamp), source: .pendingStateRestoration)
         case .dataBrokerProtection:
             self = .dataBrokerProtection
+        case .subscription:
+            guard let url = url else { return nil }
+            self = .subscription(url)
         }
     }
 
@@ -124,6 +129,7 @@ private extension Tab.TabContent {
         case .onboarding: return .onboarding
         case .none: return .newtab
         case .dataBrokerProtection: return .dataBrokerProtection
+        case .subscription: return .subscription
         }
     }
 
diff --git a/DuckDuckGo/Tab/Model/Tab.swift b/DuckDuckGo/Tab/Model/Tab.swift
@@ -25,6 +25,10 @@ import Navigation
 import UserScript
 import WebKit
 
+#if SUBSCRIPTION
+import Subscription
+#endif
+
 #if NETWORK_PROTECTION
 import NetworkProtection
 import NetworkProtectionIPC
@@ -57,6 +61,7 @@ protocol NewWindowPolicyDecisionMaker {
         case onboarding
         case none
         case dataBrokerProtection
+        case subscription(URL)
 
         enum URLSource: Equatable {
             case pendingStateRestoration
@@ -109,6 +114,7 @@ protocol NewWindowPolicyDecisionMaker {
 
         }
 
+        // swiftlint:disable:next cyclomatic_complexity
         static func contentFromURL(_ url: URL?, source: URLSource) -> TabContent {
             switch url {
             case URL.newtab, URL.Invalid.aboutNewtab, URL.Invalid.duckHome:
@@ -129,6 +135,14 @@ protocol NewWindowPolicyDecisionMaker {
             default: break
             }
 
+#if SUBSCRIPTION
+            if let url {
+                if url.isChild(of: URL.subscriptionBaseURL) || url.isChild(of: URL.identityTheftRestoration) {
+                    return .subscription(url)
+                }
+            }
+#endif
+
             if let settingsPane = url.flatMap(PreferencePaneIdentifier.init(url:)) {
                 return .settings(pane: settingsPane)
             } else if let url, let credential = url.basicAuthCredential {
@@ -184,6 +198,7 @@ protocol NewWindowPolicyDecisionMaker {
             case .bookmarks: return UserText.tabBookmarksTitle
             case .onboarding: return UserText.tabOnboardingTitle
             case .dataBrokerProtection: return UserText.tabDataBrokerProtectionTitle
+            case .subscription: return nil
             }
         }
 
@@ -215,14 +230,16 @@ protocol NewWindowPolicyDecisionMaker {
                 return .welcome
             case .dataBrokerProtection:
                 return .dataBrokerProtection
+            case .subscription(let url):
+                return url
             case .none:
                 return nil
             }
         }
 
         var isUrl: Bool {
             switch self {
-            case .url:
+            case .url, .subscription:
                 return true
             default:
                 return false
diff --git a/DuckDuckGo/Tab/UserScripts/IdentityTheftRestorationPagesUserScript.swift b/DuckDuckGo/Tab/UserScripts/IdentityTheftRestorationPagesUserScript.swift
@@ -0,0 +1,105 @@
+//
+//  IdentityTheftRestorationPagesUserScript.swift
+//
+//  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.
+//
+
+#if SUBSCRIPTION
+
+import BrowserServicesKit
+import Common
+import Combine
+import Foundation
+import WebKit
+import Subscription
+import UserScript
+
+///
+/// The user script that will be the broker for all subscription features
+///
+public final class IdentityTheftRestorationPagesUserScript: NSObject, UserScript, UserScriptMessaging {
+    public var source: String = ""
+
+    public static let context = "identityTheftRestorationPages"
+
+    // special pages messaging cannot be isolated as we'll want regular page-scripts to be able to communicate
+    public let broker = UserScriptMessageBroker(context: IdentityTheftRestorationPagesUserScript.context, requiresRunInPageContentWorld: true )
+
+    public let messageNames: [String] = [
+        IdentityTheftRestorationPagesUserScript.context
+    ]
+
+    public let injectionTime: WKUserScriptInjectionTime = .atDocumentStart
+    public let forMainFrameOnly = true
+    public let requiresRunInPageContentWorld = true
+}
+
+extension IdentityTheftRestorationPagesUserScript: WKScriptMessageHandlerWithReply {
+    @MainActor
+    public func userContentController(_ userContentController: WKUserContentController,
+                                      didReceive message: WKScriptMessage) async -> (Any?, String?) {
+        let action = broker.messageHandlerFor(message)
+        do {
+            let json = try await broker.execute(action: action, original: message)
+            return (json, nil)
+        } catch {
+            // forward uncaught errors to the client
+            return (nil, error.localizedDescription)
+        }
+    }
+}
+
+// MARK: - Fallback for macOS 10.15
+extension IdentityTheftRestorationPagesUserScript: WKScriptMessageHandler {
+    public func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
+        // unsupported
+    }
+}
+
+///
+/// Use Subscription sub-feature
+///
+final class IdentityTheftRestorationPagesFeature: Subfeature {
+    var broker: UserScriptMessageBroker?
+
+    var featureName = "useIdentityTheftRestoration"
+
+    var messageOriginPolicy: MessageOriginPolicy = .only(rules: [
+        .exact(hostname: "duckduckgo.com"),
+        .exact(hostname: "abrown.duckduckgo.com")
+    ])
+
+    func with(broker: UserScriptMessageBroker) {
+        self.broker = broker
+    }
+
+    func handler(forMethodNamed methodName: String) -> Subfeature.Handler? {
+        switch methodName {
+        case "getAccessToken": return getAccessToken
+        default:
+            return nil
+        }
+    }
+
+    func getAccessToken(params: Any, original: WKScriptMessage) async throws -> Encodable? {
+        if let accessToken = AccountManager().accessToken {
+            return ["token": accessToken]
+        } else {
+            return [String: String]()
+        }
+    }
+}
+
+#endif
diff --git a/DuckDuckGo/Tab/UserScripts/SubscriptionPagesUserScript.swift b/DuckDuckGo/Tab/UserScripts/SubscriptionPagesUserScript.swift
@@ -306,7 +306,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         case .personalInformationRemoval:
             NotificationCenter.default.post(name: .openPersonalInformationRemoval, object: self, userInfo: nil)
         case .identityTheftRestoration:
-            NotificationCenter.default.post(name: .openIdentityTheftRestoration, object: self, userInfo: nil)
+            await WindowControllersManager.shared.showTab(with: .subscription(.identityTheftRestoration))
         }
 
         return nil
@@ -391,7 +391,7 @@ extension MainWindowController {
         guard let window else { return }
 
         window.show(.subscriptionNotFoundAlert(), firstButtonAction: {
-            WindowControllersManager.shared.show(url: .purchaseSubscription, source: .ui, newTab: true)
+            WindowControllersManager.shared.show(url: .subscriptionPurchase, source: .ui, newTab: true)
         })
     }
 
@@ -400,7 +400,7 @@ extension MainWindowController {
         guard let window else { return }
 
         window.show(.subscriptionInactiveAlert(), firstButtonAction: {
-            WindowControllersManager.shared.show(url: .purchaseSubscription, source: .ui, newTab: true)
+            WindowControllersManager.shared.show(url: .subscriptionPurchase, source: .ui, newTab: true)
         })
     }
 
diff --git a/DuckDuckGo/Tab/UserScripts/UserScripts.swift b/DuckDuckGo/Tab/UserScripts/UserScripts.swift
@@ -32,6 +32,7 @@ final class UserScripts: UserScriptsProvider {
     let debugScript = DebugUserScript()
 #if SUBSCRIPTION
     let subscriptionPagesUserScript = SubscriptionPagesUserScript()
+    let identityTheftRestorationPagesUserScript = IdentityTheftRestorationPagesUserScript()
 #endif
     let clickToLoadScript: ClickToLoadUserScript
 
@@ -88,6 +89,9 @@ final class UserScripts: UserScriptsProvider {
 #if SUBSCRIPTION
         subscriptionPagesUserScript.registerSubfeature(delegate: SubscriptionPagesUseSubscriptionFeature())
         userScripts.append(subscriptionPagesUserScript)
+
+        identityTheftRestorationPagesUserScript.registerSubfeature(delegate: IdentityTheftRestorationPagesFeature())
+        userScripts.append(identityTheftRestorationPagesUserScript)
 #endif
     }
 
diff --git a/DuckDuckGo/Tab/View/BrowserTabViewController.swift b/DuckDuckGo/Tab/View/BrowserTabViewController.swift
@@ -506,7 +506,7 @@ final class BrowserTabViewController: NSViewController {
             }
             showTransientTabContentController(OnboardingViewController.create(withDelegate: self))
 
-        case .url:
+        case .url, .subscription:
             if shouldReplaceWebView(for: tabViewModel) {
                 removeAllTabContent(includingWebView: true)
                 changeWebView(tabViewModel: tabViewModel)
diff --git a/DuckDuckGo/Tab/ViewModel/TabViewModel.swift b/DuckDuckGo/Tab/ViewModel/TabViewModel.swift
diff --git a/LocalPackages/Subscription/Sources/Subscription/URL+Subscription.swift b/LocalPackages/Subscription/Sources/Subscription/URL+Subscription.swift
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift

Original file line number	Diff line number	Diff line change
`@@ -472,4 +472,8 @@ extension URL {`
`472`	`472`	`}`
`473`	`473`	`return self.absoluteString`
`474`	`474`	`}`
	`475`	`+`
	`476`	`+ public func isChild(of url: URL) -> Bool {`
	`477`	`+ self.absoluteString.hasPrefix(url.absoluteString)`
	`478`	`+ }`
`475`	`479`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1031,7 +1031,7 @@ extension NavigationBarViewController: OptionsButtonMenuDelegate {`
`1031`	`1031`
`1032`	`1032`	`#if SUBSCRIPTION`
`1033`	`1033`	`func optionsButtonMenuRequestedSubscriptionPurchasePage(_ menu: NSMenu) {`
`1034`		`- WindowControllersManager.shared.show(url: .purchaseSubscription, source: .ui, newTab: true)`
	`1034`	`+ WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))`
`1035`	`1035`	`}`
`1036`	`1036`	`#endif`
`1037`	`1037`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ enum Preferences {`
`100`	`100`	`#if SUBSCRIPTION`
`101`	`101`	`private func makeSubscriptionView() -> some View {`
`102`	`102`	`let openURL: (URL) -> Void = { url in`
`103`		`- WindowControllersManager.shared.show(url: url, source: .ui, newTab: true)`
	`103`	`+ WindowControllersManager.shared.showTab(with: .subscription(url))`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`let sheetActionHandler = SubscriptionAccessActionHandlers(restorePurchases: { SubscriptionPagesUseSubscriptionFeature.startAppStoreRestoreFlow() },`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ extension Tab.TabContent {`
`242`	`242`	`switch self {`
`243`	`243`	`case .url(let url, credential: let credential, source: _):`
`244`	`244`	`.url(url, credential: credential, source: .pendingStateRestoration)`
`245`		`- case .newtab, .settings, .bookmarks, .onboarding, .none, .dataBrokerProtection:`
	`245`	`+ case .newtab, .settings, .bookmarks, .onboarding, .none, .dataBrokerProtection, .subscription:`
`246`	`246`	`self`
`247`	`247`	`}`
`248`	`248`	`}`
`@@ -252,7 +252,7 @@ extension Tab.TabContent {`
`252`	`252`	`case .url(let url, credential: let credential, source: let source):`
`253`	`253`	`let newSource: URLSource = source == .pendingStateRestoration ? .loadedByStateRestoration : .reload`
`254`	`254`	`return .url(url, credential: credential, source: newSource)`
`255`		`- case .newtab, .settings, .bookmarks, .onboarding, .none, .dataBrokerProtection:`
	`255`	`+ case .newtab, .settings, .bookmarks, .onboarding, .none, .dataBrokerProtection, .subscription:`
`256`	`256`	`return self`
`257`	`257`	`}`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,10 @@ private extension Tab.TabContent {`
`92`	`92`	`case onboarding = 4`
`93`	`93`	`case duckPlayer = 5`
`94`	`94`	`case dataBrokerProtection = 6`
	`95`	`+ case subscription = 7`
`95`	`96`	`}`
`96`	`97`
	`98`	`+ // swiftlint:disable:next cyclomatic_complexity`
`97`	`99`	`init?(type: ContentType, url: URL?, videoID: String?, timestamp: String?, preferencePane: PreferencePaneIdentifier?) {`
`98`	`100`	`switch type {`
`99`	`101`	`case .newtab:`
`@@ -112,6 +114,9 @@ private extension Tab.TabContent {`
`112`	`114`	`self = .url(.duckPlayer(videoID, timestamp: timestamp), source: .pendingStateRestoration)`
`113`	`115`	`case .dataBrokerProtection:`
`114`	`116`	`self = .dataBrokerProtection`
	`117`	`+ case .subscription:`
	`118`	`+ guard let url = url else { return nil }`
	`119`	`+ self = .subscription(url)`
`115`	`120`	`}`
`116`	`121`	`}`
`117`	`122`
`@@ -124,6 +129,7 @@ private extension Tab.TabContent {`
`124`	`129`	`case .onboarding: return .onboarding`
`125`	`130`	`case .none: return .newtab`
`126`	`131`	`case .dataBrokerProtection: return .dataBrokerProtection`
	`132`	`+ case .subscription: return .subscription`
`127`	`133`	`}`
`128`	`134`	`}`
`129`	`135`
Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ final class BrowserTabViewController: NSViewController {`
`506`	`506`	`}`
`507`	`507`	`showTransientTabContentController(OnboardingViewController.create(withDelegate: self))`
`508`	`508`
`509`		`- case .url:`
	`509`	`+ case .url, .subscription:`
`510`	`510`	`if shouldReplaceWebView(for: tabViewModel) {`
`511`	`511`	`removeAllTabContent(includingWebView: true)`
`512`	`512`	`changeWebView(tabViewModel: tabViewModel)`