ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-08 22:09:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow to create URL-requests with parameters

Browse Source
This commit is contained in:
Stephan Diederich
2013-08-15 22:29:38 +02:00
parent 447d850207
commit 4647907ea0
2 changed files with 67 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Classes/BITAuthenticator.m
View File

@@ -308,18 +308,58 @@ static NSString* const kBITAuthenticatorLastAuthenticatedVersionKey = @"BITAuthe
#pragma mark - Networking
- (NSMutableURLRequest *) requestWithMethod:(NSString*) method
path:(NSString *) path {
path:(NSString *) path
parameters:(NSDictionary *)params {
NSParameterAssert(self.serverURL);
NSParameterAssert(method);
NSParameterAssert(params == nil || [method isEqualToString:@"POST"] || [method isEqualToString:@"GET"]);
path = path ? : @"";
NSURL *endpoint = [[NSURL URLWithString:self.serverURL] URLByAppendingPathComponent:path];
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:endpoint];
request.HTTPMethod = method;
if (params) {
if ([method isEqualToString:@"GET"]) {
NSString *absoluteURLString = [endpoint absoluteString];
//either path already has parameters, or not
NSString *appenderFormat = [path rangeOfString:@"?"].location == NSNotFound ? @"?%@" : @"&%@";
endpoint = [NSURL URLWithString:[absoluteURLString stringByAppendingFormat:appenderFormat,
[self.class queryStringFromParameters:params withEncoding:NSUTF8StringEncoding]]];
[request setURL:endpoint];
} else {
//TODO: this is crap. Boundary must be the same as the one in appendData
//unify this!
NSString *boundary = @"----FOO";
NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", boundary];
[request setValue:contentType forHTTPHeaderField:@"Content-type"];
NSMutableData *postBody = [NSMutableData data];
[params enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
[postBody appendData:[self appendPostValue:value forKey:key]];
}];
[postBody appendData:[[NSString stringWithFormat:@"--%@--\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
[request setHTTPBody:postBody];
}
}
return request;
}
+ (NSString *) queryStringFromParameters:(NSDictionary *) params withEncoding:(NSStringEncoding) encoding {
NSMutableString *queryString = [NSMutableString new];
[params enumerateKeysAndObjectsUsingBlock:^(NSString* key, NSString* value, BOOL *stop) {
NSAssert([key isKindOfClass:[NSString class]], @"Query parameters can only be string-string pairs");
NSAssert([value isKindOfClass:[NSString class]], @"Query parameters can only be string-string pairs");
[queryString appendFormat:queryString.length ? @"&%@=%@" : @"%@=%@", key, value];
}];
return queryString;
}
- (BITHTTPOperation*) operationWithURLRequest:(NSURLRequest*) request
completion:(BITNetworkCompletionBlock) completion {
BITHTTPOperation *operation = [BITHTTPOperation operationWithRequest:request
@@ -329,8 +369,15 @@ static NSString* const kBITAuthenticatorLastAuthenticatedVersionKey = @"BITAuthe
return operation;
}
- (void)getPath:(NSString *)path completion:(BITNetworkCompletionBlock)completion {
NSURLRequest *request = [self requestWithMethod:@"GET" path:path];
- (void)getPath:(NSString *)path parameters:(NSDictionary *)params completion:(BITNetworkCompletionBlock)completion {
NSURLRequest *request = [self requestWithMethod:@"GET" path:path parameters:params];
BITHTTPOperation *op = [self operationWithURLRequest:request
completion:completion];
[self enqeueHTTPOperation:op];
}
- (void)postPath:(NSString *)path parameters:(NSDictionary *)params completion:(BITNetworkCompletionBlock)completion {
NSURLRequest *request = [self requestWithMethod:@"POST" path:path parameters:params];
BITHTTPOperation *op = [self operationWithURLRequest:request
completion:completion];
[self enqeueHTTPOperation:op];
@@ -354,7 +401,7 @@ static NSString* const kBITAuthenticatorLastAuthenticatedVersionKey = @"BITAuthe
BOOL matchedPath = YES;
if(path) {
//method is not interesting here, we' just creating it to get the URL
NSURL *url = [self requestWithMethod:@"GET" path:path].URL;
NSURL *url = [self requestWithMethod:@"GET" path:path parameters:nil].URL;
matchedPath = [request.URL isEqual:url];
}

17
Classes/BITAuthenticator_Private.h
View File

@@ -56,12 +56,14 @@
* the internally stored baseURL.
*
* @param method the HTTPMethod to check, must not be nil
* @param params parameters for the request (only supported for GET and POST for now)
* @param path path to append to baseURL. can be nil in which case "/" is appended
*
* @return an NSMutableURLRequest for further configuration
*/
- (NSMutableURLRequest *) requestWithMethod:(NSString*) method
path:(NSString *) path;
path:(NSString *) path
parameters:(NSDictionary *) params;
/**
* Creates an operation for the given NSURLRequest
*
@@ -77,12 +79,25 @@
* Creates an operation for the given path, and enqueues it
*
* @param path the request path to check
* @param params parameters for the request
* @param completion completionBlock that is called once the operation finished
*
*/
- (void) getPath:(NSString*) path
parameters:(NSDictionary *) params
completion:(BITNetworkCompletionBlock) completion;
/**
* Creates an operation for the given path, and enqueues it
*
* @param path the request path to check
* @param params parameters for the request
* @param completion completionBlock that is called once the operation finished
*
*/
- (void) postPath:(NSString*) path
parameters:(NSDictionary *) params
completion:(BITNetworkCompletionBlock) completion;
/**
* adds the given operation to the internal queue
*