[#42] cleaned up url , changed Dog tests to use no user

yfactorial · Feb 19, 2009 · 7aa4e07 · 7aa4e07
1 parent bb0dcef
commit 7aa4e07
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/Classes/DogTest.m b/Classes/DogTest.m
@@ -20,7 +20,8 @@ -(void) setUp {
 	[ObjectiveResourceConfig setSite:@"http://localhost:36313/"];
 	[ObjectiveResourceConfig setResponseType:JSONResponse];
 	//[ObjectiveResource setResponseType:XmlResponse];
-
+	[ObjectiveResourceConfig setUser:nil];
+	[ObjectiveResourceConfig setPassword:nil];
 	owner = [Person findRemote:[NSString stringWithFormat:@"%i",DOG_OWNER]];
 }
 

diff --git a/Classes/lib/Connection.m b/Classes/lib/Connection.m
@@ -49,14 +49,14 @@ + (Response *)sendRequest:(NSMutableURLRequest *)request withUser:(NSString *)us
 
 	//lots of servers fail to implement http basic authentication correctly, so we pass the credentials even if they are not asked for
 	//TODO make this configurable?
-	NSString *authString = [[[NSString stringWithFormat:@"%@:%@",user, password] dataUsingEncoding:NSUTF8StringEncoding] base64Encoding];
-	[request addValue:[NSString stringWithFormat:@"Basic %@", authString] forHTTPHeaderField:@"Authorization"]; 
-	NSString *escapedUser = (NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, 
-								(CFStringRef)user, NULL, (CFStringRef)@"@.:", kCFStringEncodingUTF8);
-	NSString *escapedPassword = (NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, 
-								(CFStringRef)password, NULL, (CFStringRef)@"@.:", kCFStringEncodingUTF8);
 	NSURL *url = [request URL];
-	if(escapedUser && escapedPassword) {
+	if(user && password) {
+		NSString *authString = [[[NSString stringWithFormat:@"%@:%@",user, password] dataUsingEncoding:NSUTF8StringEncoding] base64Encoding];
+		[request addValue:[NSString stringWithFormat:@"Basic %@", authString] forHTTPHeaderField:@"Authorization"]; 
+		NSString *escapedUser = (NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, 
+																																								(CFStringRef)user, NULL, (CFStringRef)@"@.:", kCFStringEncodingUTF8);
+		NSString *escapedPassword = (NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, 
+																																										(CFStringRef)password, NULL, (CFStringRef)@"@.:", kCFStringEncodingUTF8);
 		NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@://%@:%@@%@",[url scheme],escapedUser,escapedPassword,[url host],nil];
 		if([url port]) {
 			[urlString appendFormat:@":%@",[url port],nil];
@@ -66,6 +66,8 @@ + (Response *)sendRequest:(NSMutableURLRequest *)request withUser:(NSString *)us
 			[urlString appendFormat:@"?%@",[url query],nil];
 		}
 		[request setURL:url];
+		[escapedUser release];
+		[escapedPassword release];
 	}
 
 
@@ -90,8 +92,6 @@ + (Response *)sendRequest:(NSMutableURLRequest *)request withUser:(NSString *)us
 								   andError:connectionDelegate.error];
 	[resp log];
 
-	[escapedUser release];
-	[escapedPassword release];
 	[activeDelegates removeObject:connectionDelegate];
 
 	//if there are no more active delegates release the array