Skip to content

Correctly pass Pinpoint ID (or null if it's not there) to Cognito User Pool #3060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 19, 2022
Merged

Correctly pass Pinpoint ID (or null if it's not there) to Cognito User Pool #3060

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32a6d34
Correctly pass Pinpoint ID (or null if it's not there) to Cognito Use…
Nov 4, 2022
b58a1aa
Merge branch 'main' into leint/fix-pinpoint-cognito-integration
tjleing Nov 11, 2022
9a8e66d
Merge branch 'main' into leint/fix-pinpoint-cognito-integration
tjleing Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions aws-android-sdk-mobile-client/src/main/java/com/amazonaws/mobile/client/AWSMobileClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,9 @@ public void onUserSignedOut() {
mUserPoolPoolId = userPoolJSON.getString("PoolId");
final String clientId = userPoolJSON.getString("AppClientId");
final String clientSecret = userPoolJSON.optString("AppClientSecret");
final String pinpointEndpointId = CognitoPinpointSharedContext.getPinpointEndpoint(context, userPoolJSON.optString("PinpointAppId"));
// only attach user pool to Pinpoint if customer specifies an app ID
String pinpointAppId = userPoolJSON.optString("PinpointAppId");
pinpointAppId = pinpointAppId.equals("") ? null : pinpointAppId;
final String cognitoUserPoolCustomEndpoint = userPoolJSON.optString(COGNITO_USERPOOL_CUSTOM_ENDPOINT);

final ClientConfiguration clientConfig = new ClientConfiguration();
Expand All @@ -601,7 +603,7 @@ public void onUserSignedOut() {

userpoolsLoginKey = String.format("cognito-idp.%s.amazonaws.com/%s", userPoolJSON.getString("Region"), userPoolJSON.getString("PoolId"));

userpool = new CognitoUserPool(mContext, mUserPoolPoolId, clientId, clientSecret, userpoolLL, pinpointEndpointId, cognitoUserPoolCustomEndpoint);
userpool = new CognitoUserPool(mContext, mUserPoolPoolId, clientId, clientSecret, userpoolLL, pinpointAppId, cognitoUserPoolCustomEndpoint);
userpool.setPersistenceEnabled(mIsPersistenceEnabled);

mDeviceOperations = new DeviceOperations(AWSMobileClient.this, userpoolLL);
Expand Down