Merge pull request #7986 from woocommerce/fix/7891-signup-username-error

Account creation: handle email-based username error by generating another fallback username

Author: jaclync

Networking/Networking/Remote/AccountRemote.swift

@@ -233,7 +233,7 @@ public enum CreateAccountError: Error, Equatable {
                 self = .invalidEmail
             case Constants.invalidPassword:
                 self = .invalidPassword(message: message)
-            case Constants.invalidUsername:
+            case Constants.invalidUsername, Constants.usernameExists:
                 self = .invalidUsername
             default:
                 self = .unexpected(error: error)
@@ -249,6 +249,7 @@ public enum CreateAccountError: Error, Equatable {
         static let emailExists = "email_exists"
         static let invalidEmail = "email_invalid"
         static let invalidPassword = "password_invalid"
-        static let invalidUsername = "username_exists"
+        static let usernameExists = "username_exists"
+        static let invalidUsername = "username_invalid"
     }
 }

Yosemite/Yosemite/Stores/AccountCreationStore.swift

@@ -44,9 +44,7 @@ private extension AccountCreationStore {
     func createAccount(email: String, password: String, completion: @escaping (Result<CreateAccountResult, CreateAccountError>) -> Void) {
         Task { @MainActor in
             // Auto-generates a username based on the email.
-            let usernameSuggestionsResult = await remote.loadUsernameSuggestions(from: email)
-            guard case let .success(usernameSuggestions) = usernameSuggestionsResult,
-            let username = usernameSuggestions.first else {
+            guard let username = await generateUsername(base: email) else {
                 return completion(.failure(.invalidUsername))
             }
             // Creates a WPCOM account.
@@ -55,7 +53,41 @@ private extension AccountCreationStore {
                                                     password: password,
                                                     clientID: dotcomClientID,
                                                     clientSecret: dotcomClientSecret)
-            completion(result)
+            switch result {
+            case .failure(let error) where error == .invalidUsername:
+                // Because the username is automatically generated based on the email,
+                // when there is an error on the username (e.g. when the username contains certain
+                // keywords like `wordpress`) we want to auto-generate another username using a
+                // known base so that the user is not blocked on the internal bug where
+                // `remote.loadUsernameSuggestions` returns an invalid username.
+                guard let fallbackUsername = await generateUsername(base: Constants.fallbackUsernameBase) else {
+                    return completion(.failure(.invalidUsername))
+                }
+                // Creates a WPCOM account with the fallback username.
+                let result = await remote.createAccount(email: email,
+                                                        username: fallbackUsername,
+                                                        password: password,
+                                                        clientID: dotcomClientID,
+                                                        clientSecret: dotcomClientSecret)
+                completion(result)
+            default:
+                completion(result)
+            }
+        }
+    }
+
+    func generateUsername(base: String) async -> String? {
+        let usernameSuggestionsResult = await remote.loadUsernameSuggestions(from: base)
+        guard case let .success(usernameSuggestions) = usernameSuggestionsResult,
+              let username = usernameSuggestions.first else {
+            return nil
         }
+        return username
+    }
+}
+
+private extension AccountCreationStore {
+    enum Constants {
+        static let fallbackUsernameBase = "woomerchant"
     }
 }