Merge pull request #8703 from woocommerce/feat/8453-product-password-protected-visibility

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/ProductSettingsViewModel.swift

@@ -44,7 +44,8 @@ final class ProductSettingsViewModel {
             sections = Self.configureSections(productSettings,
                                               productType: product.productType)
             /// If nil, we fetch the password from site post API because it was never fetched
-            if password == nil {
+            /// Skip this if the user is not authenticated with WPCom.
+            if password == nil && ServiceLocator.stores.isAuthenticatedWithoutWPCom == false {
                 retrieveProductPassword(siteID: product.siteID, productID: product.productID) { [weak self] (password, error) in
                     guard let self = self else {
                         return

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,9 +67,10 @@ final class ProductVisibilityViewController: UIViewController {
     private func reloadSections() {
         if visibility == .passwordProtected {
             sections = [Section(rows: [.publicVisibility, .passwordVisibility, .passwordField, .privateVisibility])]
-        }
-        else {
+        } else if showsPasswordProtectedVisibility {
             sections = [Section(rows: [.publicVisibility, .passwordVisibility, .privateVisibility])]
+        } else {
+            sections = [Section(rows: [.publicVisibility, .privateVisibility])]
         }
         tableView.reloadData()
     }

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormRemoteActionUseCase.swift

@@ -240,8 +240,9 @@ private extension ProductFormRemoteActionUseCase {
     func updatePasswordRemotely(product: EditableProductModel,
                                 password: String?,
                                 onCompletion: @escaping (Result<String?, Error>) -> Void) {
-        // Only update product password if available.
-        guard let updatedPassword = password else {
+        // Only update product password if available and user is authenticated with WPCom.
+        guard let updatedPassword = password,
+              stores.isAuthenticatedWithoutWPCom == false else {
             onCompletion(.success(password))
             return
         }