Permalink
Browse files

Merge pull request #4 from shazron/plugin-fix-4

Support calling the successCallback of login() from handleOpenURL call
  • Loading branch information...
2 parents 0ebb232 + cf2a115 commit 3753776ce5fa92afcaaa9b92d04befaf8d9724fd Dave Johnson committed Jul 12, 2011
Showing with 13 additions and 6 deletions.
  1. +1 −1 native/ios/FacebookConnectPlugin.h
  2. +12 −5 native/ios/FacebookConnectPlugin.m
@@ -19,6 +19,6 @@
}
@property (nonatomic, retain) Facebook *facebook;
-
+@property (nonatomic, copy) NSString* loginCallbackId;
@end
@@ -19,7 +19,7 @@
@implementation FacebookConnectPlugin
-@synthesize facebook;
+@synthesize facebook, loginCallbackId;
/* This overrides PGPlugin's method, which receives a notification when handleOpenURL is called on the main app delegate */
- (void) handleOpenURL:(NSNotification*)notification
@@ -32,11 +32,17 @@ - (void) handleOpenURL:(NSNotification*)notification
BOOL ok = [facebook handleOpenURL:url];
if (ok) {
+
NSDictionary* session = [NSDictionary
dictionaryWithObjects:[NSArray arrayWithObjects:self.facebook.accessToken, [self.facebook.expirationDate description], APP_SECRET, [NSNumber numberWithBool:YES], @"...", @"...", nil]
forKeys:[NSArray arrayWithObjects:@"access_token", @"expires", @"secret", @"session_key", @"sig", @"uid", nil]];
+ NSDictionary* status = [NSDictionary
+ dictionaryWithObjects:[NSArray arrayWithObjects:@"connected", session, nil]
+ forKeys:[NSArray arrayWithObjects:@"status", @"session", nil]];
+
- [super writeJavascript:[NSString stringWithFormat:@"FB.Auth.setSession(%@);", [session JSONRepresentation]]];
+ PluginResult* result = [PluginResult resultWithStatus:PGCommandStatus_OK messageAsDictionary:status];
+ [super writeJavascript:[result toSuccessCallbackString:self.loginCallbackId]];
}
}
@@ -83,10 +89,11 @@ - (void) login:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options
NSMutableArray* marray = [NSMutableArray arrayWithArray:arguments];
[marray removeObjectAtIndex:0]; // first item is the callbackId
- [facebook authorize:marray delegate:self];
+ // save the callbackId for handleOpenURL return (only works if the app is multi-tasked!)
+ self.loginCallbackId = callbackId;
+
+ return [facebook authorize:marray delegate:self];
- result = [PluginResult resultWithStatus:PGCommandStatus_ERROR messageAsString:@"Must call FB.init before FB.login"];
- jsString = [result toErrorCallbackString:callbackId];
}
[super writeJavascript:jsString];

0 comments on commit 3753776

Please sign in to comment.