Adding custom header in order to provide a POST with a application/x-www-form-urlencoded MIME type.

Author: Andreas Guenther

Sources/OAuth2Client/NXOAuth2Client.h

@@ -65,6 +65,7 @@ extern NSString * const NXOAuth2ClientConnectionContextTokenRefresh;
 @property (nonatomic, copy, readonly) NSString *clientSecret;
 @property (nonatomic, copy, readonly) NSString *tokenType;
 @property (nonatomic, strong, readwrite) NSDictionary *additionalAuthenticationParameters;
+@property (nonatomic, strong, readwrite) NSDictionary *customHeaderFields;
 
 @property (nonatomic, copy) NSSet *desiredScope;
 @property (nonatomic, copy) NSString *tokenRequestHTTPMethod; // defaults to POST

Sources/OAuth2Client/NXOAuth2Client.m

@@ -393,6 +393,10 @@ - (void)authenticateWithUsername:(NSString *)username password:(NSString *)passw
         [parameters addEntriesFromDictionary:self.additionalAuthenticationParameters];
     }
 
+    if (self.customHeaderFields) {
+        [tokenRequest setAllHTTPHeaderFields:self.customHeaderFields];
+    }
+    
     authConnection = [[NXOAuth2Connection alloc] initWithRequest:tokenRequest
                                                requestParameters:parameters
                                                      oauthClient:self

Sources/OAuth2Client/NXOAuth2Connection.m

@@ -225,18 +225,34 @@ - (void)applyParameters:(NSDictionary *)parameters onRequest:(NSMutableURLReques
         && [httpMethod caseInsensitiveCompare:@"PUT"] != NSOrderedSame) {
         aRequest.URL = [aRequest.URL nxoauth2_URLByAddingParameters:parameters];
     } else {
-        NSInputStream *postBodyStream = [[NXOAuth2PostBodyStream alloc] initWithParameters:parameters];
 
-        NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", [(NXOAuth2PostBodyStream *)postBodyStream boundary]];
-        NSString *contentLength = [NSString stringWithFormat:@"%lld", [(NXOAuth2PostBodyStream *)postBodyStream length]];
-        [aRequest setValue:contentType forHTTPHeaderField:@"Content-Type"];
-        [aRequest setValue:contentLength forHTTPHeaderField:@"Content-Length"];
+        NSString *contentType = [aRequest valueForHTTPHeaderField:@"Content-Type"];
 
-        [aRequest setHTTPBodyStream:postBodyStream];
+        if (!contentType || [contentType isEqualToString:@"multipart/form-data"]) {
+        
+            // sends the POST/PUT request as multipart/form-data as default
+            
+            NSInputStream *postBodyStream = [[NXOAuth2PostBodyStream alloc] initWithParameters:parameters];
+            
+            contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@",[(NXOAuth2PostBodyStream *)postBodyStream boundary]];
+            NSString *contentLength = [NSString stringWithFormat:@"%lld", [(NXOAuth2PostBodyStream *)postBodyStream length]];
+            [aRequest setValue:contentType forHTTPHeaderField:@"Content-Type"];
+            [aRequest setValue:contentLength forHTTPHeaderField:@"Content-Length"];
+            
+            [aRequest setHTTPBodyStream:postBodyStream];
+            
+        }else if ([contentType isEqualToString:@"application/x-www-form-urlencoded"]) {
+            
+            // sends the POST/PUT request as application/x-www-form-urlencoded
+            
+            NSString *query = [[aRequest.URL nxoauth2_URLByAddingParameters:parameters] query];
+            [aRequest setHTTPBody:[query dataUsingEncoding:NSUTF8StringEncoding]];
+            
+        }
+
     }
 }
 
-
 - (BOOL)trustsAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
                           forHostname:(NSString *)hostname
                         withTrustMode:(NXOAuth2TrustMode)trustMode;