Conditionally construct multipart form request depending on HTTP method

AFNetworking · Nov 29, 2014 · cc21e90 · cc21e90 · jerryhalstead · Jan 22, 2015
1 parent bf540a5
commit cc21e90
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/AFAmazonS3Client/AFAmazonS3Manager.m b/AFAmazonS3Client/AFAmazonS3Manager.m
@@ -237,21 +237,27 @@ - (void)setObjectWithMethod:(NSString *)method
 
     destinationPath = [destinationPath stringByReplacingOccurrencesOfString:@" " withString:@"+"];
 
-    NSError *requestError = nil;
-    NSMutableURLRequest *request = [self.requestSerializer multipartFormRequestWithMethod:method URLString:[[self.baseURL URLByAppendingPathComponent:destinationPath] absoluteString] parameters:parameters constructingBodyWithBlock:^(id <AFMultipartFormData> formData) {
-        if (![parameters valueForKey:@"key"]) {
-            [formData appendPartWithFormData:[[filePath lastPathComponent] dataUsingEncoding:NSUTF8StringEncoding] name:@"key"];
+    NSMutableURLRequest *request = nil;
+    if ([method compare:@"POST" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
+        NSError *requestError = nil;
+        request = [self.requestSerializer multipartFormRequestWithMethod:method URLString:[[self.baseURL URLByAppendingPathComponent:destinationPath] absoluteString] parameters:parameters constructingBodyWithBlock:^(id <AFMultipartFormData> formData) {
+            if (![parameters valueForKey:@"key"]) {
+                [formData appendPartWithFormData:[[filePath lastPathComponent] dataUsingEncoding:NSUTF8StringEncoding] name:@"key"];
+            }
+
+            [formData appendPartWithFileData:data name:@"file" fileName:[filePath lastPathComponent] mimeType:[response MIMEType]];
+        } error:&requestError];
+
+        if (requestError || !request) {
+            if (failure) {
+                failure(requestError);
+            }
+
+            return;
         }
-
-        [formData appendPartWithFileData:data name:@"file" fileName:[filePath lastPathComponent] mimeType:[response MIMEType]];
-    } error:&requestError];
-
-    if (requestError || !request) {
-        if (failure) {
-            failure(requestError);
-        }
-
-        return;
+    } else {
+        request = [self.requestSerializer requestWithMethod:method URLString:[[self.baseURL URLByAppendingPathComponent:destinationPath] absoluteString] parameters:parameters error:nil];
+        request.HTTPBody = data;
     }
 
     AFHTTPRequestOperation *requestOperation = [self HTTPRequestOperationWithRequest:request success:^(__unused AFHTTPRequestOperation *operation, id responseObject) {