Merge branch 'release/1.2.3'

Author: stigi

NXOAuth2Client.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'NXOAuth2Client'
-  s.version  = '1.2.2'
+  s.version  = '1.2.3'
   s.license  = {
     :type => 'BSD',
     :text => <<-LICENSETEXT

OAuth2Client.framework-Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

OAuth2Client.xcodeproj/project.pbxproj

@@ -362,7 +362,7 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0450;
+				LastUpgradeCheck = 0460;
 				ORGANIZATIONNAME = nxtbgthng;
 			};
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "OAuth2Client" */;
@@ -447,7 +447,6 @@
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
-				DEPLOYMENT_LOCATION = YES;
 				DSTROOT = /tmp/OAuth2Client.dst;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_MODEL_TUNING = G5;
@@ -470,7 +469,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
-				DEPLOYMENT_LOCATION = YES;
 				DSTROOT = /tmp/OAuth2Client.dst;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -489,7 +487,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				COMBINE_HIDPI_IMAGES = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -503,7 +500,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				COMBINE_HIDPI_IMAGES = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;

Sources/OAuth2Client/NXOAuth2AccessToken.m

@@ -67,7 +67,7 @@ + (id)tokenWithResponseBody:(NSString *)theResponseBody tokenType:(NSString *)to
     }
 
     NSDate *expiryDate = nil;
-    if (expiresIn) {
+    if (expiresIn != nil && expiresIn != [NSNull null]) {
         expiryDate = [NSDate dateWithTimeIntervalSinceNow:[expiresIn integerValue]];
     }
     return [[[self class] alloc] initWithAccessToken:anAccessToken

Sources/OAuth2Client/NXOAuth2AccountStore.h

@@ -123,6 +123,7 @@ typedef void(^NXOAuth2PreparedAuthorizationURLHandler)(NSURL *preparedURL);
 - (void)requestAccessToAccountWithType:(NSString *)accountType withPreparedAuthorizationURLHandler:(NXOAuth2PreparedAuthorizationURLHandler)aPreparedAuthorizationURLHandler;
 - (void)requestAccessToAccountWithType:(NSString *)accountType username:(NSString *)username password:(NSString *)password;
 - (void)requestAccessToAccountWithType:(NSString *)accountType assertionType:(NSURL *)assertionType assertion:(NSString *)assertion;
+- (void)requestClientCredentialsAccessWithType:(NSString *)accountType;
 - (void)removeAccount:(NXOAuth2Account *)account;
 
 

Sources/OAuth2Client/NXOAuth2AccountStore.m

@@ -205,6 +205,12 @@ - (void)requestAccessToAccountWithType:(NSString *)accountType assertionType:(NS
     [client authenticateWithAssertionType:assertionType assertion:assertion];
 }
 
+- (void)requestClientCredentialsAccessWithType:(NSString *)accountType;
+{
+    NXOAuth2Client *client = [self pendingOAuthClientForAccountType:accountType];
+    [client authenticateWithClientCredentials];
+}
+
 - (void)removeAccount:(NXOAuth2Account *)account;
 {
     if (account) {

Sources/OAuth2Client/NXOAuth2Client.h

@@ -67,6 +67,7 @@ extern NSString * const NXOAuth2ClientConnectionContextTokenRefresh;
 
 @property (nonatomic, copy) NSSet *desiredScope;
 @property (nonatomic, copy) NSString *userAgent;
+@property (nonatomic, copy) NSString *acceptType; // defaults to application/json
 
 @property (nonatomic, strong) NXOAuth2AccessToken    *accessToken;
 @property (nonatomic, unsafe_unretained) NSObject<NXOAuth2ClientDelegate>*    delegate;
@@ -122,6 +123,7 @@ extern NSString * const NXOAuth2ClientConnectionContextTokenRefresh;
 /*!
  * Authenticate with username & password (User Credentials Flow)
  */
+- (void)authenticateWithClientCredentials;
 - (void)authenticateWithUsername:(NSString *)username password:(NSString *)password;
 
 /*!

Sources/OAuth2Client/NXOAuth2Client.m

@@ -91,6 +91,8 @@ - (id)initWithClientID:(NSString *)aClientId
         tokenType = [aTokenType copy];
         accessToken = anAccessToken;
 
+        self.acceptType = @"application/json";
+        
         self.persistent = shouldPersist;
         self.delegate = aDelegate;
     }
@@ -333,6 +335,31 @@ - (void)requestTokenWithAuthGrant:(NSString *)authGrant redirectURL:(NSURL *)red
     authConnection.context = NXOAuth2ClientConnectionContextTokenRequest;
 }
 
+// Client Credential Flow
+- (void)authenticateWithClientCredentials;
+{
+    NSAssert1(!authConnection, @"authConnection already running with: %@", authConnection);
+    
+    NSMutableURLRequest *tokenRequest = [NSMutableURLRequest requestWithURL:tokenURL];
+    [tokenRequest setHTTPMethod:@"POST"];
+    [authConnection cancel];  // just to be sure
+    
+    self.authenticating = YES;
+    
+    NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                                       @"client_credentials", @"grant_type",
+                                       clientId, @"client_id",
+                                       clientSecret, @"client_secret",
+                                       nil];
+    if (self.desiredScope) {
+        [parameters setObject:[[self.desiredScope allObjects] componentsJoinedByString:@" "] forKey:@"scope"];
+    }
+    authConnection = [[NXOAuth2Connection alloc] initWithRequest:tokenRequest
+                                               requestParameters:parameters
+                                                     oauthClient:self
+                                                        delegate:self];
+    authConnection.context = NXOAuth2ClientConnectionContextTokenRequest;
+}
 
 // User Password Flow Only
 - (void)authenticateWithUsername:(NSString *)username password:(NSString *)password;

Sources/OAuth2Client/NXOAuth2Connection.m

@@ -197,6 +197,10 @@ - (NSURLConnection *)createConnection;
         [startRequest setValue:client.userAgent forHTTPHeaderField:@"User-Agent"];
     }
 
+    if (client.acceptType) {
+        [startRequest setValue:client.acceptType forHTTPHeaderField:@"Accept"];
+    }
+    
     NSURLConnection *aConnection = [[NSURLConnection alloc] initWithRequest:startRequest delegate:self startImmediately:NO];    // don't start yet
     [aConnection scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];    // let's first schedule it in the current runloop. (see http://github.com/soundcloud/cocoa-api-wrapper/issues#issue/2 )
     [aConnection start];    // now start