From e3dfeed55e0b716359fcfd96a14da71c7330ee54 Mon Sep 17 00:00:00 2001 From: Jeena Paradies Date: Sun, 16 May 2010 12:20:24 +0200 Subject: [PATCH] now OAuth without pin --- Controller.m | 8 +- English.lproj/MainMenu.xib | 297 ++++--------------------------------- OAuth.h | 6 +- OAuth.m | 24 ++- 4 files changed, 42 insertions(+), 293 deletions(-) diff --git a/Controller.m b/Controller.m index 80e3478..68c3d66 100644 --- a/Controller.m +++ b/Controller.m @@ -151,8 +151,12 @@ - (void)openNewTweetWindowWithString:(NSString *)aString { [NSApp activateIgnoringOtherApps:YES]; - if ([aString hasPrefix:@"//oauth_token/"]) { - // [oauth requestAccessToken:[aString substringFromIndex:14]]; + NSRange range = [aString rangeOfString:@"oauth_token"]; + + if (range.length > 0) { + NSLog(@"test 3 %@", oauth); + + [oauth requestAccessToken]; } else { MyDocument *newTweet = (MyDocument *)[[NSDocumentController sharedDocumentController] openUntitledDocumentAndDisplay:YES error:nil]; [newTweet withString:aString]; diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index ab7eeaa..4fc797f 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -21,10 +21,9 @@ YES - - - + + YES @@ -854,7 +853,7 @@ NSImage Icon - + LucidaGrande 13 1044 @@ -941,91 +940,7 @@ {1.79769e+308, 1.79769e+308} mentions - - 29 - 2 - {{787, 515}, {324, 89}} - 611845120 - Twitter PIN - NSPanel - - {1.79769e+308, 1.79769e+308} - - - 256 - - YES - - - 270 - {{20, 20}, {182, 49}} - - YES - - -1804468671 - 138413056 - - - LucidaGrande - 36 - 16 - - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - textColor - - 3 - MAA - - - - YES - NSAllRomanInputSourcesLocaleIdentifier - - - - - - 265 - {{214, 26}, {96, 32}} - - YES - - 67239424 - 134217728 - Ok - - - -2038284033 - 129 - - - DQ - 200 - 25 - - - - {324, 89} - - - {{0, 0}, {1920, 1178}} - {1.79769e+308, 1.79769e+308} - twitter-pin - - + OAuth @@ -1456,46 +1371,6 @@ 570 - - - oauth - - - - 578 - - - - twitterPINField - - - - 581 - - - - requestAccessTokenWithPIN: - - - - 582 - - - - requestAccessTokenWithPIN: - - - - 583 - - - - twitterPINPanel - - - - 584 - logoLayer @@ -1504,6 +1379,14 @@ 589 + + + oauth + + + + 591 + @@ -2147,58 +2030,6 @@ - - 571 - - - YES - - - - - - 572 - - - YES - - - - - - - 573 - - - YES - - - - - - 574 - - - - - 575 - - - YES - - - - - - 576 - - - - - 577 - - - 587 @@ -2213,6 +2044,11 @@ + + 590 + + + @@ -2376,20 +2212,12 @@ 57.IBPluginDependency 57.ImportedFromIB2 57.editorWindowContentRectSynchronizationRect - 571.IBEditorWindowLastContentRect - 571.IBPluginDependency - 571.IBWindowTemplateEditedContentRect - 571.NSWindowTemplate.visibleAtLaunch - 572.IBPluginDependency - 573.IBPluginDependency - 574.IBPluginDependency - 575.IBPluginDependency - 576.IBPluginDependency 58.IBPluginDependency 58.ImportedFromIB2 587.IBEditorWindowLastContentRect 587.IBPluginDependency 588.IBPluginDependency + 590.IBPluginDependency 72.IBPluginDependency 72.ImportedFromIB2 73.IBPluginDependency @@ -2501,7 +2329,7 @@ com.apple.InterfaceBuilder.CocoaPlugin {{525, 802}, {197, 73}} - {{690, 954}, {349, 20}} + {{371, 736}, {349, 20}} com.apple.InterfaceBuilder.CocoaPlugin {74, 862} @@ -2545,18 +2373,18 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{202, 267}, {397, 581}} + {{202, 175}, {397, 581}} com.apple.InterfaceBuilder.CocoaPlugin - {{202, 267}, {397, 581}} + {{202, 175}, {397, 581}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{602, 245}, {376, 581}} + {{344, 175}, {376, 581}} com.apple.InterfaceBuilder.CocoaPlugin - {{602, 245}, {376, 581}} + {{344, 175}, {376, 581}} com.apple.InterfaceBuilder.CocoaPlugin @@ -2566,27 +2394,19 @@ com.apple.InterfaceBuilder.CocoaPlugin {{23, 794}, {245, 183}} - {{866, 734}, {324, 89}} - com.apple.InterfaceBuilder.CocoaPlugin - {{866, 734}, {324, 89}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{21, 1074}, {48, 48}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{771, 841}, {182, 113}} + {{452, 623}, {182, 113}} com.apple.InterfaceBuilder.CocoaPlugin {{155, 774}, {199, 203}} @@ -2614,7 +2434,7 @@ - 589 + 591 @@ -2659,23 +2479,6 @@ OAuth NSObject - - requestAccessTokenWithPIN: - id - - - YES - - YES - twitterPINField - twitterPINPanel - - - YES - NSTextField - NSPanel - - IBProjectSource OAuth.h @@ -2722,14 +2525,6 @@ YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - NSApplication NSResponder @@ -2781,22 +2576,6 @@ AppKit.framework/Headers/NSBrowser.h - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - NSCell NSObject @@ -3234,14 +3013,6 @@ WebKit.framework/Headers/WebUIDelegate.h - - NSPanel - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSPanel.h - - NSResponder @@ -3270,22 +3041,6 @@ AppKit.framework/Headers/NSText.h - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - NSTextView NSText diff --git a/OAuth.h b/OAuth.h index bde3d69..44c4548 100644 --- a/OAuth.h +++ b/OAuth.h @@ -17,18 +17,14 @@ OAToken *accessToken; OAToken *consumerToken; OAConsumer *consumer; - IBOutlet NSTextField *twitterPINField; - IBOutlet NSPanel *twitterPINPanel; } @property (nonatomic, retain) OAToken *accessToken; @property (nonatomic, retain) OAToken *consumerToken; -@property (nonatomic, retain) IBOutlet NSTextField *twitterPINField; -@property (nonatomic, retain) IBOutlet NSPanel *twitterPINPanel; - (id)init; - (void)requestAToken; -- (IBAction)requestAccessTokenWithPIN:(id)sender; +- (void)requestAccessToken; - (void)updateTweet:(NSString *)tweet inReplaToStatus:(NSString *)statusId; diff --git a/OAuth.m b/OAuth.m index 93ba55d..ecfd5ff 100644 --- a/OAuth.m +++ b/OAuth.m @@ -16,7 +16,7 @@ @implementation OAuth -@synthesize accessToken, consumerToken, twitterPINField, twitterPINPanel; +@synthesize accessToken, consumerToken; + (BOOL)isSelectorExcludedFromWebScript:(SEL)aSelector { return NO; @@ -32,7 +32,6 @@ self.accessToken = [[OAToken alloc] initWithUserDefaultsUsingServiceProviderName:OAUTH_SERVICE_NAME prefix:APP_NAME]; consumer = [[OAConsumer alloc] initWithKey:OAUTH_CONSUMER_KEY secret:OAUTH_CONSUMER_SECRET]; } - return self; } @@ -74,10 +73,7 @@ NSString *responseBody = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; requestToken = [[OAToken alloc] initWithHTTPResponseBody:responseBody]; - - // show PIN panel - [twitterPINPanel makeKeyAndOrderFront:self]; - + NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@?oauth_token=%@", OAUTH_USER_AUTHORIZATION_URL, requestToken.key]]; [[NSWorkspace sharedWorkspace] openURL:url]; } @@ -87,13 +83,10 @@ NSLog(@"ERROR: %@", error); } -- (void)requestAccessTokenWithPIN:(id)sender { - - NSLog(@"%@", [twitterPINField stringValue]); - - NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@?oauth_verifier=%@", OAUTH_ACCESS_TOKEN_URL, [twitterPINField stringValue]]]; - [twitterPINPanel resignKeyWindow]; - [twitterPINPanel close]; +- (void)requestAccessToken { + NSLog(@"test 2"); + + NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@", OAUTH_ACCESS_TOKEN_URL]]; OAMutableURLRequest *request = [[OAMutableURLRequest alloc] initWithURL:url consumer:consumer @@ -102,6 +95,8 @@ signatureProvider:nil]; // use the default method, HMAC-SHA1 [request setHTTPMethod:@"POST"]; + + OADataFetcher *fetcher = [[OADataFetcher alloc] init]; [fetcher fetchDataWithRequest:request @@ -130,8 +125,7 @@ - (void)accessTokenTicket:(OAServiceTicket *)ticket didFailWithError:(NSError *)error { NSLog(@"ERROR a: %@", error); - //[self requestAccessTokenWithPIN:self]; - //[twitterPINPanel makeKeyAndOrderFront:self]; + // [self requestAccessToken]; NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@?oauth_token=%@", OAUTH_USER_AUTHORIZATION_URL, requestToken.key]]; [[NSWorkspace sharedWorkspace] openURL:url];