fix: honor authenticationFlowType from config (#2377)

* fix: honor authenticationFlowType from config if set

* PR feedback

Author: rjuliano

aws-android-sdk-mobile-client/src/main/java/com/amazonaws/mobile/client/AWSMobileClient.java

@@ -1206,20 +1206,33 @@ public void onSuccess(CognitoUserSession userSession, CognitoDevice newDevice) {
                             @Override
                             public void getAuthenticationDetails(AuthenticationContinuation authenticationContinuation, String userId) {
                                 Log.d(TAG, "Sending password.");
+                                final HashMap<String, String> authParameters = new HashMap<>();
+                                // Check if the auth flow type setting is in the configuration.
+                                boolean authFlowTypeInConfig =
+                                    awsConfiguration.optJsonObject(AUTH_KEY) != null &&
+                                    awsConfiguration.optJsonObject(AUTH_KEY).has("authenticationFlowType");
+
                                 try {
-                                    if (
-                                            awsConfiguration.optJsonObject(AUTH_KEY) != null &&
-                                            awsConfiguration.optJsonObject(AUTH_KEY).has("authenticationFlowType") &&
-                                            awsConfiguration.optJsonObject(AUTH_KEY).getString("authenticationFlowType").equals("CUSTOM_AUTH")
-                                    ) {
-                                        final HashMap<String, String> authParameters = new HashMap<String, String>();
+                                    String authFlowType = authFlowTypeInConfig ?
+                                        awsConfiguration.optJsonObject(AUTH_KEY).getString("authenticationFlowType") :
+                                        null;
+                                    // If there's a value in the config and it's CUSTOM_AUTH
+                                    if (authFlowTypeInConfig && "CUSTOM_AUTH".equals(authFlowType)) {
                                         if (password != null) {
                                             authenticationContinuation.setAuthenticationDetails(new AuthenticationDetails(username, password, authParameters, validationData));
                                         } else {
                                             authenticationContinuation.setAuthenticationDetails(new AuthenticationDetails(username, authParameters, validationData));
                                         }
                                     } else {
-                                        authenticationContinuation.setAuthenticationDetails(new AuthenticationDetails(username, password, validationData));
+                                        // Otherwise, create the AuthenticationDetails instance using the constructor below
+                                        // which will default the auth flow to CHLG_TYPE_USER_PASSWORD_VERIFIER
+                                        AuthenticationDetails authenticationDetails = new AuthenticationDetails(username, password, validationData);
+                                        if (authFlowTypeInConfig) {
+                                            // If there's an auth flow type value in the config, use that value instead.
+                                            // The field names are very misleading.
+                                            authenticationDetails.setAuthenticationType(awsConfiguration.optJsonObject(AUTH_KEY).getString("authenticationFlowType"));
+                                        }
+                                        authenticationContinuation.setAuthenticationDetails(authenticationDetails);
                                     }
                                 } catch (JSONException e) {
                                     e.printStackTrace();