Merge pull request #34 from evoL/session_token

Temporary session token support
AFNetworking · Nov 29, 2014 · d991e21 · d991e21
2 parents 3508f7c + b71089b
commit d991e21
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/AFAmazonS3Client/AFAmazonS3Manager.m b/AFAmazonS3Client/AFAmazonS3Manager.m
@@ -272,7 +272,7 @@ - (void)setObjectWithMethod:(NSString *)method
 #pragma mark - NSKeyValueObserving
 
 + (NSSet *)keyPathsForValuesAffectingBaseURL {
-    return [NSSet setWithObjects:@"baseURL", @"requestSerializer.bucket", @"requestSerializer.region", @"requestSerializer.useSSL", nil];
+    return [NSSet setWithObjects:@"baseURL", @"requestSerializer.bucket", @"requestSerializer.region", @"requestSerializer.sessionToken", @"requestSerializer.useSSL", nil];
 }
 
 #pragma mark - NSCopying

diff --git a/AFAmazonS3Client/AFAmazonS3RequestSerializer.h b/AFAmazonS3Client/AFAmazonS3RequestSerializer.h
@@ -41,6 +41,11 @@
  */
 @property (nonatomic, copy) NSString *region;
 
+/**
+ The AWS STS session token. `nil` by default.
+ */
+@property (nonatomic, copy) NSString *sessionToken;
+
 /**
  Whether to connect over HTTPS. `YES` by default.
 

diff --git a/AFAmazonS3Client/AFAmazonS3RequestSerializer.m b/AFAmazonS3Client/AFAmazonS3RequestSerializer.m
@@ -237,7 +237,13 @@ - (NSMutableURLRequest *)requestWithMethod:(NSString *)method
                                 parameters:(NSDictionary *)parameters
                                      error:(NSError *__autoreleasing *)error
 {
-    return [[self requestBySettingAuthorizationHeadersForRequest:[super requestWithMethod:method URLString:URLString parameters:parameters error:error] error:error] mutableCopy];
+    NSMutableURLRequest *request = [super requestWithMethod:method URLString:URLString parameters:parameters error:error];
+
+    if (self.sessionToken) {
+        [request setValue:self.sessionToken forHTTPHeaderField:@"x-amz-security-token"];
+    }
+
+    return [[self requestBySettingAuthorizationHeadersForRequest:request error:error] mutableCopy];
 }
 
 - (NSMutableURLRequest *)multipartFormRequestWithMethod:(NSString *)method
@@ -246,7 +252,13 @@ - (NSMutableURLRequest *)multipartFormRequestWithMethod:(NSString *)method
                               constructingBodyWithBlock:(void (^)(id<AFMultipartFormData>))block
                                                   error:(NSError *__autoreleasing *)error
 {
-    return [[self requestBySettingAuthorizationHeadersForRequest:[super multipartFormRequestWithMethod:method URLString:URLString parameters:parameters constructingBodyWithBlock:block error:error] error:error] mutableCopy];
+    NSMutableURLRequest *request = [super multipartFormRequestWithMethod:method URLString:URLString parameters:parameters constructingBodyWithBlock:block error:error];
+
+    if (self.sessionToken) {
+        [request setValue:self.sessionToken forHTTPHeaderField:@"x-amz-security-token"];
+    }
+
+    return [[self requestBySettingAuthorizationHeadersForRequest:request error:error] mutableCopy];
 }
 
 @end