Skip to content

Commit ab41f41

Browse files
Propagate the app passwords generation failure as received
1 parent d54b016 commit ab41f41

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsNetwork.kt

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,11 @@ class ApplicationPasswordsNetwork @Inject constructor(
105105
}
106106

107107
is ApplicationPasswordCreationResult.NotSupported -> {
108+
val networkError = credentialsResult.originalError.toWPAPINetworkError()
108109
if (listener.isPresent) {
109-
listener.get().onFeatureUnavailable(site, credentialsResult.originalError.toWPAPINetworkError())
110+
listener.get().onFeatureUnavailable(site, networkError)
110111
}
111-
return WPAPIResponse.Error(
112-
WPAPINetworkError(
113-
baseError = credentialsResult.originalError.toWPAPINetworkError(),
114-
errorCode = APPLICATION_PASSWORDS_NOT_SUPPORT_ERROR_CODE
115-
)
116-
)
112+
return WPAPIResponse.Error(networkError)
117113
}
118114
}
119115

@@ -187,10 +183,6 @@ class ApplicationPasswordsNetwork @Inject constructor(
187183
clazz: Class<T>,
188184
params: Map<String, String>
189185
) = executeGsonRequest(site, HttpMethod.DELETE, path, clazz, params)
190-
191-
companion object {
192-
const val APPLICATION_PASSWORDS_NOT_SUPPORT_ERROR_CODE = "application_passwords_not_supported"
193-
}
194186
}
195187

196188
private fun BaseNetworkError.toWPAPINetworkError(): WPAPINetworkError {

libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/JetpackApplicationPasswordsErrorHandler.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ class JetpackApplicationPasswordsErrorHandler @Inject constructor(
2020
httpStatusCode == FORBIDDEN ||
2121
httpStatusCode == TOO_MANY_REQUESTS ||
2222
apiErrorCode == "incorrect_password" ||
23-
apiErrorCode == "application_passwords_disabled_for_user" ||
24-
apiErrorCode == ApplicationPasswordsNetwork.APPLICATION_PASSWORDS_NOT_SUPPORT_ERROR_CODE
23+
apiErrorCode == "application_passwords_disabled_for_user"
2524
) {
2625
AppLog.w(
2726
AppLog.T.API,

0 commit comments

Comments
 (0)