@@ -11,11 +11,13 @@ @interface Config : NSObject { NSString *gitHubUserName; + NSString *gitHubToken; NSString *baseURL; NSMutableArray *repositories; } @property (copy) NSString *gitHubUserName; +@property (copy) NSString *gitHubToken; @property (copy) NSString *baseURL; @property (copy) NSMutableArray *repositories; Classes/Config.h @@ -12,6 +12,7 @@ @implementation Config @synthesize gitHubUserName; +@synthesize gitHubToken; @synthesize baseURL; @synthesize repositories; @@ -34,7 +35,9 @@ - (void) dealloc { [gitHubUserName release]; + [gitHubToken release]; [baseURL release]; + [repositories release]; [super dealloc]; } Classes/Config.m @@ -16,5 +16,6 @@ + (NSString *) getJSONFromURL:(NSString *)url; // issue a GET request + (NSString *) getJSONFromURL:(NSString *)url withDictionary:(NSDictionary *)dictionary; // issues a POST request ++ (NSString *)postToURL:(NSString *)url; @end Classes/Connector.h @@ -52,7 +52,7 @@ NSURLResponse *response; NSError *error = nil; - NSLog(@"Retrieving JSON from URL: %@", url); + DevLog2(@"Retrieving JSON from URL: %@", url); urlData = [NSURLConnection sendSynchronousRequest:req returningResponse:&response error:&error]; @@ -64,7 +64,7 @@ } -// Sent a POST to the server with the attached JSON dictionary, return JSON string. +// Send a POST to the server with the attached JSON dictionary, return JSON string. + (NSString *) getJSONFromURL:(NSString *)url withDictionary:(NSDictionary *)dictionary { DevLog3(@"Sending JSON to %@: %@", url, [dictionary JSONRepresentation]); @@ -82,4 +82,34 @@ } +// Standard POST ++ (NSString *)postToURL:(NSString *)url { + + NSString *post = [NSString stringWithFormat:@"login=%@&token=%@", [[Config instance] gitHubUserName], [[Config instance] gitHubToken]]; + NSData *postData = [post dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES]; + + NSString *postLength = [NSString stringWithFormat:@"%d", [postData length]]; + + NSMutableURLRequest *postRequest = [[[NSMutableURLRequest alloc] init] autorelease]; + [postRequest setURL:[NSURL URLWithString:url]]; + [postRequest setHTTPMethod:@"POST"]; + [postRequest setValue:postLength forHTTPHeaderField:@"Content-Length"]; + [postRequest setValue:@"application/json" forHTTPHeaderField:@"Accept"]; + [postRequest setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"]; + [postRequest setHTTPBody:postData]; + + + NSData *urlData; + NSURLResponse *response; + NSError *error = nil; + + urlData = [NSURLConnection sendSynchronousRequest:postRequest returningResponse:&response error:&error]; + + NSString *resp = [[[NSString alloc] initWithData:urlData encoding:NSUTF8StringEncoding] autorelease]; + + DevLog3(@"Received JSON from URL via POST: %@\n%@", url, resp); + + return resp; +} + @end Classes/Connector.m @@ -26,16 +26,5 @@ <true/> <key>NSMainNibFile</key> <string>MainWindow</string> - <key>CFBundleURLTypes</key> - <array> - <dict> - <key>CFBundleURLName</key> - <string>com.protonmicro.git-phone</string> - <key>CFBundleURLSchemes</key> - <array> - <string>git-phone</string> - </array> - </dict> - </array> </dict> </plist> Info.plist @@ -22,7 +22,8 @@ } + (void)loadAll { - NSString *resultJSON = [Connector getJSONFromURL:[self indexURL]]; + + NSString *resultJSON = [Connector postToURL:[self indexURL]]; NSMutableArray *returnArray = [[[NSMutableArray alloc] init] autorelease]; NSMutableArray *repositories = [[[NSMutableArray alloc] init] autorelease]; Repository.m @@ -26,6 +26,24 @@ <key>AutocorrectionType</key> <string>No</string> </dict> + <dict> + <key>Type</key> + <string>PSTextFieldSpecifier</string> + <key>Title</key> + <string>API Token</string> + <key>Key</key> + <string>GitHubToken</string> + <key>DefaultValue</key> + <string></string> + <key>IsSecure</key> + <true/> + <key>KeyboardType</key> + <string>Alphabet</string> + <key>AutocapitalizationType</key> + <string>None</string> + <key>AutocorrectionType</key> + <string>No</string> + </dict> </array> </dict> </plist> Settings.bundle/Root.plist 5afc5f70326413e83f5fcb8eb80c5bf745b3e240 Sam Schroeder samuelschroeder@gmail.com http://github.com/sschroed/git-phone/commit/894e41a5027f356af1800a9161dc4589519f52b8 894e41a5027f356af1800a9161dc4589519f52b8 2009-01-25T11:01:43-08:00 2009-01-25T11:01:43-08:00 Started token auth and repo pull 0ed62f767594e50aee0ef59335dcadf2b083cb08 Sam Schroeder samuelschroeder@gmail.com