Fix cognito userpools username null in custom auth flow fixes #583

minbi · minbi · commit c876b7847bde · 2019-01-31T09:12:00.000-08:00
diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/mobileconnectors/cognitoidentityprovider/CognitoUser.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/mobileconnectors/cognitoidentityprovider/CognitoUser.java
@@ -2757,7 +2757,7 @@ private InitiateAuthRequest initiateCustomAuthRequest(
         Map<String, String> authenticationParameters = authenticationDetails.getAuthenticationParameters();
         if (clientSecret != null &&
             authenticationParameters.get(CognitoServiceConstants.AUTH_PARAM_SECRET_HASH) == null) {
-            secretHash = CognitoSecretHash.getSecretHash(usernameInternal, clientId, clientSecret);
+            secretHash = CognitoSecretHash.getSecretHash(authenticationDetails.getUserId(), clientId, clientSecret);
             authenticationParameters.put(CognitoServiceConstants.AUTH_PARAM_SECRET_HASH, secretHash);
         }
         authRequest.setAuthParameters(authenticationDetails.getAuthenticationParameters());

Original file line number	Diff line number	Diff line change
`@@ -2757,7 +2757,7 @@ private InitiateAuthRequest initiateCustomAuthRequest(`
`2757`	`2757`	`Map<String, String> authenticationParameters = authenticationDetails.getAuthenticationParameters();`
`2758`	`2758`	`if (clientSecret != null &&`
`2759`	`2759`	`authenticationParameters.get(CognitoServiceConstants.AUTH_PARAM_SECRET_HASH) == null) {`
`2760`		`- secretHash = CognitoSecretHash.getSecretHash(usernameInternal, clientId, clientSecret);`
	`2760`	`+ secretHash = CognitoSecretHash.getSecretHash(authenticationDetails.getUserId(), clientId, clientSecret);`
`2761`	`2761`	`authenticationParameters.put(CognitoServiceConstants.AUTH_PARAM_SECRET_HASH, secretHash);`
`2762`	`2762`	`}`
`2763`	`2763`	`authRequest.setAuthParameters(authenticationDetails.getAuthenticationParameters());`