From dd3f62398a2b2b2485710b5b6785eaeac4cbd4e0 Mon Sep 17 00:00:00 2001 From: Pniok Date: Wed, 28 Sep 2016 13:54:48 +0200 Subject: [PATCH] Fix useHTTPBasicAuthentication usage --- AFOAuth2Manager/AFOAuth2Manager.m | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/AFOAuth2Manager/AFOAuth2Manager.m b/AFOAuth2Manager/AFOAuth2Manager.m index 88d83f11..10d5ab09 100644 --- a/AFOAuth2Manager/AFOAuth2Manager.m +++ b/AFOAuth2Manager/AFOAuth2Manager.m @@ -99,8 +99,6 @@ - (id)initWithBaseURL:(NSURL *)url clientID:(NSString *)clientID secret:(NSString *)secret { NSParameterAssert(url); - NSParameterAssert(clientID); - NSParameterAssert(secret); self = [super initWithBaseURL:url sessionConfiguration:configuration]; if (!self) { @@ -123,9 +121,9 @@ - (void)setUseHTTPBasicAuthentication:(BOOL)useHTTPBasicAuthentication { _useHTTPBasicAuthentication = useHTTPBasicAuthentication; if (self.useHTTPBasicAuthentication) { - [self.requestSerializer setAuthorizationHeaderFieldWithUsername:self.clientID password:self.secret]; - } else { [self.requestSerializer setValue:nil forHTTPHeaderField:@"Authorization"]; + } else { + [self.requestSerializer setAuthorizationHeaderFieldWithUsername:self.clientID password:self.secret]; } } @@ -216,6 +214,9 @@ - (NSURLSessionTask *)authenticateUsingOAuthWithURLString:(NSString *)URLString { NSMutableDictionary *mutableParameters = [NSMutableDictionary dictionaryWithDictionary:parameters]; if (!self.useHTTPBasicAuthentication) { + NSParameterAssert(self.clientID); + NSParameterAssert(self.secret); + mutableParameters[@"client_id"] = self.clientID; mutableParameters[@"client_secret"] = self.secret; }