Adding missing constants

Author: Andreas Guenther

Sources/OAuth2Client/NXOAuth2AccountStore.h

@@ -35,7 +35,7 @@ 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.

Sources/OAuth2Client/NXOAuth2AccountStore.m

@@ -45,6 +45,7 @@
 NSString * const kNXOAuth2AccountStoreConfigurationTokenRequestHTTPMethod = @"kNXOAuth2AccountStoreConfigurationTokenRequestHTTPMethod";
 NSString * const kNXOAuth2AccountStoreConfigurationKeyChainGroup = @"kNXOAuth2AccountStoreConfigurationKeyChainGroup";
 NSString * const kNXOAuth2AccountStoreConfigurationAdditionalAuthenticationParameters = @"kNXOAuth2AccountStoreConfigurationAdditionalAuthenticationParameters";
+NSString * const kNXOAuth2AccountStoreConfigurationCustomHeaderFields = @"kNXOAuth2AccountStoreConfigurationCustomHeaderFields";
 
 #pragma mark Account Type
 
@@ -404,6 +405,7 @@ - (NXOAuth2Client *)pendingOAuthClientForAccountType:(NSString *)accountType;
             NSString *tokenRequestHTTPMethod = [configuration objectForKey:kNXOAuth2AccountStoreConfigurationTokenRequestHTTPMethod];
             NSString *keychainGroup = [configuration objectForKey:kNXOAuth2AccountStoreConfigurationKeyChainGroup];
             NSDictionary *additionalAuthenticationParameters = [configuration objectForKey:kNXOAuth2AccountStoreConfigurationAdditionalAuthenticationParameters];
+            NSDictionary *customHeaderFields = [configuration objectForKey:kNXOAuth2AccountStoreConfigurationCustomHeaderFields];
 
             client = [[NXOAuth2Client alloc] initWithClientID:clientID
                                                  clientSecret:clientSecret
@@ -428,6 +430,10 @@ - (NXOAuth2Client *)pendingOAuthClientForAccountType:(NSString *)accountType;
             if (scope != nil) {
                 client.desiredScope = scope;
             }
+            
+            if (customHeaderFields) {
+                client.customHeaderFields = customHeaderFields;
+            }
 
             [self.pendingOAuthClients setObject:client forKey:accountType];
         }
@@ -511,9 +517,7 @@ - (void)oauthClientDidLoseAccessToken:(NXOAuth2Client *)client;
     NSString *accountType;
     @synchronized (self.pendingOAuthClients) {
         accountType = [self accountTypeOfPendingOAuthClient:client];
-        if (accountType) {
-            [self.pendingOAuthClients removeObjectForKey:accountType];
-        }
+        [self.pendingOAuthClients removeObjectForKey:accountType];
     }
 }
 
@@ -606,7 +610,7 @@ + (NSDictionary *)accountsFromDefaultKeychain;
     result = (__bridge_transfer NSDictionary *)cfResult;
 
     if (status != noErr) {
-        NSAssert1(status == errSecItemNotFound, @"Unexpected error while fetching accounts from keychain: %d", (int)status);
+        NSAssert1(status == errSecItemNotFound, @"Unexpected error while fetching accounts from keychain: %ld", status);
         return nil;
     }
 
@@ -627,7 +631,7 @@ + (void)storeAccountsInDefaultKeychain:(NSDictionary *)accounts;
                            data, kSecAttrGeneric,
                            nil];
     OSStatus __attribute__((unused)) err = SecItemAdd((__bridge CFDictionaryRef)query, NULL);
-    NSAssert1(err == noErr, @"Error while adding token to keychain: %d", (int)err);
+    NSAssert1(err == noErr, @"Error while adding token to keychain: %ld", err);
 }
 
 + (void)removeFromDefaultKeychain;
@@ -638,7 +642,7 @@ + (void)removeFromDefaultKeychain;
                            serviceName, kSecAttrService,
                            nil];
     OSStatus __attribute__((unused)) err = SecItemDelete((__bridge CFDictionaryRef)query);
-    NSAssert1((err == noErr || err == errSecItemNotFound), @"Error while deleting token from keychain: ld", (int)err);
+    NSAssert1((err == noErr || err == errSecItemNotFound), @"Error while deleting token from keychain: %ld", err);
 
 }