The AWS Mobile SDK for iOS 2.5.10.

AWSAPIGateway.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = 'AWSAPIGateway'
-  s.version      = '2.5.9'
+  s.version      = '2.5.10'
   s.summary      = 'Amazon Web Services SDK for iOS.'
 
   s.description  = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => 'https://github.com/aws/aws-sdk-ios.git',
                      :tag => s.version}
   s.requires_arc = true
-  s.dependency 'AWSCore', '2.5.9'
+  s.dependency 'AWSCore', '2.5.10'
 
   s.source_files = 'AWSAPIGateway/*.{h,m}'
 end

AWSAPIGateway/AWSAPIGatewayClient.m

@@ -23,7 +23,7 @@
 
 static NSString *const AWSAPIGatewayAPIKeyHeader = @"x-api-key";
 
-static NSString *const AWSAPIGatewaySDKVersion = @"2.5.9";
+static NSString *const AWSAPIGatewaySDKVersion = @"2.5.10";
 
 static int defaultChunkSize = 1024;
 

AWSAPIGateway/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.9</string>
+	<string>2.5.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

AWSAutoScaling.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'AWSAutoScaling'
-  s.version      = '2.5.9'
+  s.version      = '2.5.10'
   s.summary      = 'Amazon Web Services SDK for iOS.'
 
   s.description  = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
@@ -12,6 +12,6 @@ Pod::Spec.new do |s|
   s.source       = { :git => 'https://github.com/aws/aws-sdk-ios.git',
                      :tag => s.version}
   s.requires_arc = true
-  s.dependency 'AWSCore', '2.5.9'
+  s.dependency 'AWSCore', '2.5.10'
   s.source_files = 'AWSAutoScaling/*.{h,m}'
 end

AWSAutoScaling/AWSAutoScalingService.m

@@ -26,7 +26,7 @@
 #import "AWSAutoScalingResources.h"
 
 static NSString *const AWSInfoAutoScaling = @"AutoScaling";
-static NSString *const AWSAutoScalingSDKVersion = @"2.5.9";
+static NSString *const AWSAutoScalingSDKVersion = @"2.5.10";
 
 
 @interface AWSAutoScalingResponseSerializer : AWSXMLResponseSerializer

AWSAutoScaling/Info.plist

@@ -15,7 +15,7 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.5.9</string>
+    <string>2.5.10</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>

AWSCloudWatch.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'AWSCloudWatch'
-  s.version      = '2.5.9'
+  s.version      = '2.5.10'
   s.summary      = 'Amazon Web Services SDK for iOS.'
 
   s.description  = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
@@ -12,6 +12,6 @@ Pod::Spec.new do |s|
   s.source       = { :git => 'https://github.com/aws/aws-sdk-ios.git',
                      :tag => s.version}
   s.requires_arc = true
-  s.dependency 'AWSCore', '2.5.9'
+  s.dependency 'AWSCore', '2.5.10'
   s.source_files = 'AWSCloudWatch/*.{h,m}'
 end

AWSCloudWatch/AWSCloudWatchService.m

@@ -26,7 +26,7 @@
 #import "AWSCloudWatchResources.h"
 
 static NSString *const AWSInfoCloudWatch = @"CloudWatch";
-static NSString *const AWSCloudWatchSDKVersion = @"2.5.9";
+static NSString *const AWSCloudWatchSDKVersion = @"2.5.10";
 
 
 @interface AWSCloudWatchResponseSerializer : AWSXMLResponseSerializer

AWSCloudWatch/Info.plist

@@ -15,7 +15,7 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.5.9</string>
+    <string>2.5.10</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>

AWSCognito.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'AWSCognito'
-  s.version      = '2.5.9'
+  s.version      = '2.5.10'
   s.summary      = 'Amazon Cognito SDK for iOS'
 
   s.description  = 'Amazon Cognito offers multi device data synchronization with offline access'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
                      :tag => s.version}
   s.requires_arc = true
   s.library      = 'sqlite3' 
-  s.dependency 'AWSCore', '2.5.9'
+  s.dependency 'AWSCore', '2.5.10'
   s.source_files = 'AWSCognito/*.{h,m}', 'AWSCognito/**/*.{h,m}'
   s.public_header_files = 'AWSCognito/*.h', 'AWSCognito/CognitoSync/*.h'
   s.private_header_files = 'AWSCognito/Fabric/*.h', 'AWSCognito/Internal/*.h'

AWSCognito/AWSCognitoService.m

@@ -34,7 +34,7 @@
 #import "Fabric+FABKits.h"
 
 static NSString *const AWSInfoCognito = @"Cognito";
-static NSString *const AWSCognitoSDKVersion = @"2.5.9";
+static NSString *const AWSCognitoSDKVersion = @"2.5.10";
 
 NSString *const AWSCognitoDidStartSynchronizeNotification = @"com.amazon.cognito.AWSCognitoDidStartSynchronizeNotification";
 NSString *const AWSCognitoDidEndSynchronizeNotification = @"com.amazon.cognito.AWSCognitoDidEndSynchronizeNotification";

AWSCognito/CognitoSync/AWSCognitoSyncService.m

@@ -26,7 +26,7 @@
 #import "AWSCognitoSyncResources.h"
 
 static NSString *const AWSInfoCognitoSync = @"CognitoSync";
-static NSString *const AWSCognitoSyncSDKVersion = @"2.5.9";
+static NSString *const AWSCognitoSyncSDKVersion = @"2.5.10";
 
 
 @interface AWSCognitoSyncResponseSerializer : AWSJSONResponseSerializer

AWSCognito/Info.plist

@@ -15,7 +15,7 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.5.9</string>
+    <string>2.5.10</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>

AWSCognitoAuth.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = 'AWSCognitoAuth'
-  s.version      = '2.5.9'
-  s.summary      = 'Amazon Cognito Auth SDK for iOS (Beta)'
+  s.version      = '2.5.10'
+  s.summary      = 'Amazon Cognito Auth SDK for iOS'
 
   s.description  = 'Amazon Cognito Auth enables sign up and authentication of your end users via a hosted UI'
 

AWSCognitoAuth/AWSCognitoAuth.m

@@ -41,7 +41,7 @@ @interface AWSCognitoAuth()<SFSafariViewControllerDelegate, NSURLConnectionDeleg
 
 @implementation AWSCognitoAuth
 
-static NSString *const AWSCognitoAuthSDKVersion = @"2.5.9";
+static NSString *const AWSCognitoAuthSDKVersion = @"2.5.10";
 
 
 static NSMutableDictionary *_instanceDictionary = nil;
@@ -181,7 +181,7 @@ - (void) cleanupSignIn {
  Launch the sign in ui on the provided viewcontroller
  */
 - (void) launchSignInVC: (UIViewController *) vc {
-    NSString *url = [NSString stringWithFormat:@"%@/authorize?response_type=code&client_id=%@&state=%@&redirect_uri=%@&scope=%@&code_challenge=%@&code_challenge_method=S256",self.authConfiguration.webDomain, self.authConfiguration.appClientId, self.state,[self urlEncode:self.authConfiguration.signInRedirectUri], [self urlEncode:[self normalizeScopes]], self.proofKeyHash];
+    NSString *url = [NSString stringWithFormat:@"%@/oauth2/authorize?response_type=code&client_id=%@&state=%@&redirect_uri=%@&scope=%@&code_challenge=%@&code_challenge_method=S256",self.authConfiguration.webDomain, self.authConfiguration.appClientId, self.state,[self urlEncode:self.authConfiguration.signInRedirectUri], [self urlEncode:[self normalizeScopes]], self.proofKeyHash];
     self.svc = [[SFSafariViewController alloc] initWithURL:[NSURL URLWithString:url] entersReaderIfAvailable:NO];
     self.svc.delegate = self;
     self.svc.modalPresentationStyle = UIModalPresentationPopover;
@@ -233,13 +233,16 @@ - (void)getSessionInternal: (nullable UIViewController *) vc completion: (AWSCog
             }
             //else refresh it using the refresh token
             else if(refreshToken){
-                NSString *url = [NSString stringWithFormat:@"%@/token",self.authConfiguration.webDomain];
-                NSString *body = [NSString stringWithFormat:@"grant_type=refresh_token&client_id=%@&refresh_token=%@&redirect_uri=%@",self.authConfiguration.appClientId, refreshToken, self.authConfiguration.signInRedirectUri];
+                NSString *url = [NSString stringWithFormat:@"%@/oauth2/token",self.authConfiguration.webDomain];
+                NSString *body = [NSString stringWithFormat:@"grant_type=refresh_token&client_id=%@&refresh_token=%@",self.authConfiguration.appClientId, refreshToken];
                 NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:url]];
                 [self addHeaders:request];
                 request.HTTPMethod = @"POST";
                 request.HTTPBody = [body dataUsingEncoding:NSUTF8StringEncoding];
-                [[[NSURLConnection alloc] initWithRequest:request delegate:self] start];
+                NSURLConnection *connection = [[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:NO];
+                [connection scheduleInRunLoop:[NSRunLoop mainRunLoop]
+                                      forMode:NSDefaultRunLoopMode];
+                [connection start];
                 return;
             }
         }
@@ -456,30 +459,49 @@ - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDiction
             [queryItemsDict setObject:queryItem.value forKey:queryItem.name];
         }
     }
-    if([[url absoluteString] hasPrefix:self.authConfiguration.signInRedirectUri] && queryItemsDict[@"state"] && queryItemsDict[@"code"]){
-        //if state doesn't match, abort
-        if(![self.state isEqualToString:queryItemsDict[@"state"]]){
-            [self completeGetSession:nil error:[self getError:@"State code did not match request" code: AWSCognitoAuthClientErrorSecurityFailed]];
-            return YES;
-        } else {
-            //continue with authorization code request
-            NSString * code = queryItemsDict[@"code"];
-            if(code){
-                NSString *url = [NSString stringWithFormat:@"%@/token",self.authConfiguration.webDomain];
-                NSString *body = [NSString stringWithFormat:@"grant_type=authorization_code&client_id=%@&code=%@&redirect_uri=%@&code_verifier=%@",
-                                  self.authConfiguration.appClientId, code, self.authConfiguration.signInRedirectUri, self.proofKey];
-
-                NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:url]];
-                request.HTTPMethod = @"POST";
-                request.HTTPBody = [body dataUsingEncoding:NSUTF8StringEncoding];
-                [self addHeaders:request];
-                [[[NSURLConnection alloc] initWithRequest:request delegate:self] start];
+    if([[url absoluteString] hasPrefix:self.authConfiguration.signInRedirectUri] && queryItemsDict[@"state"]) {
+        if(queryItemsDict[@"code"]){
+            //if state doesn't match, abort
+            if(![self.state isEqualToString:queryItemsDict[@"state"]]){
+                [self completeGetSession:nil error:[self getError:@"State code did not match request" code: AWSCognitoAuthClientErrorSecurityFailed]];
                 return YES;
+            } else {
+                //continue with authorization code request
+                NSString * code = queryItemsDict[@"code"];
+                if(code){
+                    NSString *url = [NSString stringWithFormat:@"%@/oauth2/token",self.authConfiguration.webDomain];
+                    NSString *body = [NSString stringWithFormat:@"grant_type=authorization_code&client_id=%@&code=%@&redirect_uri=%@&code_verifier=%@",
+                                      self.authConfiguration.appClientId, code, self.authConfiguration.signInRedirectUri, self.proofKey];
+
+                    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:url]];
+                    request.HTTPMethod = @"POST";
+                    request.HTTPBody = [body dataUsingEncoding:NSUTF8StringEncoding];
+                    [self addHeaders:request];
+                    NSURLConnection *connection = [[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:NO];
+                    [connection scheduleInRunLoop:[NSRunLoop mainRunLoop]
+                                          forMode:NSDefaultRunLoopMode];
+                    [connection start];
+                    return YES;
+                }
+            }
+        }else if(queryItemsDict[@"error"]){
+            NSString *error = queryItemsDict[@"error"];
+            NSString *errorDescription = queryItemsDict[@"error_description"];
+            if(errorDescription){
+                error = [NSString stringWithFormat:@"%@: %@", error, errorDescription];
             }
+            [self completeGetSession:nil error:[self getError:error code: AWSCognitoAuthClientErrorBadRequest]];
+            return YES;
         }
-    }else if([[url absoluteString] hasPrefix:self.authConfiguration.signOutRedirectUri]){
+    } else if([[url absoluteString] hasPrefix:self.authConfiguration.signOutRedirectUri]){
         if(queryItemsDict[@"error"]){
-            [self completeSignOut:[self getError:queryItemsDict[@"error"] code:AWSCognitoAuthClientErrorBadRequest]];
+            NSString *error = queryItemsDict[@"error"];
+            NSString *errorDescription = queryItemsDict[@"error_description"];
+            if(errorDescription){
+                error = [NSString stringWithFormat:@"%@: %@", error, errorDescription];
+            }
+            [self signOutLocallyAndClearLastKnownUser];
+            [self completeSignOut:[self getError:error code:AWSCognitoAuthClientErrorBadRequest]];
         }else{
             [self signOutLocallyAndClearLastKnownUser];
             [self completeSignOut:nil];
@@ -640,7 +662,7 @@ - (void) updateUsernameAndPersistTokens: (AWSCognitoAuthUserSession *) session {
 -(NSError *) getError:(NSString *) error code:(AWSCognitoAuthClientErrorType) code {
     NSMutableDictionary * errors = [NSMutableDictionary new];
     if(error){
-        [errors setObject:error forKey:@"error"];
+        [errors setObject:[error stringByReplacingOccurrencesOfString:@"+" withString:@" "]forKey:@"error"];
     }
     return [NSError errorWithDomain:AWSCognitoAuthErrorDomain code:code userInfo:errors];
 }

AWSCognitoAuth/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.9</string>
+	<string>2.5.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

AWSCognitoIdentityProvider.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'AWSCognitoIdentityProvider'
-  s.version      = '2.5.9'
+  s.version      = '2.5.10'
   s.summary      = 'Amazon Cognito Identity Provider SDK for iOS (Beta)'
 
   s.description  = 'Amazon Cognito Identity Provider enables sign up and authentication of your end users'
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => 'https://github.com/aws/aws-sdk-ios.git',
                      :tag => s.version}
   s.requires_arc = true
-  s.dependency 'AWSCore', '2.5.9'
+  s.dependency 'AWSCore', '2.5.10'
   s.source_files = 'AWSCognitoIdentityProvider/**/*.{h,m,c}'
   s.public_header_files = 'AWSCognitoIdentityProvider/*.h', 'AWSCognitoIdentityProvider/CognitoIdentityProvider/*.h'
   s.private_header_files = 'AWSCognitoIdentityProvider/Internal/*.h'

AWSCognitoIdentityProvider/CognitoIdentityProvider/AWSCognitoIdentityProviderService.m

@@ -26,7 +26,7 @@
 #import "AWSCognitoIdentityProviderResources.h"
 
 static NSString *const AWSInfoCognitoIdentityProvider = @"CognitoIdentityProvider";
-static NSString *const AWSCognitoIdentityProviderSDKVersion = @"2.5.9";
+static NSString *const AWSCognitoIdentityProviderSDKVersion = @"2.5.10";
 
 
 @interface AWSCognitoIdentityProviderResponseSerializer : AWSJSONResponseSerializer

AWSCognitoIdentityProvider/Info.plist

@@ -15,7 +15,7 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.5.9</string>
+    <string>2.5.10</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>

AWSCognitoSync.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = 'AWSCognitoSync'
-  s.version      = '2.5.9'
+  s.version      = '2.5.10'
   s.summary      = 'Amazon Cognito SDK for iOS'
 
   s.description  = 'Amazon Cognito offers multi device data synchronization with offline access'
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
                      :tag => s.version}
   s.requires_arc = true
   s.library      = 'sqlite3'
-  s.dependency 'AWSCognito', '2.5.9'
+  s.dependency 'AWSCognito', '2.5.10'
 
   s.deprecated = true
   s.deprecated_in_favor_of = 'AWSCognito'

AWSCore.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = 'AWSCore'
-  s.version      = '2.5.9'
+  s.version      = '2.5.10'
   s.summary      = 'Amazon Web Services SDK for iOS.'
 
   s.description  = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'

AWSCore/Info.plist

@@ -15,7 +15,7 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.5.9</string>
+    <string>2.5.10</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>

AWSCore/Service/AWSService.m

@@ -21,7 +21,7 @@
 #import "AWSCocoaLumberjack.h"
 #import "AWSCategory.h"
 
-NSString *const AWSiOSSDKVersion = @"2.5.9";
+NSString *const AWSiOSSDKVersion = @"2.5.10";
 NSString *const AWSServiceErrorDomain = @"com.amazonaws.AWSServiceErrorDomain";
 
 static NSString *const AWSServiceConfigurationUnknown = @"Unknown";

AWSDynamoDB.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'AWSDynamoDB'
-  s.version      = '2.5.9'
+  s.version      = '2.5.10'
   s.summary      = 'Amazon Web Services SDK for iOS.'
 
   s.description  = 'The AWS SDK for iOS provides a library, code samples, and documentation for developers to build connected mobile applications using AWS.'
@@ -12,6 +12,6 @@ Pod::Spec.new do |s|
   s.source       = { :git => 'https://github.com/aws/aws-sdk-ios.git',
                      :tag => s.version}
   s.requires_arc = true
-  s.dependency 'AWSCore', '2.5.9'
+  s.dependency 'AWSCore', '2.5.10'
   s.source_files = 'AWSDynamoDB/*.{h,m}'
 end

AWSDynamoDB/AWSDynamoDBService.m

@@ -27,7 +27,7 @@
 #import "AWSDynamoDBRequestRetryHandler.h"
 
 static NSString *const AWSInfoDynamoDB = @"DynamoDB";
-static NSString *const AWSDynamoDBSDKVersion = @"2.5.9";
+static NSString *const AWSDynamoDBSDKVersion = @"2.5.10";
 
 
 @interface AWSDynamoDBResponseSerializer : AWSJSONResponseSerializer

AWSDynamoDB/Info.plist

@@ -15,7 +15,7 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.5.9</string>
+    <string>2.5.10</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>