Merge pull request #5474 from woocommerce/feat/5360-login-with-site-address-jcp

Jetpack CP: enable logging in with site address

Author: jaclync

WooCommerce/Classes/Extensions/WordPressComSiteInfo+Woo.swift

@@ -5,8 +5,12 @@ extension WordPressComSiteInfo {
     /// Encapsulates the rules that declare a WordPress site as having a valid
     /// Jetpack installation
     var hasValidJetpack: Bool {
-        return hasJetpack &&
-            isJetpackConnected &&
-            isJetpackActive
+        if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.jetpackConnectionPackageSupport) {
+            return isJetpackConnected
+        } else {
+            return hasJetpack &&
+                isJetpackConnected &&
+                isJetpackActive
+        }
     }
 }

WooCommerce/WooCommerceTests/Extensions/WordPressComSiteInfoWooTests.swift

@@ -9,18 +9,54 @@ final class WordPressComSiteInfoWooTests: XCTestCase {
         XCTAssertTrue(infoSite.hasValidJetpack)
     }
 
-    func test_is_not_valid_when_site_does_not_have_jetpack() {
+    func test_is_not_valid_when_site_does_not_have_jetpack_with_jcp_feature_off() {
+        // Given
+        let featureFlagService = MockFeatureFlagService(isJetpackConnectionPackageSupportOn: false)
+        ServiceLocator.setFeatureFlagService(featureFlagService)
+
+        // When
         let infoSite = WordPressComSiteInfo(remote: doesNotHaveJetpack())
 
+        // Then
         XCTAssertFalse(infoSite.hasValidJetpack)
     }
 
-    func test_is_not_valid_when_site_has_jetpack_installed_but_not_active() {
+    func test_is_valid_when_site_does_not_have_jetpack_with_jcp_feature_on() {
+        // Given
+        let featureFlagService = MockFeatureFlagService(isJetpackConnectionPackageSupportOn: true)
+        ServiceLocator.setFeatureFlagService(featureFlagService)
+
+        // When
+        let infoSite = WordPressComSiteInfo(remote: doesNotHaveJetpack())
+
+        // Then
+        XCTAssertTrue(infoSite.hasValidJetpack)
+    }
+
+    func test_is_not_valid_when_site_has_jetpack_installed_but_not_active_with_jcp_feature_off() {
+        // Given
+        let featureFlagService = MockFeatureFlagService(isJetpackConnectionPackageSupportOn: false)
+        ServiceLocator.setFeatureFlagService(featureFlagService)
+
+        // When
         let infoSite = WordPressComSiteInfo(remote: hasJetpackInactive())
 
+        // Then
         XCTAssertFalse(infoSite.hasValidJetpack)
     }
 
+    func test_is_not_valid_when_site_has_jetpack_installed_but_not_active_with_jcp_feature_on() {
+        // Given
+        let featureFlagService = MockFeatureFlagService(isJetpackConnectionPackageSupportOn: true)
+        ServiceLocator.setFeatureFlagService(featureFlagService)
+
+        // When
+        let infoSite = WordPressComSiteInfo(remote: hasJetpackInactive())
+
+        // Then
+        XCTAssertTrue(infoSite.hasValidJetpack)
+    }
+
     func test_is_not_valid_when_site_has_jetpack_installed_but_not_connected() {
         let infoSite = WordPressComSiteInfo(remote: hasJetpackNotConnected())
 

WooCommerce/WooCommerceTests/Mocks/MockFeatureFlagService.swift

@@ -8,19 +8,22 @@ struct MockFeatureFlagService: FeatureFlagService {
     private let isShippingLabelsPackageCreationOn: Bool
     private let isShippingLabelsMultiPackageOn: Bool
     private let isPushNotificationsForAllStoresOn: Bool
+    private let isJetpackConnectionPackageSupportOn: Bool
 
     init(isShippingLabelsM2M3On: Bool = false,
          isInternationalShippingLabelsOn: Bool = false,
          isShippingLabelsPaymentMethodCreationOn: Bool = false,
          isShippingLabelsPackageCreationOn: Bool = false,
          isShippingLabelsMultiPackageOn: Bool = false,
-         isPushNotificationsForAllStoresOn: Bool = false) {
+         isPushNotificationsForAllStoresOn: Bool = false,
+         isJetpackConnectionPackageSupportOn: Bool = false) {
         self.isShippingLabelsM2M3On = isShippingLabelsM2M3On
         self.isInternationalShippingLabelsOn = isInternationalShippingLabelsOn
         self.isShippingLabelsPaymentMethodCreationOn = isShippingLabelsPaymentMethodCreationOn
         self.isShippingLabelsPackageCreationOn = isShippingLabelsPackageCreationOn
         self.isShippingLabelsMultiPackageOn = isShippingLabelsMultiPackageOn
         self.isPushNotificationsForAllStoresOn = isPushNotificationsForAllStoresOn
+        self.isJetpackConnectionPackageSupportOn = isJetpackConnectionPackageSupportOn
     }
 
     func isFeatureFlagEnabled(_ featureFlag: FeatureFlag) -> Bool {
@@ -37,6 +40,8 @@ struct MockFeatureFlagService: FeatureFlagService {
             return isShippingLabelsMultiPackageOn
         case .pushNotificationsForAllStores:
             return isPushNotificationsForAllStoresOn
+        case .jetpackConnectionPackageSupport:
+            return isJetpackConnectionPackageSupportOn
         default:
             return false
         }