Merge pull request #2985 from wordpress-mobile/issue/detect-captcha-pattern

Author: ThomazFB

fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/Nonce.kt

@@ -19,6 +19,7 @@ sealed interface Nonce {
     enum class CookieNonceErrorType {
         NOT_AUTHENTICATED,
         INVALID_RESPONSE,
+        INVALID_CREDENTIALS,
         CUSTOM_LOGIN_URL,
         CUSTOM_ADMIN_URL,
         INVALID_NONCE,

fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/NonceRestClient.kt

@@ -69,11 +69,18 @@ class NonceRestClient @Inject constructor(
                 // that it's an authentication issue, otherwise we'll assume it's an invalid response
                 val errorMessage = extractErrorMessage(response.data.orEmpty())
 
+                val errorType = if (hasInvalidCredentialsPattern(response.data.orEmpty())) {
+                    Nonce.CookieNonceErrorType.INVALID_CREDENTIALS
+                } else if (errorMessage != null) {
+                    Nonce.CookieNonceErrorType.NOT_AUTHENTICATED
+                } else {
+                    Nonce.CookieNonceErrorType.INVALID_RESPONSE
+                }
+
                 FailedRequest(
                     timeOfResponse = currentTimeProvider.currentDate().time,
                     username = username,
-                    type = if (errorMessage != null) Nonce.CookieNonceErrorType.NOT_AUTHENTICATED
-                    else Nonce.CookieNonceErrorType.INVALID_RESPONSE,
+                    type = errorType,
                     errorMessage = errorMessage
                 )
             }
@@ -145,4 +152,11 @@ class NonceRestClient @Inject constructor(
         return HtmlUtils.fastStripHtml(errorHtml)
             .trim(' ', '\n')
     }
+
+    private fun hasInvalidCredentialsPattern(htmlResponse: String) =
+        htmlResponse.contains(INVALID_CREDENTIAL_HTML_PATTERN)
+
+    companion object {
+        const val INVALID_CREDENTIAL_HTML_PATTERN = "document.querySelector('form').classList.add('shake')"
+    }
 }