Make AEBase64EncodedString take NSData, not NSString.

adamjernst · Nov 22, 2011 · 10b7295 · 10b7295
1 parent e950112
commit 10b7295
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/AEURLConnection/AEURLRequestFactory.h b/AEURLConnection/AEURLRequestFactory.h
@@ -55,8 +55,8 @@ NSString * AEURLEncodedStringFromString(NSString *string);
 // A utility function to turn a dictionary into a urlencoded string.
 NSString * AEQueryStringFromParameters(NSDictionary *parameters);
 
-// A utility function to base-64 encode a string.
-NSString * AEBase64EncodedStringFromString(NSString *string);
+// A utility function to base-64 encode some data.
+NSString * AEBase64EncodedStringFromData(NSData *data);
 
 // See AEJSONProcessor for a parameter processing block that creates JSON.
 

diff --git a/AEURLConnection/AEURLRequestFactory.m b/AEURLConnection/AEURLRequestFactory.m
@@ -68,7 +68,7 @@ - (void)setDefaultValue:(NSString *)value forHeader:(NSString *)header {
 #pragma mark - Authorization Header Generation
 
 + (NSString *)authorizationHeaderForUsername:(NSString *)username password:(NSString *)password {
-    return [NSString stringWithFormat:@"Basic %@", AEBase64EncodedStringFromString([NSString stringWithFormat:@"%@:%@", username, password])];
+    return [NSString stringWithFormat:@"Basic %@", AEBase64EncodedStringFromData([[NSString stringWithFormat:@"%@:%@", username, password] dataUsingEncoding:NSUTF8StringEncoding])];
 }
 
 #pragma mark - Parameter Encoding Blocks
@@ -120,8 +120,7 @@ + (AEURLParameterProcessor)formURLEncodedProcessor {
     return [mutableParameterComponents componentsJoinedByString:@"&"];
 }
 
-NSString * AEBase64EncodedStringFromString(NSString *string) {
-    NSData *data = [NSData dataWithBytes:[string UTF8String] length:[string length]];
+NSString * AEBase64EncodedStringFromData(NSData *data) {
     NSUInteger length = [data length];
     NSMutableData *mutableData = [NSMutableData dataWithLength:((length + 2) / 3) * 4];