@@ -76,6 +76,8 @@ static NSString *kOAuthLoginError = @"OAuthLoginError"; // Stage 1 callbacks - (void)requestTicketRecieved:(OAServiceTicket*)theTicket withData:(NSData*)theData { + [dialog presentModalViewController:self animated:YES]; + NSString *responseBody = [[NSString alloc] initWithData:theData encoding:NSUTF8StringEncoding]; if (theTicket.didSucceed) { @@ -109,7 +111,8 @@ static NSString *kOAuthLoginError = @"OAuthLoginError"; - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType { - if ([[request.URL absoluteString] isEqualToString:callbackURL]) { + NSString *dest = [[[request.URL absoluteString] componentsSeparatedByString:@"?"] objectAtIndex:0]; + if ([dest isEqualToString:callbackURL]) { // Woo, looks like its worked. Now to get the ACCESS token (Stage 3) OAMutableURLRequest *request = [[OAMutableURLRequest alloc] initWithURL:[NSURL URLWithString:accessTokenURL] consumer:consumer Classes/OpenAuthLoginController.m @@ -25,9 +25,14 @@ @dynamic token; @synthesize auth; +// ew.com #define CONSUMER_KEY @"ktvXfoCoGseCyAo82HIjA" #define CONSUMER_SECRET @"akoTUO0PxiFvhC2CUoxh7jRnv5IfWwJNCUKftQxEfw" +// localhost +//#define CONSUMER_KEY @"mX0DqI4YOeIdQy3DiU14Kg" +//#define CONSUMER_SECRET @"WiBnCiUMdKK4HCw6JL6YKsqGPY7m8K1ClYlI6ZA4" + - (void)applicationDidFinishLaunching:(UIApplication *)application { // Add the tab bar controller's current view as a subview of the window @@ -103,6 +108,11 @@ @"http://echowaves.com/oauth/authorize", @"AUTHURL", @"http://echowaves.com/oauth/access_token", @"ACCESSTOKENURL", @"http://echowaves.com/oauth/authorize/echochat", @"CALLBACKURL", nil]]; + + // @"http://localhost:3000/oauth/request_token", @"AUTHTOKENURL", + // @"http://localhost:3000/oauth/authorize", @"AUTHURL", + // @"http://localhost:3000/oauth/access_token", @"ACCESSTOKENURL", + // @"http://localhost:3000/oauth/authorize/echochat", @"CALLBACKURL", nil]]; [authController presentInController:tabBarController animated:YES]; } Classes/echochatAppDelegate.m @@ -36,7 +36,7 @@ <int key="NSvFlags">292</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBUINavigationBar" id="926680107"> + <object class="IBUINavigationBar" id="755510660"> <reference key="NSNextResponder" ref="191373211"/> <int key="NSvFlags">290</int> <string key="NSFrameSize">{320, 44}</string> @@ -45,13 +45,13 @@ <bool key="IBUIClearsContextBeforeDrawing">NO</bool> <object class="NSArray" key="IBUIItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBUINavigationItem" id="236215459"> - <reference key="IBUINavigationBar" ref="926680107"/> + <object class="IBUINavigationItem" id="893532888"> + <reference key="IBUINavigationBar" ref="755510660"/> <string key="IBUITitle">Title</string> </object> </object> </object> - <object class="IBUIWebView" id="148446726"> + <object class="IBUIWebView" id="681973526"> <reference key="NSNextResponder" ref="191373211"/> <int key="NSvFlags">274</int> <string key="NSFrame">{{0, 44}, {320, 416}}</string> @@ -85,7 +85,7 @@ <object class="IBCocoaTouchOutletConnection" key="connection"> <string key="label">webView</string> <reference key="source" ref="372490531"/> - <reference key="destination" ref="148446726"/> + <reference key="destination" ref="681973526"/> </object> <int key="connectionID">6</int> </object> @@ -93,17 +93,25 @@ <object class="IBCocoaTouchOutletConnection" key="connection"> <string key="label">bar</string> <reference key="source" ref="372490531"/> - <reference key="destination" ref="926680107"/> + <reference key="destination" ref="755510660"/> </object> <int key="connectionID">7</int> </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">view</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="191373211"/> + </object> + <int key="connectionID">8</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBObjectRecord"> <int key="objectID">0</int> - <object class="NSArray" key="object" id="161113689"> + <object class="NSArray" key="object" id="414719651"> <bool key="EncodedWithXMLCoder">YES</bool> </object> <reference key="children" ref="1000"/> @@ -114,39 +122,39 @@ <reference key="object" ref="191373211"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="926680107"/> - <reference ref="148446726"/> + <reference ref="755510660"/> + <reference ref="681973526"/> </object> - <reference key="parent" ref="161113689"/> + <reference key="parent" ref="414719651"/> </object> <object class="IBObjectRecord"> <int key="objectID">-1</int> <reference key="object" ref="372490531"/> - <reference key="parent" ref="161113689"/> + <reference key="parent" ref="414719651"/> <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> </object> <object class="IBObjectRecord"> <int key="objectID">-2</int> <reference key="object" ref="975951072"/> - <reference key="parent" ref="161113689"/> + <reference key="parent" ref="414719651"/> </object> <object class="IBObjectRecord"> <int key="objectID">3</int> - <reference key="object" ref="926680107"/> + <reference key="object" ref="755510660"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="236215459"/> + <reference ref="893532888"/> </object> <reference key="parent" ref="191373211"/> </object> <object class="IBObjectRecord"> <int key="objectID">4</int> - <reference key="object" ref="236215459"/> - <reference key="parent" ref="926680107"/> + <reference key="object" ref="893532888"/> + <reference key="parent" ref="755510660"/> </object> <object class="IBObjectRecord"> <int key="objectID">5</int> - <reference key="object" ref="148446726"/> + <reference key="object" ref="681973526"/> <reference key="parent" ref="191373211"/> </object> </object> @@ -194,7 +202,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">7</int> + <int key="maxID">8</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> OpenAuthLogin.xib f6f1a67f800e366c4d3cdcedb561d7eec390e877 jamesu jamesu@gmail.com http://github.com/jamesu/echochat/commit/49a15e9bc0873cfc7416678154151034a46914ee 49a15e9bc0873cfc7416678154151034a46914ee 2009-06-29T06:09:04-07:00 2009-06-29T06:09:04-07:00 Make the login actually work 597b60cae40936de97f289a8199f8fe5a3a0f962 jamesu jamesu@gmail.com