File uploads can have a custom content-type if created as stream parameter.

Author: katzlbt

Sources/OAuth2Client/NXOAuth2FileStreamWrapper.h

@@ -18,10 +18,12 @@
     NSInputStream        *stream;
     unsigned long long    contentLength;
     NSString            *fileName;
+    NSString            *contentType;
 }
 @property (nonatomic, strong, readonly) NSInputStream *stream;
 @property (nonatomic, assign, readonly) unsigned long long contentLength;
 @property (nonatomic, copy, readonly) NSString *fileName;
+@property (nonatomic, copy) NSString *contentType; // optional DEFAULT: "application/octettstream"
 
 + (id)wrapperWithStream:(NSInputStream *)stream contentLength:(unsigned long long)contentLength DEPRECATED_ATTRIBUTE;
 - (id)initWithStream:(NSInputStream *)stream contentLength:(unsigned long long)contentLength DEPRECATED_ATTRIBUTE;

Sources/OAuth2Client/NXOAuth2FileStreamWrapper.m

@@ -51,6 +51,7 @@ - (id)initWithStream:(NSInputStream *)aStream contentLength:(unsigned long long)
         stream = aStream;
         contentLength = aContentLength;
         fileName = [aFileName copy];
+        contentType = @"application/octet-stream"; // DEFAULT if not assigned by property
     }
     return self;
 }

Sources/OAuth2Client/NXOAuth2PostBodyPart.m

@@ -43,7 +43,7 @@ - (id)initWithName:(NSString *)name content:(id)content;
     } else if ([content isKindOfClass:[NSData class]]) {
         return [self initWithName:name dataContent:content];
     } else if ([content isKindOfClass:[NXOAuth2FileStreamWrapper class]]) {
-        return [self initWithName:name streamContent:[content stream] streamLength:[content contentLength] fileName:[content fileName]];
+        return [self initWithName:name streamContent:[content stream] streamLength:[content contentLength] fileName:[content fileName] contentType:[content contentType]];
     } else {
         NSAssert1(NO, @"NXOAuth2PostBodyPart with illegal type:\n%@", [content class]);
         return nil;
@@ -60,6 +60,17 @@ - (id)initWithName:(NSString *)name streamContent:(NSInputStream *)stream stream
     return [self initWithHeaders:headers streamContent:stream length:streamLength];
 }
 
+- (id)initWithName:(NSString *)name streamContent:(NSInputStream *)stream streamLength:(unsigned long long)streamLength fileName:(NSString *)fileName contentType:(NSString *)contentType;
+{
+    NSMutableString *headers = [NSMutableString string];
+    [headers appendFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n", name, fileName];
+    [headers appendString:@"Content-Transfer-Encoding: binary\r\n"];
+    [headers appendFormat:@"Content-Type: %@\r\n", contentType];
+    [headers appendString:@"\r\n"];
+    NSLog(@"%@: headers '%@'", self.class, headers);
+    return [self initWithHeaders:headers streamContent:stream length:streamLength];
+}
+
 - (id)initWithName:(NSString *)name dataContent:(NSData *)data;
 {
     NSMutableString *headers = [NSMutableString string];