diff --git a/OAuthCore.h b/OAuthCore.h index b972be1..7690481 100644 --- a/OAuthCore.h +++ b/OAuthCore.h @@ -13,7 +13,8 @@ extern NSString *OAuthorizationHeader(NSURL *url, NSString *_oAuthConsumerKey, NSString *_oAuthConsumerSecret, NSString *_oAuthToken, - NSString *_oAuthTokenSecret); + NSString *_oAuthTokenSecret, + NSString *_verifier); extern NSString *OAuthorizationHeaderWithCallback(NSURL *url, NSString *method, @@ -22,4 +23,5 @@ extern NSString *OAuthorizationHeaderWithCallback(NSURL *url, NSString *_oAuthConsumerSecret, NSString *_oAuthToken, NSString *_oAuthTokenSecret, + NSString *_verifier, NSString *_oAuthCallback); diff --git a/OAuthCore.m b/OAuthCore.m index b89015f..dcfc78e 100644 --- a/OAuthCore.m +++ b/OAuthCore.m @@ -27,11 +27,11 @@ static NSInteger SortParameter(NSString *key1, NSString *key2, void *context) { return [NSData dataWithBytes:buf length:CC_SHA1_DIGEST_LENGTH]; } -NSString *OAuthorizationHeader(NSURL *url, NSString *method, NSData *body, NSString *_oAuthConsumerKey, NSString *_oAuthConsumerSecret, NSString *_oAuthToken, NSString *_oAuthTokenSecret) { - return OAuthorizationHeaderWithCallback(url, method, body, _oAuthConsumerKey, _oAuthConsumerSecret, _oAuthToken, _oAuthTokenSecret, nil); +NSString *OAuthorizationHeader(NSURL *url, NSString *method, NSData *body, NSString *_oAuthConsumerKey, NSString *_oAuthConsumerSecret, NSString *_oAuthToken, NSString *_oAuthTokenSecret, NSString *_verifier) { + return OAuthorizationHeaderWithCallback(url, method, body, _oAuthConsumerKey, _oAuthConsumerSecret, _oAuthToken, _oAuthTokenSecret, _verifier, nil); } -NSString *OAuthorizationHeaderWithCallback(NSURL *url, NSString *method, NSData *body, NSString *_oAuthConsumerKey, NSString *_oAuthConsumerSecret, NSString *_oAuthToken, NSString *_oAuthTokenSecret, NSString *_oAuthCallback) { +NSString *OAuthorizationHeaderWithCallback(NSURL *url, NSString *method, NSData *body, NSString *_oAuthConsumerKey, NSString *_oAuthConsumerSecret, NSString *_oAuthToken, NSString *_oAuthTokenSecret, NSString *_verifier, NSString *_oAuthCallback) { NSString *_oAuthNonce = [NSString ab_GUID]; NSString *_oAuthTimestamp = [NSString stringWithFormat:@"%d", (int)[[NSDate date] timeIntervalSince1970]]; NSString *_oAuthSignatureMethod = @"HMAC-SHA1"; @@ -47,6 +47,8 @@ static NSInteger SortParameter(NSString *key1, NSString *key2, void *context) { [oAuthAuthorizationParameters setObject:_oAuthToken forKey:@"oauth_token"]; if (_oAuthCallback) [oAuthAuthorizationParameters setObject:_oAuthCallback forKey:@"oauth_callback"]; + if ( _verifier ) + [oAuthAuthorizationParameters setObject:_verifier forKey:@"oauth_verifier"]; // get query and body parameters NSDictionary *additionalQueryParameters = [NSURL ab_parseURLQueryString:[url query]]; diff --git a/OAuthCore.podspec b/OAuthCore.podspec new file mode 100644 index 0000000..0e3c507 --- /dev/null +++ b/OAuthCore.podspec @@ -0,0 +1,16 @@ +Pod::Spec.new do |s| + s.name = "OAuthCore" + s.version = "0.0.1" + s.homepage = "https://github.com/atebits/OAuthCore" + s.summary = "<<-DESC + Simple function to sign OAuth requests. + DESC" + + s.authors = "Loren Brichter" + s.requires_arc = false + s.platform = :ios + s.license = "Copyright (C) 2012 Loren Brichter" + s.source = {:git => 'https://github.com/atebits/OAuthCore.git', :commit => "08727c23ae3ce27f9ec2c008d0bc1fbcc0ada20b"} + s.source_files = "OAuthCore.{h,m}", "OAuth+Additions.{h,m}" + s.dependency "NSData+Base64" +end