Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix "Could not get URL from GIST" error (issue #141) #286

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix "Could not get URL from GIST" error (issue #141) #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c2b75f
Fix "Could not get URL from GIST" error (issue #141)
dburkart Mar 26, 2016
bc5640d
Remove extraneous NSLog()
dburkart Mar 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Classes/Dialogs/PasteSheet.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@ - (id)init

if (!SYNTAX_EXT_MAP) {
SYNTAX_EXT_MAP = [NSDictionary dictionaryWithObjectsAndKeys:
@"C", @"c",
@"CSS", @"css",
@"Diff", @"diff",
@"Haskell", @"haskell",
@"HTML", @"html",
@"Java", @"java",
@"JavaScript", @"javascript",
@"Objective-C", @"objective-c",
@"Perl", @"perl",
@"PHP", @"php",
@"Text", @"plain_text",
@"Python", @"python",
@"Ruby", @"ruby",
@"Scheme", @"scheme",
@"Shell", @"shell script",
@"SQL", @"sql",
@"c", @"c",
@"css", @"css",
@"diff", @"diff",
@"hs", @"haskell",
@"html", @"html",
@"java", @"java",
@"js", @"javascript",
@"m", @"objective-c",
@"pl", @"perl",
@"php", @"php",
@"txt", @"plain_text",
@"py", @"python",
@"rb", @"ruby",
@"scm", @"scheme",
@"sh", @"shell script",
@"sql", @"sql",
nil, nil];
}
}
Expand Down
96 changes: 37 additions & 59 deletions Classes/Library/GistClient.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
#import "GistClient.h"
#import "GTMNSString+URLArguments.h"

@import Foundation;

#define GIST_TOP_URL @"https://gist.github.com/"
#define GIST_POST_URL @"https://gist.github.com/gists"

#define GIST_TOP_URL @"https://api.github.com/"
#define GIST_POST_URL @"https://api.github.com/gists"
#define TIMEOUT 10


Expand Down Expand Up @@ -68,29 +70,33 @@ - (void)send:(NSString*)aText fileType:(NSString*)aFileType private:(BOOL)aIsPri
_conn = [[NSURLConnection alloc] initWithRequest:req delegate:self];
}

- (void)postDataWithAutheToken:(NSString*)authToken
- (void) postPublicGist
{
[self cancel];
_stage = kGistClientPost;

NSMutableDictionary* params = [NSMutableDictionary dictionary];
[params setObject:@"" forKey:@"gist[description]"];
[params setObject:@"" forKey:@"gist[files][][oid]"];
[params setObject:@"" forKey:@"gist[files][][name]"];
[params setObject:_text forKey:@"gist[files][][content]"];
[params setObject:_fileType forKey:@"gist[files][][language]"];
if (_isPrivate) {
[params setObject:@"0" forKey:@"gist[public]"];
}
if (authToken) {
[params setObject:authToken forKey:@"authenticity_token"];
}
NSMutableDictionary* gist = [NSMutableDictionary dictionary];
[gist setObject:_text forKey:@"content"];

NSData* body = [[self formatParameters:params] dataUsingEncoding:NSUTF8StringEncoding];
NSMutableDictionary* files = [NSMutableDictionary dictionaryWithObjectsAndKeys:gist,[@"limechat_gist." stringByAppendingString:_fileType], nil];
NSMutableDictionary* postData = [NSMutableDictionary dictionaryWithObjectsAndKeys:files,@"files", nil];
NSString *isPublic = (_isPrivate) ? @"false" : @"true";
[postData setObject:isPublic forKey:@"public"];

NSError *error;
NSData *data = [NSJSONSerialization dataWithJSONObject:postData options:0 error:&error];

if (!data) {
NSLog(@"%@", error);
} else {
NSString *JSONString = [[NSString alloc] initWithBytes:[data bytes] length:[data length] encoding:NSUTF8StringEncoding];
}

NSMutableURLRequest* req = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:GIST_POST_URL] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:TIMEOUT];
[req setHTTPMethod:@"POST"];
[req setHTTPBody:body];
[req setValue:@"application/json" forHTTPHeaderField:@"Content-type"];
[req setValue:@"application/json" forHTTPHeaderField:@"Accept"];
[req setHTTPBody:data];

_conn = [[NSURLConnection alloc] initWithRequest:req delegate:self];
}
Expand All @@ -114,51 +120,23 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)sender
if (_conn != sender) return;

if (_stage == kGistClientGetTop) {
NSString* s = [[NSString alloc] initWithData:_buf encoding:NSUTF8StringEncoding];
NSString* authToken = nil;

NSRange authInputTagRange = [s rangeOfString:@"<input name=\"authenticity_token\""];
if (authInputTagRange.location != NSNotFound) {
int start = NSMaxRange(authInputTagRange);
NSRange tokenStartRange = [s rangeOfString:@"value=\"" options:0 range:NSMakeRange(start, s.length - start)];
if (tokenStartRange.location != NSNotFound) {
start = NSMaxRange(tokenStartRange);
NSRange tokenEndRange = [s rangeOfString:@"\"" options:0 range:NSMakeRange(start, s.length - start)];
if (tokenEndRange.location != NSNotFound) {
start = NSMaxRange(tokenStartRange);
int end = tokenEndRange.location;
authToken = [s substringWithRange:NSMakeRange(start, end - start)];
}
}
}

if (!authToken) {
NSRange csrfTokenRange = [s rangeOfString:@"\"csrf-token"];
if (csrfTokenRange.location != NSNotFound) {
NSRange tokenEndRange = [s rangeOfString:@"\"" options:NSBackwardsSearch range:NSMakeRange(0, csrfTokenRange.location)];
if (tokenEndRange.location != NSNotFound) {
NSRange tokenStartRange = [s rangeOfString:@"\"" options:NSBackwardsSearch range:NSMakeRange(0, tokenEndRange.location)];
if (tokenStartRange.location != NSNotFound) {
int start = tokenStartRange.location + 1;
int end = tokenEndRange.location;
authToken = [s substringWithRange:NSMakeRange(start, end - start)];
}
}
}
}

if (authToken) {
[self postDataWithAutheToken:authToken];
}
else {
if ([_delegate respondsToSelector:@selector(gistClient:didFailWithError:statusCode:)]) {
[_delegate gistClient:self didFailWithError:@"Failed to post to Gist" statusCode:0];
}
}
[_buf setLength:0];
[self postPublicGist];
}
else {
if ([_delegate respondsToSelector:@selector(gistClient:didReceiveResponse:)]) {
[_delegate gistClient:self didReceiveResponse:_destUrl];

NSError* error;
NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:_buf options:0 error:&error];

if (!dictionary) {
NSLog(@"Error serializing JSON: %@", error);
[_delegate gistClient:self didReceiveResponse:nil];
} else {
_destUrl = [dictionary valueForKey:@"html_url"];
[_buf setLength:0];
[_delegate gistClient:self didReceiveResponse:_destUrl];
}
}
}
}
Expand Down