Revert "feat(aws-android-sdk-cognitoidentityprovider): support custom endpoint" (#2425)

Co-authored-by: Richard McClellan <[email protected]>

Author: thisisabhash

aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/mobileconnectors/cognitoidentityprovider/CognitoUserPool.java

@@ -274,6 +274,7 @@ public CognitoUserPool(Context context, String userPoolId, String clientId, Stri
         this.pinpointEndpointId = CognitoPinpointSharedContext.getPinpointEndpoint(context, pinpointAppId);
     }
 
+
     /**
      * Constructs a user-pool with default {@link ClientConfiguration}.
      *
@@ -302,37 +303,15 @@ public CognitoUserPool(Context context, String userPoolId, String clientId, Stri
      * @param pinpointAppId         REQUIRED: AWS Pinpoint App Id for analytics.
      */
     public CognitoUserPool(Context context, String userPoolId, String clientId, String clientSecret, AmazonCognitoIdentityProvider client, String pinpointAppId) {
-        this(context, userPoolId, clientId, clientSecret, client, pinpointAppId, null);
-    }
-
-    /**
-     * Constructs a user-pool with custom endpoint for Cognito User Pool
-     *
-     * @param context               REQUIRED: Android application context.
-     * @param userPoolId            REQUIRED: User-pool-Id of the user-pool.
-     * @param clientId              REQUIRED: Client-Id generated for this app and user-pool at the
-     *                              Cognito Identity Provider developer console.
-     * @param clientSecret          REQUIRED: Client Secret generated for this app and user-pool at
-     *                              the Cognito Identity Provider developer console.
-     * @param pinpointAppId         REQUIRED: AWS Pinpoint App Id for analytics.
-     * @param cognitoUserPoolCustomEndpoint REQUIRED: Custom endpoint for Cognito Userpool
-     */
-    public CognitoUserPool(Context context, String userPoolId, String clientId, String clientSecret, AmazonCognitoIdentityProvider client, String pinpointAppId, String cognitoUserPoolCustomEndpoint) {
         initialize(context);
         this.context = context;
         this.userPoolId = userPoolId;
         this.clientId = clientId;
         this.clientSecret = clientSecret;
         this.client = client;
         this.pinpointEndpointId = CognitoPinpointSharedContext.getPinpointEndpoint(context, pinpointAppId);
-
-        // check if the custom endpoint is not empty
-        if(cognitoUserPoolCustomEndpoint != null && !cognitoUserPoolCustomEndpoint.isEmpty()) {
-            this.client.setEndpoint(cognitoUserPoolCustomEndpoint);
-        }
     }
 
-
     private void initialize(final Context context) {
         this.awsKeyValueStore = new AWSKeyValueStore(context,
                 DEFAULT_SHARED_PREFERENCES_NAME,

aws-android-sdk-cognitoidentityprovider/src/test/java/CognitoIdentityProviderCustomEndPointTest.java

@@ -189,12 +189,6 @@ public final class AWSMobileClient implements AWSCredentialsProvider {
     private static final String FACEBOOK = "FacebookSignIn";
     private static final String GOOGLE = "GoogleSignIn";
     private static final String GOOGLE_WEBAPP_CONFIG_KEY = "ClientId-WebApp";
-
-    /**
-     * Configuration key for Cognito User Pool Custom Endpoint
-     */
-    private static final String COGNITO_USERPOOL_CUSTOM_ENDPOINT = "Endpoint";
-
     /**
      * Singleton instance for AWSMobileClient.
      */
@@ -563,7 +557,6 @@ public void onUserSignedOut() {
                             final String clientId = userPoolJSON.getString("AppClientId");
                             final String clientSecret = userPoolJSON.optString("AppClientSecret");
                             final String pinpointEndpointId = CognitoPinpointSharedContext.getPinpointEndpoint(context, userPoolJSON.optString("PinpointAppId"));
-                            final String cognitoUserPoolCustomEndpoint = userPoolJSON.optString(COGNITO_USERPOOL_CUSTOM_ENDPOINT);
 
                             final ClientConfiguration clientConfig = new ClientConfiguration();
                             clientConfig.setUserAgent(DEFAULT_USER_AGENT + " " + awsConfiguration.getUserAgent());
@@ -576,7 +569,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, pinpointEndpointId);
                             userpool.setPersistenceEnabled(mIsPersistenceEnabled);
 
                             mDeviceOperations = new DeviceOperations(AWSMobileClient.this, userpoolLL);