Fix #6212: CWTS options in webview need to be reflected in native set…

…tings (#6219)

* Fix #6212: CWTS options in webview need to be reflected in native settings

* remove for loop

Client/Frontend/Browser/BrowserViewController.swift

@@ -1987,7 +1987,7 @@ extension BrowserViewController: IntroViewControllerDelegate {
     func getSignInOrFxASettingsVC(_ fxaOptions: FxALaunchParams? = nil, flowType: FxAPageType) -> UIViewController {
         // Show the settings page if we have already signed in. If we haven't then show the signin page
         guard profile.hasSyncableAccount() else {
-            let vc = FxAWebView(pageType: flowType)
+            let vc = FxAWebView(pageType: flowType, profile: profile)
             vc.dismissType = .dismiss
             return vc
         }

Client/Frontend/Settings/AppSettingsOptions.swift

@@ -46,7 +46,7 @@ class ConnectSetting: WithoutAccountSetting {
     override var accessibilityIdentifier: String? { return "SignInToSync" }
 
     override func onClick(_ navigationController: UINavigationController?) {
-        let viewController = FxAWebView(pageType: .emailLoginFlow)
+        let viewController = FxAWebView(pageType: .emailLoginFlow, profile: profile)
         navigationController?.pushViewController(viewController, animated: true)
     }
 

Client/Frontend/Settings/SyncContentSettingsViewController.swift

@@ -22,7 +22,7 @@ class ManageFxAccountSetting: Setting {
     }
 
     override func onClick(_ navigationController: UINavigationController?) {
-        let viewController = FxAWebView(pageType: .settingsPage)
+        let viewController = FxAWebView(pageType: .settingsPage, profile: profile)
         navigationController?.pushViewController(viewController, animated: true)
     }
 }

RustFxA/FxAWebView.swift

@@ -33,14 +33,17 @@ fileprivate enum RemoteCommand: String {
 }
 
 class FxAWebView: UIViewController, WKNavigationDelegate {
-    private var webView: WKWebView
     var dismissType: DismissType = .dismiss
-    let pageType: FxAPageType
+
+    fileprivate var webView: WKWebView
+    fileprivate let pageType: FxAPageType
     fileprivate var baseURL: URL?
-    private var helpBrowser: WKWebView?
+    fileprivate var helpBrowser: WKWebView?
+    fileprivate let profile: Profile
 
-    init(pageType: FxAPageType) {
+    init(pageType: FxAPageType, profile: Profile) {
         self.pageType = pageType
+        self.profile = profile
 
         let contentController = WKUserContentController()
         if let path = Bundle.main.path(forResource: "FxASignIn", ofType: "js"), let source = try? String(contentsOfFile: path, encoding: .utf8) {
@@ -189,6 +192,8 @@ extension FxAWebView: WKScriptMessageHandler {
 
         let auth = FxaAuthData(code: code, state: state, actionQueryParam: "signin")
         RustFirefoxAccounts.shared.accountManager.finishAuthentication(authData: auth) { _ in
+            self.profile.syncManager.onAddedAccount()
+
             // ask for push notification
             KeychainWrapper.sharedAppContainerKeychain.removeObject(forKey: "apnsToken", withAccessibility: .afterFirstUnlock)
             let center = UNUserNotificationCenter.current()