@@ -47,7 +47,7 @@ static NSString *Boundary = @"-----------------------------------0xCoCoaouTHeBou if (encodedParameters == nil || [encodedParameters isEqualToString:@""]) { return nil; } - NSLog(@"raw parameters %@", encodedParameters); +// NSLog(@"raw parameters %@", encodedParameters); NSArray *encodedParameterPairs = [encodedParameters componentsSeparatedByString:@"&"]; NSMutableArray *requestParameters = [NSMutableArray arrayWithCapacity:[encodedParameterPairs count]]; Categories/NSMutableURLRequest+Parameters.m @@ -98,7 +98,7 @@ signatureProvider:(id<OASignatureProviding, NSObject>)aProvider - (void)prepare { // sign - NSLog(@"Base string is: %@", [self _signatureBaseString]); +// NSLog(@"Base string is: %@", [self _signatureBaseString]); signature = [signatureProvider signClearText:[self _signatureBaseString] withSecret:[NSString stringWithFormat:@"%@&%@", consumer.secret, @@ -164,7 +164,7 @@ signatureProvider:(id<OASignatureProviding, NSObject>)aProvider NSArray *sortedPairs = [parameterPairs sortedArrayUsingSelector:@selector(compare:)]; NSString *normalizedRequestParameters = [sortedPairs componentsJoinedByString:@"&"]; - NSLog(@"Normalized: %@", normalizedRequestParameters); +// NSLog(@"Normalized: %@", normalizedRequestParameters); // OAuth Spec, Section 9.1.2 "Concatenate Request Elements" return [NSString stringWithFormat:@"%@&%@&%@", [self HTTPMethod], OAMutableURLRequest.m @@ -36,11 +36,11 @@ BOOL renewable; BOOL forRenewal; } -@property(copy, readwrite) NSString *key; -@property(copy, readwrite) NSString *secret; -@property(copy, readwrite) NSString *session; +@property(retain, readwrite) NSString *key; +@property(retain, readwrite) NSString *secret; +@property(retain, readwrite) NSString *session; @property(retain, readwrite) NSNumber *duration; -@property(retain, readwrite) NSDictionary *attributes; +@property(retain, readwrite) NSMutableDictionary *attributes; @property(readwrite, getter=isForRenewal) BOOL forRenewal; - (id)initWithKey:(NSString *)aKey secret:(NSString *)aSecret; OAToken.h @@ -105,14 +105,14 @@ - (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]; + self.key = [OAToken loadSetting:@"key" provider:provider prefix:prefix]; + self.secret = [OAToken loadSetting:@"secret" provider:provider prefix:prefix]; + self.session = [OAToken loadSetting:@"session" provider:provider prefix:prefix]; + self.duration = [OAToken loadSetting:@"duration" provider:provider prefix:prefix]; + self.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; @@ -124,10 +124,10 @@ #pragma mark dealloc - (void)dealloc { - [key release]; - [secret release]; - [duration release]; - [attributes release]; + self.key = nil; + self.secret = nil; + self.duration = nil; + self.attributes = nil; [super dealloc]; } OAToken.m @@ -25,16 +25,16 @@ #import <Foundation/Foundation.h> #import "OAProblem.h" -#import "OAuthConsumer/OAToken.h" -#import "OAuthConsumer/OAConsumer.h" -#import "OAuthConsumer/OAMutableURLRequest.h" -#import "OAuthConsumer/NSString+URLEncoding.h" -#import "OAuthConsumer/NSMutableURLRequest+Parameters.h" -#import "OAuthConsumer/NSURL+Base.h" -#import "OAuthConsumer/OASignatureProviding.h" -#import "OAuthConsumer/OAHMAC_SHA1SignatureProvider.h" -#import "OAuthConsumer/OAPlaintextSignatureProvider.h" -#import "OAuthConsumer/OARequestParameter.h" -#import "OAuthConsumer/OAServiceTicket.h" -#import "OAuthConsumer/OADataFetcher.h" +#import "OAToken.h" +#import "OAConsumer.h" +#import "OAMutableURLRequest.h" +#import "NSString+URLEncoding.h" +#import "NSMutableURLRequest+Parameters.h" +#import "NSURL+Base.h" +#import "OASignatureProviding.h" +#import "OAHMAC_SHA1SignatureProvider.h" +#import "OAPlaintextSignatureProvider.h" +#import "OARequestParameter.h" +#import "OAServiceTicket.h" +#import "OADataFetcher.h" #import "OATokenManager.h" \ No newline at end of file OAuthConsumer.h 01ce025e01c89a84364d21b0b32de6907c80d666 Jonathan George jonathan@jdg.net http://github.com/jdg/oauthconsumer/commit/a344f1a46cba8344199bd74af963e6914adbaf2f a344f1a46cba8344199bd74af963e6914adbaf2f 2009-07-04T09:56:41-07:00 2009-07-04T09:56:41-07:00 Remove debug NSLogs and work with 3.0 807f7cb61993cc0d60619b5b3820e15de7dc00a1 Jonathan George jonathan@jdg.net