Merge pull request #52 from squarefrog/develop

Created authenticate with client credentials method, for account creation

Author: toto

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

@@ -122,6 +122,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

@@ -333,6 +333,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;