Merge pull request #1 from ghvillasboas/develop

Wiring up the custom http headers for all types of requests

Author: AndreasTextunes

Sources/OAuth2Client/NXOAuth2Account.m

@@ -92,6 +92,7 @@ - (NXOAuth2Client *)oauthClient;
             NSString *tokenType = [configuration objectForKey:kNXOAuth2AccountStoreConfigurationTokenType];
             NSString *keychainGroup = [configuration objectForKey:kNXOAuth2AccountStoreConfigurationTokenType];
             NSDictionary *additionalQueryParams = [configuration objectForKey:kNXOAuth2AccountStoreConfigurationAdditionalAuthenticationParameters];
+            NSDictionary *customHeaderFields = [configuration objectForKey:kNXOAuth2AccountStoreConfigurationCustomHeaderFields];
 
             oauthClient = [[NXOAuth2Client alloc] initWithClientID:clientID
                                                       clientSecret:clientSecret
@@ -106,6 +107,10 @@ - (NXOAuth2Client *)oauthClient;
                 oauthClient.additionalAuthenticationParameters = additionalQueryParams;
             }
 
+            if (customHeaderFields) {
+                oauthClient.customHeaderFields = customHeaderFields;
+            }
+            
         }
     }
     return oauthClient;

Sources/OAuth2Client/NXOAuth2AccountStore.h

@@ -35,7 +35,6 @@ extern NSString * const kNXOAuth2AccountStoreConfigurationRedirectURL;
 extern NSString * const kNXOAuth2AccountStoreConfigurationScope;
 extern NSString * const kNXOAuth2AccountStoreConfigurationTokenType;
 extern NSString * const kNXOAuth2AccountStoreConfigurationTokenRequestHTTPMethod;
-extern NSString * const kNXOAuth2AccountStoreConfigurationCustomHeaderFields;
 
 /* 
  * Requires a NSDictionary as a value.
@@ -45,6 +44,13 @@ extern NSString * const kNXOAuth2AccountStoreConfigurationCustomHeaderFields;
  */
 extern NSString * const kNXOAuth2AccountStoreConfigurationAdditionalAuthenticationParameters;
 
+/*
+ * Requires a NSDictionary as a value.
+ * They are passed onto the HTTP Header Fields request as additional parameters.
+ * Example of a valid setup: @{ @"Content-type" : @"application/x-www-form-urlencoded" }
+ */
+extern NSString * const kNXOAuth2AccountStoreConfigurationCustomHeaderFields;
+
 
 #pragma mark Account Type
 

Sources/OAuth2Client/NXOAuth2AccountStore.m

@@ -426,14 +426,13 @@ - (NXOAuth2Client *)pendingOAuthClientForAccountType:(NSString *)accountType;
                 NSAssert([additionalAuthenticationParameters isKindOfClass:[NSDictionary class]], @"additionalAuthenticationParameters have to be a NSDictionary");
                 client.additionalAuthenticationParameters = additionalAuthenticationParameters;
             }
+            if (customHeaderFields) {
+                client.customHeaderFields = customHeaderFields;
+            }
 
             if (scope != nil) {
                 client.desiredScope = scope;
             }
-            
-            if (customHeaderFields) {
-                client.customHeaderFields = customHeaderFields;
-            }
 
             [self.pendingOAuthClients setObject:client forKey:accountType];
         }
@@ -517,7 +516,9 @@ - (void)oauthClientDidLoseAccessToken:(NXOAuth2Client *)client;
     NSString *accountType;
     @synchronized (self.pendingOAuthClients) {
         accountType = [self accountTypeOfPendingOAuthClient:client];
-        [self.pendingOAuthClients removeObjectForKey:accountType];
+        if (accountType) {
+            [self.pendingOAuthClients removeObjectForKey:accountType];
+        }
     }
 }
 

Sources/OAuth2Client/NXOAuth2Client.m

@@ -330,6 +330,12 @@ - (void)requestTokenWithAuthGrant:(NSString *)authGrant redirectURL:(NSURL *)red
         [parameters setObject:[[self.desiredScope allObjects] componentsJoinedByString:@" "] forKey:@"scope"];
     }
 
+    if (self.customHeaderFields) {
+        [self.customHeaderFields enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *obj, BOOL *stop) {
+            [tokenRequest addValue:obj forHTTPHeaderField:key];
+        }];
+    }
+    
     if (self.additionalAuthenticationParameters) {
         [parameters addEntriesFromDictionary:self.additionalAuthenticationParameters];
     }
@@ -360,6 +366,13 @@ - (void)authenticateWithClientCredentials;
     if (self.desiredScope) {
         [parameters setObject:[[self.desiredScope allObjects] componentsJoinedByString:@" "] forKey:@"scope"];
     }
+    
+    if (self.customHeaderFields) {
+        [self.customHeaderFields enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *obj, BOOL *stop) {
+            [tokenRequest addValue:obj forHTTPHeaderField:key];
+        }];
+    }
+    
     authConnection = [[NXOAuth2Connection alloc] initWithRequest:tokenRequest
                                                requestParameters:parameters
                                                      oauthClient:self
@@ -394,7 +407,9 @@ - (void)authenticateWithUsername:(NSString *)username password:(NSString *)passw
     }
 
     if (self.customHeaderFields) {
-        [tokenRequest setAllHTTPHeaderFields:self.customHeaderFields];
+        [self.customHeaderFields enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *obj, BOOL *stop) {
+            [tokenRequest addValue:obj forHTTPHeaderField:key];
+        }];
     }
 
     authConnection = [[NXOAuth2Connection alloc] initWithRequest:tokenRequest