Merge pull request #149 from dkarivalis/sign-url-with-query-component_double-encoding

Sign URL with query component double encoding

Author: Pearapps

Classes/Auth/TMOAuth.m

@@ -12,6 +12,7 @@
 #import <CommonCrypto/CommonHMAC.h>
 #import <sys/sysctl.h>
 #import "TMSDKFunctions.h"
+#import "TMURLEncoding.h"
 
 @interface TMOAuth()
 
@@ -71,16 +72,7 @@ + (NSURL *)signUrlWithQueryComponent:(NSURL *)URL
                                                                      token: token
                                                                tokenSecret: tokenSecret
                                                                  timestamp: timestamp];
-    
-    NSMutableArray *queryItems = [NSMutableArray array];
-    for (NSString *key in oAuthParameters) {
-        [queryItems addObject:[NSURLQueryItem queryItemWithName:key value:TMURLEncode(oAuthParameters[key])]];
-    }
-
-    NSURLComponents *urlComponents = [[NSURLComponents alloc] initWithURL:URL resolvingAgainstBaseURL:true];
-    urlComponents.queryItems = queryItems;
-
-    return [urlComponents URL];
+    return [NSURL URLWithString:[URL.absoluteString stringByAppendingFormat:@"?%@", [TMURLEncoding encodedDictionary:oAuthParameters]]];
 }
 
 - (id)initWithURL:(NSURL *)URL

ExampleiOS/ExampleiOSTests/TMOAuthTests.m

@@ -25,13 +25,7 @@ - (void)testSignUrlWithQueryComponentCalculatesProperSignature {
                                                     token:@"token"
                                               tokenSecret:@"tokenSecret"
                                                 timestamp:@"1511967770"];
-    
-    NSURLComponents *urlComponents = [NSURLComponents componentsWithURL:signedURL resolvingAgainstBaseURL:false];
-    NSArray *queryItems = urlComponents.queryItems;
-    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"name=%@", @"oauth_signature"];
-    NSURLQueryItem *queryItem = [queryItems filteredArrayUsingPredicate:predicate].firstObject;
-    
-    XCTAssert([queryItem.value isEqualToString:@"w%2FLP1MdJwiCfakR3GbW9IoeOz1E%3D"], @"The generated OAuth signature should match the expected value.");
+    XCTAssert([signedURL.absoluteString isEqualToString:@"https://tumblr.com/?oauth_consumer_key=consumerKey&oauth_nonce=1234&oauth_signature=w/LP1MdJwiCfakR3GbW9IoeOz1E%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1511967770&oauth_token=token&oauth_version=1.0"], @"The generated OAuth signature should match the expected value.");
 }
 
 - (void)testInitSetsInstanceVariables {