Added twitter app lookup table and coding

stevestreza · Jul 16, 2012 · 9f8ff52 · 9f8ff52
1 parent 42d3b44
commit 9f8ff52
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/Source/ETWAccount.m b/Source/ETWAccount.m
@@ -25,6 +25,7 @@
 //
 
 #import "ETWAccount.h"
+#import "ETWTwitterApp.h"
 
 @implementation ETWAccount
 
@@ -43,6 +44,7 @@ - (void)encodeWithCoder:(NSCoder *)aCoder{
     [aCoder encodeObject:_username forKey:@"username"];
     [aCoder encodeObject:_accessTokenKey forKey:@"accessTokenKey"];
     [aCoder encodeObject:_accessTokenSecret forKey:@"accessTokenSecret"];
+	[aCoder encodeObject:self.app.consumerKey forKey:@"appConsumerKey"];
 }
 
 - (id)initWithCoder:(NSCoder *)aDecoder{
@@ -51,6 +53,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder{
         _username = [aDecoder decodeObjectForKey:@"username"];
         _accessTokenKey = [aDecoder decodeObjectForKey:@"accessTokenKey"];
         _accessTokenSecret = [aDecoder decodeObjectForKey:@"accessTokenSecret"];
+		self.app = [ETWTwitterApp appWithConsumerKey:[aDecoder decodeObjectForKey:@"appConsumerKey"]];
     }
     return self;
 }

diff --git a/Source/ETWTwitterApp.h b/Source/ETWTwitterApp.h
@@ -45,6 +45,8 @@ typedef void(^ETWTwitterLoginVerifier)(NSString *verifier);
 
 -(void)addAccount:(ETWAccount *)account;
 
++(ETWTwitterApp *)appWithConsumerKey:(NSString *)key;
+
 // advanced use only
 @property (nonatomic, strong) Class accountClass; // defaults to ETWAccount, override in subclasses if needed
 @property (nonatomic, strong) Class requestClass; // defaults to ETWRequest, override in subclasses if needed

diff --git a/Source/ETWTwitterApp.m b/Source/ETWTwitterApp.m
@@ -41,6 +41,27 @@ @interface ETWTwitterApp ()
 
 @implementation ETWTwitterApp
 
+static NSMutableDictionary *sAppsByConsumerKey = NULL;
+
++(ETWTwitterApp *)appWithConsumerKey:(NSString *)key{
+	return sAppsByConsumerKey[key];
+}
+
++(void)registerConsumerKeyOfApp:(ETWTwitterApp *)app{
+	if(!app.consumerKey) return;
+
+	if(!sAppsByConsumerKey){
+		sAppsByConsumerKey = [NSMutableDictionary dictionary];
+	}
+	[sAppsByConsumerKey setObject:app forKey:app.consumerKey];
+}
+
++(void)deregisterConsumerKeyOfApp:(ETWTwitterApp *)app{
+	if(sAppsByConsumerKey && app.consumerKey){
+		[sAppsByConsumerKey removeObjectForKey:app.consumerKey];
+	}
+}
+
 -(id)init{
     if(self = [super init]){
         _operationQueue = [[NSOperationQueue alloc] init];
@@ -71,6 +92,7 @@ -(void)loginWithCallbackURL:(NSURL *)url
 			accessTokenRequest.type = ETWRequestTypeOAuth;
 			accessTokenRequest.APIMethod = @"access_token";
 			accessTokenRequest.app = self;
+			accessTokenRequest.secure = YES;
 			accessTokenRequest.parameters = @{ @"oauth_verifier" : verifier, @"oauth_token" : response[@"oauth_token"] };
 			[accessTokenRequest performOnQueue:opQueue handler:^(NSDictionary *response, NSError *error, ETWRequest *request) {
 				NSLog(@"Access token! %@", response);
@@ -113,4 +135,10 @@ -(Class)requestClass{
     return _requestClass;
 }
 
+-(void)setConsumerKey:(NSString *)consumerKey{
+	[[self class] deregisterConsumerKeyOfApp:self];
+	_consumerKey = consumerKey;
+	[[self class] registerConsumerKeyOfApp:self];
+}
+
 @end