Merge branch 'trunk' into feat/7318-localnotification-dismiss-action-tracking

# Conflicts:
#	WooCommerce/Classes/ViewRelated/AppCoordinator.swift

Author: jaclync

Gemfile.lock

@@ -1,19 +1,21 @@
 GIT
   remote: [email protected]:wordpress-mobile/release-toolkit
-  revision: a4d04a43125d84288e46ea38b893d001cd660a3b
+  revision: 57e9ad1c7311b076d7c273cd176073748299fdca
   branch: trunk
   specs:
-    fastlane-plugin-wpmreleasetoolkit (4.2.0)
+    fastlane-plugin-wpmreleasetoolkit (5.1.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
       diffy (~> 3.3)
       git (~> 1.3)
+      google-cloud-storage (~> 1.31)
       jsonlint (~> 0.3)
       nokogiri (~> 1.11)
       octokit (~> 4.18)
       parallel (~> 1.14)
+      plist (~> 3.1)
       progress_bar (~> 1.3)
       rake (>= 12.3, < 14.0)
       rake-compiler (~> 1.0)
@@ -23,7 +25,7 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (5.2.8)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -104,7 +106,7 @@ GEM
       highline (~> 2.0.0)
     concurrent-ruby (1.1.10)
     declarative (0.0.20)
-    diffy (3.4.0)
+    diffy (3.4.2)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
@@ -134,8 +136,8 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -233,7 +235,7 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.1)
     json (2.6.1)
@@ -245,23 +247,23 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.2)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.13.6)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-darwin)
+    nokogiri (1.13.8-x86_64-darwin)
       racc (~> 1.4)
-    octokit (4.23.0)
+    octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    oj (3.13.13)
+    oj (3.13.17)
     optimist (3.0.1)
     options (2.3.2)
     optparse (0.1.1)
@@ -306,7 +308,7 @@ GEM
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    sawyer (0.9.1)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     security (0.1.3)
@@ -328,7 +330,7 @@ GEM
       tty-cursor (~> 0.7)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)

Podfile

@@ -42,7 +42,7 @@ 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.0.1'
+  pod 'WordPressAuthenticator', '~> 2.1.0-beta.3'
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
   # 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.0.1):
+  - WordPressAuthenticator (2.1.0-beta.3):
     - 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.0.1)
+  - WordPressAuthenticator (~> 2.1.0-beta.3)
   - 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: 7f41297c3ac33ff19a65cb84950c6260932e47c0
+  WordPressAuthenticator: 5882d5ba6084a20c0e660950363e456162a11296
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 3112ab60d6ff0779572bbc86e380a622138ccc64
+PODFILE CHECKSUM: 918b977da8de7fa51654420e8011f30808657095
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -1,15 +1,22 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+9.8
+-----
+- [***] Login: Introduce a way to sign in using store credentials.  [https://github.com/woocommerce/woocommerce-ios/pull/7320]
+- [*] In-Person Payments: The purchase card reader information card appears also in the Orders list screen. [https://github.com/woocommerce/woocommerce-ios/pull/7326]
+
 9.7
-----
+-----
 - [***] Orders: Orders can now be edited within the app. [https://github.com/woocommerce/woocommerce-ios/pull/7300]
+- [**] Orders: You can now view the Custom Fields for an order in the Order Details screen. [https://github.com/woocommerce/woocommerce-ios/pull/7310]
 - [*] In-Person Payments: Card Reader Manuals now appear based on country availability, consolidated into an unique view [https://github.com/woocommerce/woocommerce-ios/pull/7178]
 - [*] Login: Jetpack setup flow is now accessible from the Login with Store Address flow. [https://github.com/woocommerce/woocommerce-ios/pull/7294]
 - [*] In-Person Payments: The purchase card reader information card can be dismissed [https://github.com/woocommerce/woocommerce-ios/pull/7260]
 - [*] In-Person Payments: When dismissing the purchase card reader information card, the user can choose to be reminded in 14 days. [https://github.com/woocommerce/woocommerce-ios/pull/7271]
+- [*] In-Person Payments: The purchase card reader information card appears also in the App Settings screen. [https://github.com/woocommerce/woocommerce-ios/pull/7308]
 - [*] Refund lines in the Order details screen now appear ordered from oldest to newest [https://github.com/woocommerce/woocommerce-ios/pull/7287]
 - [*] Login: when the app is in logged out state, an onboarding screen is shown before the prologue screen if the user hasn't finished or skipped it.  [https://github.com/woocommerce/woocommerce-ios/pull/7324]
-- [**] Orders: You can now view the Custom Fields for an order in the Order Details screen. [https://github.com/woocommerce/woocommerce-ios/pull/7310]
+- [*] Orders: When a store has no orders yet, there is an updated message with a link to learn more on the Orders tab. [https://github.com/woocommerce/woocommerce-ios/pull/7328]
 
 9.6
 -----

WooCommerce/Classes/AppDelegate.swift

@@ -141,7 +141,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             )
 
             // show this notification seconds from now
-            let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1.5, repeats: false)
+            let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 3, repeats: false)
 
             // choose a random identifier
             let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: trigger)
@@ -421,7 +421,7 @@ extension AppDelegate {
 
 extension AppDelegate: UNUserNotificationCenterDelegate {
     func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse) async {
-        await ServiceLocator.pushNotesManager.handleUserResponseToNotification(response: response)
+        await ServiceLocator.pushNotesManager.handleUserResponseToNotification(response)
     }
 
     func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification) async -> UNNotificationPresentationOptions {

WooCommerce/Classes/Authentication/AuthenticationConstants.swift

@@ -21,8 +21,8 @@ struct AuthenticationConstants {
     /// What is WordPress.com? link (Continue with WordPress.com)
     ///
     static let whatIsWPComLinkTitle = NSLocalizedString(
-        "_What is WordPress.com?_",
-        comment: "Navigates to page with details about What is WordPress.com. The underscores _..._ denote underline."
+        "What is WordPress.com?",
+        comment: "Navigates to page with details about What is WordPress.com."
     )
 
     /// Login with Jetpack instructions.
@@ -58,6 +58,13 @@ struct AuthenticationConstants {
         comment: "Button title. Takes the user to the login by store address flow."
     )
 
+    /// Title of "Sign in with store credentials" button
+    //
+    static let signInWithSiteCredsButtonTitle = NSLocalizedString(
+        "Sign in with store credentials",
+        comment: "Button title. Takes the user to the site credentials entry screen."
+    )
+
     /// Title of views in Unified Login
     //
     static let loginTitle = NSLocalizedString(

WooCommerce/Classes/Authentication/AuthenticationManager.swift

@@ -45,7 +45,9 @@ class AuthenticationManager: Authentication {
                                                                 enableSignInWithApple: true,
                                                                 enableSignupWithGoogle: false,
                                                                 enableUnifiedAuth: true,
-                                                                continueWithSiteAddressFirst: true)
+                                                                continueWithSiteAddressFirst: true,
+                                                                enableSiteCredentialsLoginForSelfHostedSites: true,
+                                                                isWPComLoginRequiredForSiteCredentialsLogin: true)
 
         let systemGray3LightModeColor = UIColor(red: 199/255.0, green: 199/255.0, blue: 204/255.0, alpha: 1)
         let systemLabelLightModeColor = UIColor(red: 0, green: 0, blue: 0, alpha: 1)
@@ -85,6 +87,7 @@ class AuthenticationManager: Authentication {
                                                                   usernamePasswordInstructions: AuthenticationConstants.usernamePasswordInstructions,
                                                                   continueWithWPButtonTitle: AuthenticationConstants.continueWithWPButtonTitle,
                                                                   enterYourSiteAddressButtonTitle: AuthenticationConstants.enterYourSiteAddressButtonTitle,
+                                                                  signInWithSiteCredentialsButtonTitle: AuthenticationConstants.signInWithSiteCredsButtonTitle,
                                                                   findSiteButtonTitle: AuthenticationConstants.findYourStoreAddressButtonTitle,
                                                                   signupTermsOfService: AuthenticationConstants.signupTermsOfService,
                                                                   whatIsWPComLinkTitle: AuthenticationConstants.whatIsWPComLinkTitle,
@@ -260,6 +263,15 @@ extension AuthenticationManager: WordPressAuthenticatorDelegate {
     /// Presents the Login Epilogue, in the specified NavigationController.
     ///
     func presentLoginEpilogue(in navigationController: UINavigationController, for credentials: AuthenticatorCredentials, onDismiss: @escaping () -> Void) {
+        let matcher = ULAccountMatcher()
+        matcher.refreshStoredSites()
+
+        /// Jetpack is required. Present an error if we don't detect a valid installation for a self-hosted site.
+        if let urlFromCredentials = credentials.wpcom?.siteURL ?? credentials.wporg?.siteURL,
+           isJetpackValidForSelfHostedSite(url: urlFromCredentials) {
+            return presentJetpackError(for: urlFromCredentials, with: credentials, in: navigationController, onDismiss: onDismiss)
+        }
+
         // We are currently supporting WPCom credentials only
         // Update this when handling store credentials authentication.
         guard let wpcomLogin = credentials.wpcom else {
@@ -270,16 +282,7 @@ extension AuthenticationManager: WordPressAuthenticatorDelegate {
             ServiceLocator.pushNotesManager.cancelLocalNotification(scenarios: [.loginSiteAddressError])
         }
 
-        let matcher = ULAccountMatcher()
-        matcher.refreshStoredSites()
-
         guard matcher.match(originalURL: wpcomLogin.siteURL) else {
-
-            /// Jetpack is required. Present an error if we don't detect a valid installation for a self-hosted site.
-            if isJetpackValidForSelfHostedSite(url: wpcomLogin.siteURL) {
-                return presentJetpackError(for: wpcomLogin.siteURL, with: credentials, in: navigationController, onDismiss: onDismiss)
-            }
-
             DDLogWarn("⚠️ Present account mismatch error for site: \(String(describing: credentials.wpcom?.siteURL))")
             let viewModel = WrongAccountErrorViewModel(siteURL: credentials.wpcom?.siteURL)
             let mismatchAccountUI = ULAccountMismatchViewController(viewModel: viewModel)
@@ -447,6 +450,7 @@ private extension AuthenticationManager {
                              in navigationController: UINavigationController,
                              onDismiss: @escaping () -> Void) {
         let viewModel = JetpackErrorViewModel(siteURL: siteURL, onJetpackSetupCompletion: { [weak self] in
+            self?.currentSelfHostedSite = nil
             self?.presentLoginEpilogue(in: navigationController, for: credentials, onDismiss: onDismiss)
         })
         let installJetpackUI = ULErrorViewController(viewModel: viewModel)

WooCommerce/Classes/Notifications/PushNotificationsManager.swift

@@ -47,7 +47,7 @@ final class PushNotificationsManager: PushNotesManager {
 
     /// An observable that emits values when a local notification is received.
     ///
-    var localNotificationResponses: AnyPublisher<UNNotificationResponse, Never> {
+    var localNotificationUserResponses: AnyPublisher<UNNotificationResponse, Never> {
         localNotificationResponsesSubject.eraseToAnyPublisher()
     }
 
@@ -268,27 +268,25 @@ extension PushNotificationsManager {
     }
 
     @MainActor
-    func handleUserResponseToNotification(response: UNNotificationResponse) async {
+    func handleUserResponseToNotification(_ response: UNNotificationResponse) async {
         // Remote notification response is handled separately.
         if let notification = PushNotification.from(userInfo: response.notification.request.content.userInfo) {
             handleRemoteNotificationInAllAppStates(response.notification.request.content.userInfo)
-            return await handleInactiveRemoteNotification(notification: notification)
+            await handleInactiveRemoteNotification(notification: notification)
         } else {
             localNotificationResponsesSubject.send(response)
         }
     }
 
-    /// Handles a Notification while in Background Mode
-    ///
-    /// - Parameters:
-    ///     - userInfo: The Notification's Payload
-    ///     - completionHandler: A callback, to be executed on completion
-    ///
-    /// - Returns: True when handled. False otherwise
+    /// Handles a remote notification while the app is in the background.
     ///
+    /// - Parameter userInfo: The notification's payload.
+    /// - Returns: Whether there is any data fetched in the background.
     @MainActor
     func handleRemoteNotificationInTheBackground(userInfo: [AnyHashable: Any]) async -> UIBackgroundFetchResult {
-        guard applicationState == .background, let _ = userInfo[APNSKey.identifier] else {
+        guard applicationState == .background, // Proceeds only if the app is in background.
+              let _ = userInfo[APNSKey.identifier] // Ensures that we are only processing a remote notification.
+        else {
             return .noData
         }
 
@@ -452,14 +450,9 @@ private extension PushNotificationsManager {
         _ = handleSupportNotification(userInfo)
     }
 
-    /// Handles a Remote Notification while in Inactive Mode
-    ///
-    /// - Parameters:
-    ///     - userInfo: The Notification's Payload
-    ///     - completionHandler: A callback, to be executed on completion
-    ///
-    /// - Returns: True when handled. False otherwise
+    /// Handles a remote notification while the app is inactive.
     ///
+    /// - Parameter notification: Push notification content from a remote notification.
     func handleInactiveRemoteNotification(notification: PushNotification) async {
         guard applicationState == .inactive else {
             return

WooCommerce/Classes/ServiceLocator/PushNotesManager.swift

@@ -22,7 +22,7 @@ protocol PushNotesManager {
 
     /// An observable that emits values when a local notification response is received.
     ///
-    var localNotificationResponses: AnyPublisher<UNNotificationResponse, Never> { get }
+    var localNotificationUserResponses: AnyPublisher<UNNotificationResponse, Never> { get }
 
     /// Resets the Badge Count.
     ///
@@ -73,7 +73,7 @@ protocol PushNotesManager {
 
     /// Handles user's response to a local or remote notification.
     /// - Parameter response: The user's response to a notification.
-    func handleUserResponseToNotification(response: UNNotificationResponse) async
+    func handleUserResponseToNotification(_ response: UNNotificationResponse) async
 
     /// Handles a local or remote notification when the app is in the foreground.
     ///

WooCommerce/Classes/ViewModels/Feature Announcement Cards/FeatureAnnouncementCardViewModel.swift

@@ -16,7 +16,7 @@ class FeatureAnnouncementCardViewModel {
         config.message
     }
 
-    var buttonTitle: String {
+    var buttonTitle: String? {
         config.buttonTitle
     }
 
@@ -101,7 +101,7 @@ class FeatureAnnouncementCardViewModel {
         let campaign: FeatureAnnouncementCampaign
         let title: String
         let message: String
-        let buttonTitle: String
+        let buttonTitle: String?
         let image: UIImage
         let dismissAlertTitle: String
         let dismissAlertMessage: String