The AWS Mobile SDK for iOS v2 Developer Preview 4.

aws-amplify · Jul 29, 2014 · 091acaf · 091acaf
1 parent b92ec00
commit 091acaf
Show file tree

Hide file tree

Showing 45 changed files with 689 additions and 323 deletions.
diff --git a/AWSCore/Authentication/AWSSignature.m b/AWSCore/Authentication/AWSSignature.m
@@ -287,7 +287,7 @@ - (NSString *)signRequestV4:(NSURLRequest *)request{
 
     NSString *dateStamp = [xAmzDate az_stringValue:AZDateShortDateFormat1];
 
-    NSString *path = [request.URL.path az_stringWithURLEncodingExceptSlash];
+    NSString *path = [request.URL.path az_stringWithURLEncodingPath];
     if (path.length == 0) {
         path = [NSString stringWithFormat:@"/"];
     }

diff --git a/AWSCore/MobileAnalytics/ThirdParty/gzip/AIDataGZIP.h b/AWSCore/MobileAnalytics/ThirdParty/gzip/AIDataGZIP.h
diff --git a/AWSCore/MobileAnalytics/ThirdParty/gzip/AIDataGZIP.m b/AWSCore/MobileAnalytics/ThirdParty/gzip/AIDataGZIP.m
diff --git a/AWSCore/MobileAnalytics/core/http/AWSMobileAnalyticsDefaultHttpClient.m b/AWSCore/MobileAnalytics/core/http/AWSMobileAnalyticsDefaultHttpClient.m
@@ -18,7 +18,7 @@
 #import "AZCategory.h"
 #import "AWSMobileAnalyticsInstanceIdInterceptor.h"
 #import "AWSMobileAnalyticsClientContextInterceptor.h"
-#import "AIDataGZIP.h"
+#import "GZIP.h"
 #import "AWSMobileAnalyticsDefaultSessionClient.h"
 #import "AZLogging.h"
 
@@ -102,7 +102,7 @@ -(void) addInterceptor: (id<AWSMobileAnalyticsInterceptor>) theInterceptor
 
     //adapt the body
     if ([theRequest postBody]) {
-        NSData *unzippedBody = [AIDataGZIP gunzippedData:[theRequest postBody]];
+        NSData *unzippedBody = [[theRequest postBody] gunzippedData];
         NSArray *sourceEventsArray = [NSJSONSerialization JSONObjectWithData:unzippedBody options:kNilOptions error:NULL];
         NSAssert([sourceEventsArray isKindOfClass:[NSArray class]] , @"invalid postBody: postBody should be an array");
 

diff --git a/AWSCore/MobileAnalytics/core/io/AWSMobileAnalyticsWriter.m b/AWSCore/MobileAnalytics/core/io/AWSMobileAnalyticsWriter.m
@@ -19,7 +19,7 @@
 #import <objc/runtime.h>
 #import <CommonCrypto/CommonCryptor.h>
 #import <CommonCrypto/CommonDigest.h>
-#import "AIDataGZIP.h"
+#import "GZIP.h"
 #import "AWSMobileAnalyticsBase64Utils.h"
 
 @interface AWSMobileAnalyticsWriter()

diff --git a/AWSCore/MobileAnalytics/core/system/AWSMobileAnalyticsIOSPreferences.m b/AWSCore/MobileAnalytics/core/system/AWSMobileAnalyticsIOSPreferences.m
@@ -14,7 +14,7 @@
  */
 
 #import "AWSMobileAnalyticsIOSPreferences.h"
-#import "AIDataGZIP.h"
+#import "GZIP.h"
 #import "AZLogging.h"
 
 NSString * const AIPreferencesFilename = @"preferences";

diff --git a/AWSCore/MobileAnalytics/delivery/AWSMobileAnalyticsERSRequestBuilder.m b/AWSCore/MobileAnalytics/delivery/AWSMobileAnalyticsERSRequestBuilder.m
@@ -16,7 +16,7 @@
 #import "AWSMobileAnalyticsERSRequestBuilder.h"
 #import "AWSMobileAnalyticsConstants.h"
 #import "AWSMobileAnalyticsConfigurationKeys.h"
-#import "AIDataGZIP.h"
+#import "GZIP.h"
 #import "AWSMobileAnalyticsSerializable.h"
 #import "AWSMobileAnalyticsSerializerFactory.h"
 
@@ -76,7 +76,7 @@ - (id)initWithConfiguration:(id<AWSMobileAnalyticsConfiguration>)configuration
     NSData* jsonData = [self createBodyFromObjects:theObjects];
 
     // compress the string and set the compressed header
-    NSData* compressedBody = [AIDataGZIP gzippedData:jsonData];
+    NSData* compressedBody = [jsonData gzippedData];
     [request setPostBody:compressedBody];
     [request addHeader:@"gzip" forName:CONTENT_ENCODING_KEY];
 

diff --git a/AWSCore/Networking/AWSNetworking.m b/AWSCore/Networking/AWSNetworking.m
@@ -85,7 +85,7 @@ - (NSString *)userAgent {
         NSString *systemName = [[[UIDevice currentDevice] systemName] stringByReplacingOccurrencesOfString:@" " withString:@"-"];
         NSString *systemVersion = [[UIDevice currentDevice] systemVersion];
         NSString *localeIdentifier = [[NSLocale currentLocale] localeIdentifier];
-        _userAgent = [NSString stringWithFormat:@"aws-sdk-iOS/%@ %@/%@ %@", @"2.0.4", systemName, systemVersion, localeIdentifier];
+        _userAgent = [NSString stringWithFormat:@"aws-sdk-iOS/%@ %@/%@ %@", @"2.0.5", systemName, systemVersion, localeIdentifier];
     });
 
     return _userAgent;

diff --git a/AWSCore/STS/AWSSTS.m b/AWSCore/STS/AWSSTS.m
@@ -24,6 +24,8 @@
 #import "AWSURLResponseSerialization.h"
 #import "AWSURLRequestRetryHandler.h"
 
+NSString *const AWSSTSDefinitionFileName = @"sts-2011-06-15";
+
 @interface AWSSTSResponseSerializer : AWSXMLResponseSerializer
 
 @property (nonatomic, assign) Class outputClass;
@@ -200,13 +202,12 @@ - (BFTask *)invokeRequest:(AWSRequest *)request
     }
     networkingRequest.HTTPMethod = HTTPMethod;
 
-    AWSQueryStringRequestSerializer *requestSerializer = [AWSQueryStringRequestSerializer new];
-    requestSerializer.additionalParameters = @{@"Action" : operationName,
-                                               @"Version" : @"2011-06-15"};
+    AWSQueryStringRequestSerializer *requestSerializer = [AWSQueryStringRequestSerializer serializerWithResource:AWSSTSDefinitionFileName
+                                                                                                      actionName:operationName];
     networkingRequest.requestSerializer = requestSerializer;
 
     networkingRequest.responseSerializer = [AWSSTSResponseSerializer serializerWithOutputClass:outputClass
-                                                                                      resource:@"sts-2011-06-15"
+                                                                                      resource:AWSSTSDefinitionFileName
                                                                                     actionName:operationName];
 
     return [self.networking sendRequest:networkingRequest];

diff --git a/AWSCore/Serialization/AWSSerialization.h b/AWSCore/Serialization/AWSSerialization.h
@@ -47,6 +47,17 @@ typedef NS_ENUM(NSInteger, AWSXMLParserErrorType) {
     AWSXMLParserInvalidXMLValue,
 };
 
+//defined domain for errors from AWSRuntime.
+FOUNDATION_EXPORT NSString *const AWSQueryParamBuilderErrorDomain;
+
+/* NSError codes in AWSErrorDomain. */
+typedef NS_ENUM(NSInteger, AWSQueryParamBuilderErrorType) {
+    AWSQueryParamBuilderUnknownError,
+    AWSQueryParamBuilderDefinitionFileIsEmpty,
+    AWSQueryParamBuilderUndefinedActionRule,
+    AWSQueryParamBuilderInternalError,
+};
+
 @interface AWSJSONDictionary : NSDictionary
 
 - (instancetype)initWithDictionary:(NSDictionary *)otherDictionary
@@ -72,9 +83,20 @@ typedef NS_ENUM(NSInteger, AWSXMLParserErrorType) {
 
 @interface AWSXMLParser : NSObject
 
-+ (NSMutableDictionary *)dictionaryForXMLData:(NSData *)data
++ (AWSXMLParser *)sharedInstance;
+
+- (NSMutableDictionary *)dictionaryForXMLData:(NSData *)data
                                    actionName:(NSString *)actionName
                         serviceDefinitionRule:(NSDictionary *)serviceDefinitionRule
                                         error:(NSError *__autoreleasing *)error;
 
 @end
+
+@interface AWSQueryParamBuilder : NSObject
+
++ (NSDictionary *)buildFormattedParams:(NSDictionary *)params
+                            actionName:(NSString *)actionName
+                 serviceDefinitionRule:(NSDictionary *)serviceDefinitionRule
+                                 error:(NSError *__autoreleasing *)error;
+
+@end