Merge pull request #7524 from woocommerce/issue/7523-account-mismatch-http

Login: Fix issue log in to a site with HTTP only

Author: itsmeichigo

Podfile

@@ -42,8 +42,8 @@ target 'WooCommerce' do
   pod 'Gridicons', '~> 1.2.0'
 
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  pod 'WordPressAuthenticator', '~> 2.2.1-beta.3'
-  #   pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '7cdd0c6e44fb1f5356a974cdd6a05c3d2d5210f6'
+  pod 'WordPressAuthenticator', '~> 2.2.1-beta.5'
+#     pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '1687e5573d611f98859aefa0439b3f48979dcbd0'
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
   # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
 

Podfile.lock

@@ -42,7 +42,7 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (2.2.1-beta.3):
+  - WordPressAuthenticator (2.2.1-beta.5):
     - Alamofire (~> 4.8)
     - CocoaLumberjack (~> 3.5)
     - GoogleSignIn (~> 6.0.1)
@@ -92,7 +92,7 @@ DEPENDENCIES:
   - Sourcery (~> 1.0.3)
   - StripeTerminal (~> 2.7)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 2.2.1-beta.3)
+  - WordPressAuthenticator (~> 2.2.1-beta.5)
   - WordPressKit (~> 4.49.0)
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.5)
@@ -163,7 +163,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: 40d028b26ceeb093620d3748198f142f4e416e65
+  WordPressAuthenticator: e898a1e3a297607534b18520921e3fc9e7ccf7b4
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 2f80965199751d9b642db8d680aa08c11547a548
+PODFILE CHECKSUM: a0cb10fb7598f064a8b7e16a115bfd1923918cf8
 
 COCOAPODS: 1.11.2

WooCommerce/Classes/Authentication/ULAccountMatcher.swift

@@ -43,8 +43,8 @@ final class ULAccountMatcher {
         }
 
         return sites
-            .map { $0.url }
-            .contains(originalURL)
+            .map { $0.url.trimHTTPScheme() }
+            .contains(originalURL.trimHTTPScheme())
     }
 
     /// Returns a locally stored site that matches the given site URL.
@@ -59,7 +59,7 @@ final class ULAccountMatcher {
             return nil
         }
 
-        return sites.first { $0.url == originalURL }
+        return sites.first { $0.url.contains(originalURL.trimHTTPScheme()) }
     }
 
     /// Refreshes locally stored sites that were synced previously.