fix(cognito-identity): honor provided configuration headers (#5124)

Author: atierian

AWSCore/CognitoIdentity/AWSCognitoIdentityService.m

@@ -231,8 +231,15 @@ - (instancetype)initWithConfiguration:(AWSServiceConfiguration *)configuration {
 
         _configuration.baseURL = _configuration.endpoint.URL;
         _configuration.retryHandler = [[AWSCognitoIdentityRequestRetryHandler alloc] initWithMaximumRetryCount:_configuration.maxRetryCount];
-        _configuration.headers = @{@"Content-Type" : @"application/x-amz-json-1.1"}; 
-		
+
+        if (_configuration.headers == nil) {
+            _configuration.headers = @{@"Content-Type" : @"application/x-amz-json-1.1"};
+        } else {
+            NSMutableDictionary *headers = [[NSMutableDictionary alloc] initWithDictionary:_configuration.headers];
+            headers[@"Content-Type"] = @"application/x-amz-json-1.1";
+            _configuration.headers = headers;
+        }
+
         _networking = [[AWSNetworking alloc] initWithConfiguration:_configuration];
     }
 

AWSCoreUnitTests/AWSGeneralCognitoIdentityTests.m

@@ -105,6 +105,25 @@ - (void)testCreateIdentityPoolCompletionHandler {
     [AWSCognitoIdentity removeCognitoIdentityForKey:key];
 }
 
+- (void)testCreateIdentityPoolWithSuppliedHeaders {
+    AWSServiceConfiguration *configuration = [AWSTestUtility getDefaultServiceConfiguration];
+    configuration.headers = @{@"foo": @"bar"};
+    id key = @"test-with-headers";
+    [AWSCognitoIdentity registerCognitoIdentityWithConfiguration:configuration forKey:key];
+    AWSCognitoIdentity *cognitoIdentity = [AWSCognitoIdentity CognitoIdentityForKey:key];
+    NSDictionary *expected = @{@"foo": @"bar", @"Content-Type": @"application/x-amz-json-1.1"};
+    XCTAssertEqualObjects(cognitoIdentity.configuration.headers, expected, @"expected provided headers to be included in configuration object");
+}
+
+- (void)testCreateIdentityPoolNoSuppliedHeaders {
+    AWSServiceConfiguration *configuration = [AWSTestUtility getDefaultServiceConfiguration];
+    id key = @"test-without-headers";
+    [AWSCognitoIdentity registerCognitoIdentityWithConfiguration:configuration forKey:key];
+    AWSCognitoIdentity *cognitoIdentity = [AWSCognitoIdentity CognitoIdentityForKey:key];
+    NSDictionary *expected = @{@"Content-Type": @"application/x-amz-json-1.1"};
+    XCTAssertEqualObjects(cognitoIdentity.configuration.headers, expected, @"expected Content-Type header to be included");
+}
+
 - (void)testDeleteIdentities {
     NSString *key = @"testDeleteIdentities";
     AWSServiceConfiguration *configuration = [[AWSServiceConfiguration alloc] initWithRegion:AWSRegionUSEast1 credentialsProvider:nil];

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ## Unreleased
 
+### Bug Fixes
+
+- **CognitoIdentity**
+  - Don't overwrite AWSServiceConfiguration provided headers.
+
 ### Misc. Updates
 
 - Model updates for the following services