Hide password protected row on product visibility screen for user authenticated without wpcom

Author: itsmeichigo

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/ProductSettingsRows.swift

@@ -102,13 +102,18 @@ enum ProductSettingsRows {
         }
 
         func handleTap(sourceViewController: UIViewController, onCompletion: @escaping (ProductSettings) -> Void) {
-            // If the password was not fetched, the cell is not selectable
-            guard settings.password != nil else {
+            let passwordProtectedAvailable = ServiceLocator.stores.isAuthenticatedWithoutWPCom == false
+            /// If the password was not fetched for user authenticated with WPCom,
+            /// the cell is not selectable
+            if settings.password == nil && passwordProtectedAvailable {
                 return
             }
 
             ServiceLocator.analytics.track(.productSettingsVisibilityTapped)
-            let viewController = ProductVisibilityViewController(settings: settings) { (productSettings) in
+            let viewController = ProductVisibilityViewController(
+                settings: settings,
+                showsPasswordProtectedVisibility: passwordProtectedAvailable
+            ) { (productSettings) in
                 self.settings.password = productSettings.password
                 self.settings.status = productSettings.status
                 onCompletion(self.settings)

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/Visibility/ProductVisibilityViewController.swift

@@ -13,6 +13,7 @@ final class ProductVisibilityViewController: UIViewController {
     private let onCompletion: Completion
 
     private let productSettings: ProductSettings
+    private let showsPasswordProtectedVisibility: Bool
 
     private var visibility: ProductVisibility = .public
 
@@ -25,9 +26,10 @@ final class ProductVisibilityViewController: UIViewController {
 
     /// Init
     ///
-    init(settings: ProductSettings, completion: @escaping Completion) {
+    init(settings: ProductSettings, showsPasswordProtectedVisibility: Bool, completion: @escaping Completion) {
         productSettings = settings
         onCompletion = completion
+        self.showsPasswordProtectedVisibility = showsPasswordProtectedVisibility
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -65,7 +67,7 @@ final class ProductVisibilityViewController: UIViewController {
     private func reloadSections() {
         if visibility == .passwordProtected {
             sections = [Section(rows: [.publicVisibility, .passwordVisibility, .passwordField, .privateVisibility])]
-        } else if productSettings.password != nil {
+        } else if showsPasswordProtectedVisibility {
             sections = [Section(rows: [.publicVisibility, .passwordVisibility, .privateVisibility])]
         } else {
             sections = [Section(rows: [.publicVisibility, .privateVisibility])]