now OAuth without pin

This commit is contained in:
Jeena Paradies 2010-05-16 12:20:24 +02:00
parent dff8d4a1a6
commit e3dfeed55e
4 changed files with 42 additions and 293 deletions

View file

@ -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];

View file

@ -21,10 +21,9 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="588"/>
<integer value="571"/>
<integer value="81"/>
<integer value="559"/>
<integer value="588"/>
<integer value="81"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -854,7 +853,7 @@
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Icon</string>
</object>
<object class="NSFont" key="NSSupport" id="19773046">
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
@ -941,91 +940,7 @@
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">mentions</string>
</object>
<object class="NSWindowTemplate" id="414262167">
<int key="NSWindowStyleMask">29</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{787, 515}, {324, 89}}</string>
<int key="NSWTFlags">611845120</int>
<string key="NSWindowTitle">Twitter PIN</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<object class="NSView" key="NSWindowView" id="439593917">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="821023742">
<reference key="NSNextResponder" ref="439593917"/>
<int key="NSvFlags">270</int>
<string key="NSFrame">{{20, 20}, {182, 49}}</string>
<reference key="NSSuperview" ref="439593917"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="670215897">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">138413056</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">36</double>
<int key="NSfFlags">16</int>
</object>
<reference key="NSControlView" ref="821023742"/>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
</object>
<object class="NSArray" key="NSAllowedInputLocales">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSAllRomanInputSourcesLocaleIdentifier</string>
</object>
</object>
</object>
<object class="NSButton" id="766838214">
<reference key="NSNextResponder" ref="439593917"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{214, 26}, {96, 32}}</string>
<reference key="NSSuperview" ref="439593917"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="530701499">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Ok</string>
<reference key="NSSupport" ref="19773046"/>
<reference key="NSControlView" ref="766838214"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">129</int>
<reference key="NSAlternateImage" ref="19773046"/>
<string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
</object>
<string key="NSFrameSize">{324, 89}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">twitter-pin</string>
</object>
<object class="NSCustomObject" id="829471819">
<object class="NSCustomObject" id="456221404">
<string key="NSClassName">OAuth</string>
</object>
</object>
@ -1456,46 +1371,6 @@
</object>
<int key="connectionID">570</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">oauth</string>
<reference key="source" ref="408500656"/>
<reference key="destination" ref="829471819"/>
</object>
<int key="connectionID">578</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">twitterPINField</string>
<reference key="source" ref="829471819"/>
<reference key="destination" ref="821023742"/>
</object>
<int key="connectionID">581</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">requestAccessTokenWithPIN:</string>
<reference key="source" ref="829471819"/>
<reference key="destination" ref="821023742"/>
</object>
<int key="connectionID">582</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">requestAccessTokenWithPIN:</string>
<reference key="source" ref="829471819"/>
<reference key="destination" ref="766838214"/>
</object>
<int key="connectionID">583</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">twitterPINPanel</string>
<reference key="source" ref="829471819"/>
<reference key="destination" ref="414262167"/>
</object>
<int key="connectionID">584</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">logoLayer</string>
@ -1504,6 +1379,14 @@
</object>
<int key="connectionID">589</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">oauth</string>
<reference key="source" ref="408500656"/>
<reference key="destination" ref="456221404"/>
</object>
<int key="connectionID">591</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -2147,58 +2030,6 @@
<reference key="object" ref="126069112"/>
<reference key="parent" ref="438898709"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">571</int>
<reference key="object" ref="414262167"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="439593917"/>
</object>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">572</int>
<reference key="object" ref="439593917"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="821023742"/>
<reference ref="766838214"/>
</object>
<reference key="parent" ref="414262167"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">573</int>
<reference key="object" ref="821023742"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="670215897"/>
</object>
<reference key="parent" ref="439593917"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">574</int>
<reference key="object" ref="670215897"/>
<reference key="parent" ref="821023742"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">575</int>
<reference key="object" ref="766838214"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="530701499"/>
</object>
<reference key="parent" ref="439593917"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">576</int>
<reference key="object" ref="530701499"/>
<reference key="parent" ref="766838214"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">577</int>
<reference key="object" ref="829471819"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">587</int>
<reference key="object" ref="398890244"/>
@ -2213,6 +2044,11 @@
<reference key="object" ref="747210486"/>
<reference key="parent" ref="398890244"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">590</int>
<reference key="object" ref="456221404"/>
<reference key="parent" ref="0"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -2376,20 +2212,12 @@
<string>57.IBPluginDependency</string>
<string>57.ImportedFromIB2</string>
<string>57.editorWindowContentRectSynchronizationRect</string>
<string>571.IBEditorWindowLastContentRect</string>
<string>571.IBPluginDependency</string>
<string>571.IBWindowTemplateEditedContentRect</string>
<string>571.NSWindowTemplate.visibleAtLaunch</string>
<string>572.IBPluginDependency</string>
<string>573.IBPluginDependency</string>
<string>574.IBPluginDependency</string>
<string>575.IBPluginDependency</string>
<string>576.IBPluginDependency</string>
<string>58.IBPluginDependency</string>
<string>58.ImportedFromIB2</string>
<string>587.IBEditorWindowLastContentRect</string>
<string>587.IBPluginDependency</string>
<string>588.IBPluginDependency</string>
<string>590.IBPluginDependency</string>
<string>72.IBPluginDependency</string>
<string>72.ImportedFromIB2</string>
<string>73.IBPluginDependency</string>
@ -2501,7 +2329,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{525, 802}, {197, 73}}</string>
<string>{{690, 954}, {349, 20}}</string>
<string>{{371, 736}, {349, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{74, 862}</string>
@ -2545,18 +2373,18 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{202, 267}, {397, 581}}</string>
<string>{{202, 175}, {397, 581}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{202, 267}, {397, 581}}</string>
<string>{{202, 175}, {397, 581}}</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.WebKitIBPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{602, 245}, {376, 581}}</string>
<string>{{344, 175}, {376, 581}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{602, 245}, {376, 581}}</string>
<string>{{344, 175}, {376, 581}}</string>
<boolean value="NO"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
@ -2566,27 +2394,19 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{23, 794}, {245, 183}}</string>
<string>{{866, 734}, {324, 89}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{866, 734}, {324, 89}}</string>
<boolean value="NO"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{21, 1074}, {48, 48}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{771, 841}, {182, 113}}</string>
<string>{{452, 623}, {182, 113}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{155, 774}, {199, 203}}</string>
@ -2614,7 +2434,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">589</int>
<int key="maxID">591</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -2659,23 +2479,6 @@
<object class="IBPartialClassDescription">
<string key="className">OAuth</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">requestAccessTokenWithPIN:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>twitterPINField</string>
<string>twitterPINPanel</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSTextField</string>
<string>NSPanel</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">OAuth.h</string>
@ -2722,14 +2525,6 @@
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">NSActionCell</string>
<string key="superclassName">NSCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<string key="superclassName">NSResponder</string>
@ -2781,22 +2576,6 @@
<string key="minorKey">AppKit.framework/Headers/NSBrowser.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSButton</string>
<string key="superclassName">NSControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSButtonCell</string>
<string key="superclassName">NSActionCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSCell</string>
<string key="superclassName">NSObject</string>
@ -3234,14 +3013,6 @@
<string key="minorKey">WebKit.framework/Headers/WebUIDelegate.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSPanel</string>
<string key="superclassName">NSWindow</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSPanel.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@ -3270,22 +3041,6 @@
<string key="minorKey">AppKit.framework/Headers/NSText.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTextField</string>
<string key="superclassName">NSControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSTextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTextFieldCell</string>
<string key="superclassName">NSActionCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTextView</string>
<string key="superclassName">NSText</string>

View file

@ -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;

24
OAuth.m
View file

@ -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];