OACall.h OACall.m OAProblem.h OAProblem.m OATokenManager.h OATokenManager.m @@ -29,7 +29,9 @@ @interface NSMutableURLRequest (OAParameterAdditions) -- (NSArray *)parameters; -- (void)setParameters:(NSArray *)parameters; +@property(nonatomic, retain) NSArray *parameters; + +- (void)setHTTPBodyWithString:(NSString *)body; +- (void)attachFileWithName:(NSString *)name filename:(NSString*)filename contentType:(NSString *)contentType data:(NSData*)data; @end Categories/NSMutableURLRequest+Parameters.h @@ -25,25 +25,31 @@ #import "NSMutableURLRequest+Parameters.h" +static NSString *Boundary = @"-----------------------------------0xCoCoaouTHeBouNDaRy"; @implementation NSMutableURLRequest (OAParameterAdditions) +- (BOOL)isMultipart { + return [[self valueForHTTPHeaderField:@"Content-Type"] hasPrefix:@"multipart/form-data"]; +} + - (NSArray *)parameters { - NSString *encodedParameters; + NSString *encodedParameters = nil; - if ([[self HTTPMethod] isEqualToString:@"GET"] || [[self HTTPMethod] isEqualToString:@"DELETE"]) { - encodedParameters = [[self URL] query]; - } else { - // POST, PUT - encodedParameters = [[NSString alloc] initWithData:[self HTTPBody] encoding:NSASCIIStringEncoding]; - } + if (![self isMultipart]) { + if ([[self HTTPMethod] isEqualToString:@"GET"] || [[self HTTPMethod] isEqualToString:@"DELETE"]) { + encodedParameters = [[self URL] query]; + } else { + encodedParameters = [[[NSString alloc] initWithData:[self HTTPBody] encoding:NSASCIIStringEncoding] autorelease]; + } + } - if ((encodedParameters == nil) || ([encodedParameters isEqualToString:@""])) { + if (encodedParameters == nil || [encodedParameters isEqualToString:@""]) { return nil; } - + NSLog(@"raw parameters %@", encodedParameters); NSArray *encodedParameterPairs = [encodedParameters componentsSeparatedByString:@"&"]; - NSMutableArray *requestParameters = [[NSMutableArray alloc] initWithCapacity:16]; + NSMutableArray *requestParameters = [NSMutableArray arrayWithCapacity:[encodedParameterPairs count]]; for (NSString *encodedPair in encodedParameterPairs) { NSArray *encodedPairElements = [encodedPair componentsSeparatedByString:@"="]; @@ -55,27 +61,52 @@ return requestParameters; } -- (void)setParameters:(NSArray *)parameters { - NSMutableString *encodedParameterPairs = [[NSMutableString alloc] initWithCapacity:256]; +- (void)setParameters:(NSArray *)parameters +{ + NSMutableArray *pairs = [[[NSMutableArray alloc] initWithCapacity:[parameters count]] autorelease]; + for (OARequestParameter *requestParameter in parameters) { + [pairs addObject:[requestParameter URLEncodedNameValuePair]]; + } + + NSString *encodedParameterPairs = [pairs componentsJoinedByString:@"&"]; - int position = 1; - for (OARequestParameter *requestParameter in parameters) { - [encodedParameterPairs appendString:[requestParameter URLEncodedNameValuePair]]; - if (position < [parameters count]) { - [encodedParameterPairs appendString:@"&"]; - } - position++; - } - - if ([[self HTTPMethod] isEqualToString:@"GET"] || [[self HTTPMethod] isEqualToString:@"DELETE"]) { - [self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@", [[self URL] URLStringWithoutQuery], encodedParameterPairs]]]; - } else { - // POST, PUT - NSData *postData = [encodedParameterPairs dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES]; - [self setHTTPBody:postData]; - [self setValue:[NSString stringWithFormat:@"%d", [postData length]] forHTTPHeaderField:@"Content-Length"]; - [self setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"]; - } + if ([[self HTTPMethod] isEqualToString:@"GET"] || [[self HTTPMethod] isEqualToString:@"DELETE"]) { + [self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@", [[self URL] URLStringWithoutQuery], encodedParameterPairs]]]; + } else { + // POST, PUT + [self setHTTPBodyWithString:encodedParameterPairs]; + [self setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"]; + } +} + +- (void)setHTTPBodyWithString:(NSString *)body { + NSData *bodyData = [body dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES]; + [self setValue:[NSString stringWithFormat:@"%d", [bodyData length]] forHTTPHeaderField:@"Content-Length"]; + [self setHTTPBody:bodyData]; +} + +- (void)attachFileWithName:(NSString *)name filename:(NSString*)filename contentType:(NSString *)contentType data:(NSData*)data { + + NSArray *parameters = [self parameters]; + [self setValue:[@"multipart/form-data; boundary=" stringByAppendingString:Boundary] forHTTPHeaderField:@"Content-type"]; + + NSMutableData *bodyData = [NSMutableData new]; + for (OARequestParameter *parameter in parameters) { + NSString *param = [NSString stringWithFormat:@"--%@\r\nContent-Disposition: form-data; name=\"%@\"\r\n\r\n%@\r\n", + Boundary, [parameter URLEncodedName], [parameter value]]; + + [bodyData appendData:[param dataUsingEncoding:NSUTF8StringEncoding]]; + } + + NSString *filePrefix = [NSString stringWithFormat:@"--%@\r\nContent-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\nContent-Type: %@\r\n\r\n", + Boundary, name, filename, contentType]; + [bodyData appendData:[filePrefix dataUsingEncoding:NSUTF8StringEncoding]]; + [bodyData appendData:data]; + + [bodyData appendData:[[[@"--" stringByAppendingString:Boundary] stringByAppendingString:@"--"] dataUsingEncoding:NSUTF8StringEncoding]]; + [self setValue:[NSString stringWithFormat:@"%d", [bodyData length]] forHTTPHeaderField:@"Content-Length"]; + [self setHTTPBody:bodyData]; + [bodyData release]; } @end Categories/NSMutableURLRequest+Parameters.m @@ -30,5 +30,6 @@ - (NSString *)encodedURLString; - (NSString *)encodedURLParameterString; - +- (NSString *)decodedURLString; +- (NSString *)removeQuotes; @end Categories/NSString+URLEncoding.h @@ -34,7 +34,7 @@ NULL, // characters to leave unescaped (NULL = all escaped sequences are replaced) CFSTR("?=&+"), // legal URL characters to be escaped (NULL = all legal characters are replaced) kCFStringEncodingUTF8); // encoding - return result; + return [result autorelease]; } - (NSString *)encodedURLParameterString { @@ -43,7 +43,31 @@ NULL, CFSTR(":/=,!$&'()*+;[]@#?"), kCFStringEncodingUTF8); - return result; + return [result autorelease]; +} + +- (NSString *)decodedURLString { + NSString *result = (NSString*)CFURLCreateStringByReplacingPercentEscapesUsingEncoding(kCFAllocatorDefault, + (CFStringRef)self, + CFSTR(""), + kCFStringEncodingUTF8); + + return [result autorelease]; + +} + +-(NSString *)removeQuotes +{ + NSUInteger length = [self length]; + NSString *ret = self; + if ([self characterAtIndex:0] == '"') { + ret = [ret substringFromIndex:1]; + } + if ([self characterAtIndex:length - 1] == '"') { + ret = [ret substringToIndex:length - 2]; + } + + return ret; } @end Categories/NSString+URLEncoding.m @@ -35,6 +35,8 @@ @property(copy, readwrite) NSString *key; @property(copy, readwrite) NSString *secret; -- (id)initWithKey:(NSString *)aKey secret:(NSString *)aSecret; +- (id)initWithKey:(const NSString *)aKey secret:(const NSString *)aSecret; + +- (BOOL)isEqualToConsumer:(OAConsumer *)aConsumer; @end OAConsumer.h @@ -31,11 +31,23 @@ #pragma mark init -- (id)initWithKey:(NSString *)aKey secret:(NSString *)aSecret { +- (id)initWithKey:(const NSString *)aKey secret:(const NSString *)aSecret { [super init]; - self.key = aKey; - self.secret = aSecret; + self.key = [aKey retain]; + self.secret = [aSecret retain]; return self; } +- (BOOL)isEqual:(id)object { + if ([object isKindOfClass:[self class]]) { + return [self isEqualToConsumer:(OAConsumer*)object]; + } + return NO; +} + +- (BOOL)isEqualToConsumer:(OAConsumer *)aConsumer { + return ([self.key isEqualToString:aConsumer.key] && + [self.secret isEqualToString:aConsumer.secret]); +} + @end OAConsumer.m @@ -33,8 +33,7 @@ OAMutableURLRequest *request; NSURLResponse *response; NSURLConnection *connection; - NSError *error; - NSData *responseData; + NSMutableData *responseData; id delegate; SEL didFinishSelector; SEL didFailSelector; OADataFetcher.h @@ -29,33 +29,58 @@ @implementation OADataFetcher +- (id)init { + [super init]; + responseData = [[NSMutableData alloc] init]; + return self; +} + +- (void)dealloc { + [connection release]; + [response release]; + [responseData release]; + [request release]; + [super dealloc]; +} + +/* Protocol for async URL loading */ +- (void)connection:(NSURLConnection *)aConnection didReceiveResponse:(NSURLResponse *)aResponse { + [response release]; + response = [aResponse retain]; + [responseData setLength:0]; +} + +- (void)connection:(NSURLConnection *)aConnection didFailWithError:(NSError *)error { + OAServiceTicket *ticket = [[OAServiceTicket alloc] initWithRequest:request + response:response + data:responseData + didSucceed:NO]; + + [delegate performSelector:didFailSelector withObject:ticket withObject:error]; +} + +- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data { + [responseData appendData:data]; +} + +- (void)connectionDidFinishLoading:(NSURLConnection *)connection { + OAServiceTicket *ticket = [[OAServiceTicket alloc] initWithRequest:request + response:response + data:responseData + didSucceed:[(NSHTTPURLResponse *)response statusCode] < 400]; + + [delegate performSelector:didFinishSelector withObject:ticket withObject:responseData]; +} + - (void)fetchDataWithRequest:(OAMutableURLRequest *)aRequest delegate:(id)aDelegate didFinishSelector:(SEL)finishSelector didFailSelector:(SEL)failSelector { - request = aRequest; + request = [aRequest retain]; delegate = aDelegate; didFinishSelector = finishSelector; didFailSelector = failSelector; [request prepare]; - - responseData = [NSURLConnection sendSynchronousRequest:request - returningResponse:&response - error:&error]; - - if (response == nil || responseData == nil || error != nil) { - OAServiceTicket *ticket= [[OAServiceTicket alloc] initWithRequest:request - response:response - didSucceed:NO]; - [delegate performSelector:didFailSelector - withObject:ticket - withObject:error]; - } else { - OAServiceTicket *ticket = [[OAServiceTicket alloc] initWithRequest:request - response:response - didSucceed:[(NSHTTPURLResponse *)response statusCode] < 400]; - [delegate performSelector:didFinishSelector - withObject:ticket - withObject:responseData]; - } + + connection = [[NSURLConnection alloc] initWithRequest:aRequest delegate:self]; } @end OADataFetcher.m @@ -98,28 +98,30 @@ signatureProvider:(id<OASignatureProviding, NSObject>)aProvider - (void)prepare { // sign - signature = [signatureProvider signClearText:[self _signatureBaseString] + NSLog(@"Base string is: %@", [self _signatureBaseString]); + signature = [signatureProvider signClearText:[self _signatureBaseString] withSecret:[NSString stringWithFormat:@"%@&%@", consumer.secret, - token.secret]]; + token.secret ? token.secret : @""]]; // set OAuth headers - - NSString *oauthToken; - if ([token.key isEqualToString:@""]) { - oauthToken = @""; // not used on Request Token transactions - } else { - oauthToken = [NSString stringWithFormat:@"oauth_token=\"%@\", ", [token.key encodedURLParameterString]]; - } - - NSString *oauthHeader = [NSString stringWithFormat:@"OAuth realm=\"%@\", oauth_consumer_key=\"%@\", %@oauth_signature_method=\"%@\", oauth_signature=\"%@\", oauth_timestamp=\"%@\", oauth_nonce=\"%@\", oauth_version=\"1.0\"", - [realm encodedURLParameterString], - [consumer.key encodedURLParameterString], - oauthToken, - [[signatureProvider name] encodedURLParameterString], - [signature encodedURLParameterString], - timestamp, - nonce]; + NSMutableArray *chunks = [[NSMutableArray alloc] init]; + [chunks addObject:[NSString stringWithFormat:@"realm=\"%@\"", [realm encodedURLParameterString]]]; + [chunks addObject:[NSString stringWithFormat:@"oauth_consumer_key=\"%@\"", [consumer.key encodedURLParameterString]]]; + + NSDictionary *tokenParameters = [token parameters]; + for (NSString *k in tokenParameters) { + [chunks addObject:[NSString stringWithFormat:@"%@=\"%@\"", k, [[tokenParameters objectForKey:k] encodedURLParameterString]]]; + } + + [chunks addObject:[NSString stringWithFormat:@"oauth_signature_method=\"%@\"", [[signatureProvider name] encodedURLParameterString]]]; + [chunks addObject:[NSString stringWithFormat:@"oauth_signature=\"%@\"", [signature encodedURLParameterString]]]; + [chunks addObject:[NSString stringWithFormat:@"oauth_timestamp=\"%@\"", timestamp]]; + [chunks addObject:[NSString stringWithFormat:@"oauth_nonce=\"%@\"", nonce]]; + [chunks addObject:@"oauth_version=\"1.0\""]; + + NSString *oauthHeader = [NSString stringWithFormat:@"OAuth %@", [chunks componentsJoinedByString:@", "]]; + [chunks release]; [self setValue:oauthHeader forHTTPHeaderField:@"Authorization"]; } @@ -138,25 +140,31 @@ signatureProvider:(id<OASignatureProviding, NSObject>)aProvider - (NSString *)_signatureBaseString { // OAuth Spec, Section 9.1.1 "Normalize Request Parameters" // build a sorted array of both request parameters and OAuth header parameters - NSMutableArray *parameterPairs = [[NSMutableArray alloc] initWithCapacity:(6 + [[self parameters] count])]; // 6 being the number of OAuth params in the Signature Base String + NSDictionary *tokenParameters = [token parameters]; + // 6 being the number of OAuth params in the Signature Base String + NSMutableArray *parameterPairs = [[NSMutableArray alloc] initWithCapacity:(5 + [[self parameters] count] + [tokenParameters count])]; [parameterPairs addObject:[[[OARequestParameter alloc] initWithName:@"oauth_consumer_key" value:consumer.key] URLEncodedNameValuePair]]; [parameterPairs addObject:[[[OARequestParameter alloc] initWithName:@"oauth_signature_method" value:[signatureProvider name]] URLEncodedNameValuePair]]; [parameterPairs addObject:[[[OARequestParameter alloc] initWithName:@"oauth_timestamp" value:timestamp] URLEncodedNameValuePair]]; [parameterPairs addObject:[[[OARequestParameter alloc] initWithName:@"oauth_nonce" value:nonce] URLEncodedNameValuePair]]; [parameterPairs addObject:[[[OARequestParameter alloc] initWithName:@"oauth_version" value:@"1.0"] URLEncodedNameValuePair]]; + + + for(NSString *k in tokenParameters) { + [parameterPairs addObject:[[OARequestParameter requestParameter:k value:[tokenParameters objectForKey:k]] URLEncodedNameValuePair]]; + } - if (![token.key isEqualToString:@""]) { - [parameterPairs addObject:[[[OARequestParameter alloc] initWithName:@"oauth_token" value:token.key] URLEncodedNameValuePair]]; - } - - for (OARequestParameter *param in [self parameters]) { - [parameterPairs addObject:[param URLEncodedNameValuePair]]; - } + if (![[self valueForHTTPHeaderField:@"Content-Type"] hasPrefix:@"multipart/form-data"]) { + for (OARequestParameter *param in [self parameters]) { + [parameterPairs addObject:[param URLEncodedNameValuePair]]; + } + } NSArray *sortedPairs = [parameterPairs sortedArrayUsingSelector:@selector(compare:)]; NSString *normalizedRequestParameters = [sortedPairs componentsJoinedByString:@"&"]; + NSLog(@"Normalized: %@", normalizedRequestParameters); // OAuth Spec, Section 9.1.2 "Concatenate Request Elements" return [NSString stringWithFormat:@"%@&%@&%@", [self HTTPMethod], OAMutableURLRequest.m @@ -41,4 +41,8 @@ - (NSString *)URLEncodedValue; - (NSString *)URLEncodedNameValuePair; +- (BOOL)isEqualToRequestParameter:(OARequestParameter *)parameter; + ++ (id)requestParameter:(NSString *)aName value:(NSString *)aValue; + @end OARequestParameter.h @@ -38,7 +38,8 @@ } - (NSString *)URLEncodedName { - return [self.name encodedURLParameterString]; + return self.name; +// return [self.name encodedURLParameterString]; } - (NSString *)URLEncodedValue { @@ -49,4 +50,23 @@ return [NSString stringWithFormat:@"%@=%@", [self URLEncodedName], [self URLEncodedValue]]; } +- (BOOL)isEqual:(id)object { + if ([object isKindOfClass:[self class]]) { + return [self isEqualToRequestParameter:(OARequestParameter *)object]; + } + + return NO; +} + +- (BOOL)isEqualToRequestParameter:(OARequestParameter *)parameter { + return ([self.name isEqualToString:parameter.name] && + [self.value isEqualToString:parameter.value]); +} + + ++ (id)requestParameter:(NSString *)aName value:(NSString *)aValue +{ + return [[[self alloc] initWithName:aName value:aValue] autorelease]; +} + @end OARequestParameter.m @@ -32,12 +32,15 @@ @private OAMutableURLRequest *request; NSURLResponse *response; + NSData *data; BOOL didSucceed; } @property(readonly) OAMutableURLRequest *request; @property(readonly) NSURLResponse *response; +@property(readonly) NSData *data; @property(readonly) BOOL didSucceed; +@property(readonly) NSString *body; -- (id)initWithRequest:(OAMutableURLRequest *)aRequest response:(NSURLResponse *)aResponse didSucceed:(BOOL)success; +- (id)initWithRequest:(OAMutableURLRequest *)aRequest response:(NSURLResponse *)aResponse data:(NSData *)aData didSucceed:(BOOL)success; @end OAServiceTicket.h @@ -28,14 +28,24 @@ @implementation OAServiceTicket -@synthesize request, response, didSucceed; +@synthesize request, response, data, didSucceed; -- (id)initWithRequest:(OAMutableURLRequest *)aRequest response:(NSURLResponse *)aResponse didSucceed:(BOOL)success { +- (id)initWithRequest:(OAMutableURLRequest *)aRequest response:(NSURLResponse *)aResponse data:(NSData *)aData didSucceed:(BOOL)success { [super init]; request = aRequest; response = aResponse; + data = aData; didSucceed = success; return self; } +- (NSString *)body +{ + if (!data) { + return nil; + } + + return [[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] autorelease]; +} + @end OAServiceTicket.m @@ -29,13 +29,44 @@ @protected NSString *key; NSString *secret; + NSString *session; + NSNumber *duration; + NSMutableDictionary *attributes; + NSDate *created; + BOOL renewable; + BOOL forRenewal; } @property(copy, readwrite) NSString *key; @property(copy, readwrite) NSString *secret; +@property(copy, readwrite) NSString *session; +@property(retain, readwrite) NSNumber *duration; +@property(retain, readwrite) NSDictionary *attributes; +@property(readwrite, getter=isForRenewal) BOOL forRenewal; - (id)initWithKey:(NSString *)aKey secret:(NSString *)aSecret; -- (id)initWithUserDefaultsUsingServiceProviderName:(NSString *)provider prefix:(NSString *)prefix; +- (id)initWithKey:(NSString *)aKey secret:(NSString *)aSecret session:(NSString *)aSession + duration:(NSNumber *)aDuration attributes:(NSDictionary *)theAttributes created:(NSDate *)creation + renewable:(BOOL)renew; - (id)initWithHTTPResponseBody:(NSString *)body; + +- (id)initWithUserDefaultsUsingServiceProviderName:(NSString *)provider prefix:(NSString *)prefix; - (int)storeInUserDefaultsWithServiceProviderName:(NSString *)provider prefix:(NSString *)prefix; +- (BOOL)isValid; + +- (void)setAttribute:(NSString *)aKey value:(NSString *)aValue; +- (NSString *)attribute:(NSString *)aKey; +- (void)setAttributesWithString:(NSString *)aAttributes; +- (NSString *)attributeString; + +- (BOOL)hasExpired; +- (BOOL)isRenewable; +- (void)setDurationWithString:(NSString *)aDuration; +- (BOOL)hasAttributes; +- (NSDictionary *)parameters; + +- (BOOL)isEqualToToken:(OAToken *)aToken; + ++ (void)removeFromUserDefaultsWithServiceProviderName:(const NSString *)provider prefix:(const NSString *)prefix; + @end OAToken.h @@ -24,65 +24,301 @@ // THE SOFTWARE. +#import "NSString+URLEncoding.h" #import "OAToken.h" +@interface OAToken (Private) + ++ (NSString *)settingsKey:(const NSString *)name provider:(const NSString *)provider prefix:(const NSString *)prefix; ++ (id)loadSetting:(const NSString *)name provider:(const NSString *)provider prefix:(const NSString *)prefix; ++ (void)saveSetting:(NSString *)name object:(id)object provider:(const NSString *)provider prefix:(const NSString *)prefix; ++ (NSNumber *)durationWithString:(NSString *)aDuration; ++ (NSDictionary *)attributesWithString:(NSString *)theAttributes; + +@end @implementation OAToken -@synthesize key, secret; +@synthesize key, secret, session, duration, attributes, forRenewal; #pragma mark init - (id)init { - [super init]; - self.key = @""; - self.secret = @""; - return self; + return [self initWithKey:nil secret:nil]; } - (id)initWithKey:(NSString *)aKey secret:(NSString *)aSecret { + return [self initWithKey:aKey secret:aSecret session:nil duration:nil + attributes:nil created:nil renewable:NO]; +} + +- (id)initWithKey:(NSString *)aKey secret:(NSString *)aSecret session:(NSString *)aSession + duration:(NSNumber *)aDuration attributes:(NSDictionary *)theAttributes created:(NSDate *)creation + renewable:(BOOL)renew { [super init]; self.key = aKey; self.secret = aSecret; + self.session = aSession; + self.duration = aDuration; + self.attributes = theAttributes; + created = [creation retain]; + renewable = renew; + forRenewal = NO; + return self; } -- (id)initWithHTTPResponseBody:(NSString *)body { - [super init]; - NSArray *pairs = [body componentsSeparatedByString:@"&"]; - - for (NSString *pair in pairs) { +- (id)initWithHTTPResponseBody:(const NSString *)body { + NSString *aKey = nil; + NSString *aSecret = nil; + NSString *aSession = nil; + NSNumber *aDuration = nil; + NSDate *creationDate = nil; + NSDictionary *attrs = nil; + BOOL renew = NO; + NSArray *pairs = [body componentsSeparatedByString:@"&"]; + + for (NSString *pair in pairs) { NSArray *elements = [pair componentsSeparatedByString:@"="]; if ([[elements objectAtIndex:0] isEqualToString:@"oauth_token"]) { - self.key = [elements objectAtIndex:1]; + aKey = [elements objectAtIndex:1]; } else if ([[elements objectAtIndex:0] isEqualToString:@"oauth_token_secret"]) { - self.secret = [elements objectAtIndex:1]; - } + aSecret = [elements objectAtIndex:1]; + } else if ([[elements objectAtIndex:0] isEqualToString:@"oauth_session_handle"]) { + aSession = [elements objectAtIndex:1]; + } else if ([[elements objectAtIndex:0] isEqualToString:@"oauth_token_duration"]) { + aDuration = [[self class] durationWithString:[elements objectAtIndex:1]]; + creationDate = [NSDate date]; + } else if ([[elements objectAtIndex:0] isEqualToString:@"oauth_token_attributes"]) { + attrs = [[self class] attributesWithString:[[elements objectAtIndex:1] decodedURLString]]; + } else if ([[elements objectAtIndex:0] isEqualToString:@"oauth_token_renewable"]) { + NSString *lowerCase = [[elements objectAtIndex:1] lowercaseString]; + if ([lowerCase isEqualToString:@"true"] || [lowerCase isEqualToString:@"t"]) { + renew = YES; + } + } } - return self; + return [self initWithKey:aKey secret:aSecret session:aSession duration:aDuration + attributes:attrs created:creationDate renewable:renew]; +} + +- (id)initWithUserDefaultsUsingServiceProviderName:(const NSString *)provider prefix:(const NSString *)prefix { + [super init]; + key = [OAToken loadSetting:@"key" provider:provider prefix:prefix]; + secret = [OAToken loadSetting:@"secret" provider:provider prefix:prefix]; + session = [OAToken loadSetting:@"session" provider:provider prefix:prefix]; + duration = [OAToken loadSetting:@"duration" provider:provider prefix:prefix]; + attributes = [OAToken loadSetting:@"attributes" provider:provider prefix:prefix]; + created = [OAToken loadSetting:@"created" provider:provider prefix:prefix]; + renewable = [[OAToken loadSetting:@"renewable" provider:provider prefix:prefix] boolValue]; + + if (![self isValid]) { + [self autorelease]; + return nil; + } + + return self; +} + +#pragma mark dealloc + +- (void)dealloc { + [key release]; + [secret release]; + [duration release]; + [attributes release]; + [super dealloc]; +} + +#pragma mark settings + +- (BOOL)isValid { + return (key != nil && ![key isEqualToString:@""] && secret != nil && ![secret isEqualToString:@""]); +} + +- (int)storeInUserDefaultsWithServiceProviderName:(const NSString *)provider prefix:(const NSString *)prefix { + [OAToken saveSetting:@"key" object:key provider:provider prefix:prefix]; + [OAToken saveSetting:@"secret" object:secret provider:provider prefix:prefix]; + [OAToken saveSetting:@"created" object:created provider:provider prefix:prefix]; + [OAToken saveSetting:@"duration" object:duration provider:provider prefix:prefix]; + [OAToken saveSetting:@"session" object:session provider:provider prefix:prefix]; + [OAToken saveSetting:@"attributes" object:attributes provider:provider prefix:prefix]; + [OAToken saveSetting:@"renewable" object:renewable ? @"t" : @"f" provider:provider prefix:prefix]; + + [[NSUserDefaults standardUserDefaults] synchronize]; + return(0); +} + +#pragma mark duration + +- (void)setDurationWithString:(NSString *)aDuration { + self.duration = [[self class] durationWithString:aDuration]; +} + +- (BOOL)hasExpired +{ + return created && [created timeIntervalSinceNow] > [duration intValue]; +} + +- (BOOL)isRenewable +{ + return session && renewable && created && [created timeIntervalSinceNow] < (2 * [duration intValue]); +} + + +#pragma mark attributes + +- (void)setAttribute:(const NSString *)aKey value:(const NSString *)aAttribute { + if (!attributes) { + attributes = [[NSMutableDictionary alloc] init]; + } + [attributes setObject: aAttribute forKey: aKey]; +} + +- (void)setAttributes:(NSDictionary *)theAttributes { + [attributes release]; + attributes = [[NSMutableDictionary alloc] initWithDictionary:theAttributes]; + } +- (BOOL)hasAttributes { + return (attributes && [attributes count] > 0); +} + +- (NSString *)attributeString { + if (![self hasAttributes]) { + return @""; + } + + NSMutableArray *chunks = [[NSMutableArray alloc] init]; + for(NSString *aKey in self->attributes) { + [chunks addObject:[NSString stringWithFormat:@"%@:%@", aKey, [attributes objectForKey:aKey]]]; + } + NSString *attrs = [chunks componentsJoinedByString:@";"]; + [chunks release]; + return attrs; +} -- (id)initWithUserDefaultsUsingServiceProviderName:(NSString *)provider prefix:(NSString *)prefix +- (NSString *)attribute:(NSString *)aKey { -[super init]; -NSString *theKey = [[NSUserDefaults standardUserDefaults] stringForKey:[NSString stringWithFormat:@"OAUTH_%@_%@_KEY", prefix, provider]]; -NSString *theSecret = [[NSUserDefaults standardUserDefaults] stringForKey:[NSString stringWithFormat:@"OAUTH_%@_%@_SECRET", prefix, provider]]; -if (theKey == NULL || theSecret == NULL) - return(nil); -self.key = theKey; -self.secret = theSecret; -return(self); + return [attributes objectForKey:aKey]; } +- (void)setAttributesWithString:(NSString *)theAttributes +{ + self.attributes = [[self class] attributesWithString:theAttributes]; +} -- (int)storeInUserDefaultsWithServiceProviderName:(NSString *)provider prefix:(NSString *)prefix +- (NSDictionary *)parameters { -[[NSUserDefaults standardUserDefaults] setObject:self.key forKey:[NSString stringWithFormat:@"OAUTH_%@_%@_KEY", prefix, provider]]; -[[NSUserDefaults standardUserDefaults] setObject:self.secret forKey:[NSString stringWithFormat:@"OAUTH_%@_%@_SECRET", prefix, provider]]; -[[NSUserDefaults standardUserDefaults] synchronize]; -return(0); + NSMutableDictionary *params = [[[NSMutableDictionary alloc] init] autorelease]; + + if (key) { + [params setObject:key forKey:@"oauth_token"]; + if ([self isForRenewal]) { + [params setObject:session forKey:@"oauth_session_handle"]; + } + } else { + if (duration) { + [params setObject:[duration stringValue] forKey: @"oauth_token_duration"]; + } + if ([attributes count]) { + [params setObject:[self attributeString] forKey:@"oauth_token_attributes"]; + } + } + return params; +} + +#pragma mark comparisions + +- (BOOL)isEqual:(id)object { + if([object isKindOfClass:[self class]]) { + return [self isEqualToToken:(OAToken *)object]; + } + return NO; +} + +- (BOOL)isEqualToToken:(OAToken *)aToken { + /* Since ScalableOAuth determines that the token may be + renewed using the same key and secret, we must also + check the creation date */ + if ([self.key isEqualToString:aToken.key] && + [self.secret isEqualToString:aToken.secret]) { + /* May be nil */ + if (created == aToken->created || [created isEqualToDate:aToken->created]) { + return YES; + } + } + + return NO; +} + +#pragma mark class_functions + ++ (NSString *)settingsKey:(NSString *)name provider:(NSString *)provider prefix:(NSString *)prefix { + return [NSString stringWithFormat:@"OAUTH_%@_%@_%@", provider, prefix, [name uppercaseString]]; +} + ++ (id)loadSetting:(NSString *)name provider:(NSString *)provider prefix:(NSString *)prefix { + return [[NSUserDefaults standardUserDefaults] objectForKey:[self settingsKey:name + provider:provider + prefix:prefix]]; +} + ++ (void)saveSetting:(NSString *)name object:(id)object provider:(NSString *)provider prefix:(NSString *)prefix { + [[NSUserDefaults standardUserDefaults] setObject:object forKey:[self settingsKey:name + provider:provider + prefix:prefix]]; +} + ++ (void)removeFromUserDefaultsWithServiceProviderName:(NSString *)provider prefix:(NSString *)prefix { + NSArray *keys = [NSArray arrayWithObjects:@"key", @"secret", @"created", @"duration", @"session", @"attributes", @"renewable", nil]; + for(NSString *name in keys) { + [[NSUserDefaults standardUserDefaults] removeObjectForKey:[OAToken settingsKey:name provider:provider prefix:prefix]]; + } +} + ++ (NSNumber *)durationWithString:(NSString *)aDuration { + NSUInteger length = [aDuration length]; + unichar c = toupper([aDuration characterAtIndex:length - 1]); + int mult; + if (c >= '0' && c <= '9') { + return [NSNumber numberWithInt:[aDuration intValue]]; + } + if (c == 'S') { + mult = 1; + } else if (c == 'H') { + mult = 60 * 60; + } else if (c == 'D') { + mult = 60 * 60 * 24; + } else if (c == 'W') { + mult = 60 * 60 * 24 * 7; + } else if (c == 'M') { + mult = 60 * 60 * 24 * 30; + } else if (c == 'Y') { + mult = 60 * 60 * 365; + } else { + mult = 1; + } + + return [NSNumber numberWithInt: mult * [[aDuration substringToIndex:length - 1] intValue]]; +} + ++ (NSDictionary *)attributesWithString:(NSString *)theAttributes { + NSArray *attrs = [theAttributes componentsSeparatedByString:@";"]; + NSMutableDictionary *dct = [[NSMutableDictionary alloc] init]; + for (NSString *pair in attrs) { + NSArray *elements = [pair componentsSeparatedByString:@":"]; + [dct setObject:[elements objectAtIndex:1] forKey:[elements objectAtIndex:0]]; + } + return [dct autorelease]; +} + +#pragma mark description + +- (NSString *)description { + return [NSString stringWithFormat:@"Key \"%@\" Secret:\"%@\"", key, secret]; } @end OAToken.m @@ -24,6 +24,7 @@ // THE SOFTWARE. #import <Foundation/Foundation.h> +#import "OAProblem.h" #import "OAuthConsumer/OAToken.h" #import "OAuthConsumer/OAConsumer.h" #import "OAuthConsumer/OAMutableURLRequest.h" @@ -35,4 +36,5 @@ #import "OAuthConsumer/OAPlaintextSignatureProvider.h" #import "OAuthConsumer/OARequestParameter.h" #import "OAuthConsumer/OAServiceTicket.h" -#import "OAuthConsumer/OADataFetcher.h" \ No newline at end of file +#import "OAuthConsumer/OADataFetcher.h" +#import "OATokenManager.h" \ No newline at end of file OAuthConsumer.h 12743182bc26faef071f4e274d7c0a7d9f49e63f Jonathan George jonathan@jdg.net http://github.com/jdg/oauthconsumer/commit/01ce025e01c89a84364d21b0b32de6907c80d666 01ce025e01c89a84364d21b0b32de6907c80d666 2008-10-30T15:05:40-07:00 2008-10-30T15:05:40-07:00 Add in extensions by Alberto Hierro (http://fi.am/) f37fa19a28000049a1fc9ad4bd8c3d98cedbbc33 Jonathan George jonathan@jdg.net