Fixed issue with auth code not matching

mzarra · Nov 28, 2009 · 7a79096 · 7a79096
1 parent 640f06e
commit 7a79096
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/DesktopCode/ZSyncHandler.m b/DesktopCode/ZSyncHandler.m
@@ -139,6 +139,7 @@ @implementation ZSyncConnectionDelegate
 
 - (void)dealloc
 {
+  DLog(@"%s Releasing", __PRETTY_FUNCTION__);
   [_connection release], _connection = nil;
   [super dealloc];
 }
@@ -192,11 +193,15 @@ - (BOOL)connection:(BLIPConnection*)connection receivedRequest:(BLIPRequest*)req
       return YES;
     case zsActionAuthenticatePairing:
       if ([[self pairingCode] isEqualToString:[request bodyString]]) {
+        DLog(@"%s passed '%@' '%@'", __PRETTY_FUNCTION__, [request bodyString], [self pairingCode]);
         // TODO: Register the unique ID of this service
         [[ZSyncHandler shared] registerDeviceForPairing:[request valueOfProperty:zsDeviceID]];
         [response setValue:[NSString stringWithFormat:@"%i", zsActionAuthenticatePassed] ofProperty:zsAction];
         [response send];
+        [codeController close];
+        [codeController release], codeController = nil;
       } else {
+        DLog(@"%s failed '%@' '%@'", __PRETTY_FUNCTION__, [request bodyString], [self pairingCode]);
         [response setValue:[NSString stringWithFormat:@"%i", zsActionAuthenticateFailed] ofProperty:zsAction];
         [response send];
       }

diff --git a/DeviceCode/ZSyncTouchHandler.m b/DeviceCode/ZSyncTouchHandler.m
@@ -122,11 +122,10 @@ - (void)authenticatePairing:(NSString*)code;
     deviceUUID = [[NSProcessInfo processInfo] globallyUniqueString];
     [[NSUserDefaults standardUserDefaults] setValue:deviceUUID forKey:zsDeviceID];
   }
-  [dictionary setValue:code forKey:zsAuthenticationCode];
-
   [dictionary setValue:deviceUUID forKey:zsDeviceID];
-
-  BLIPRequest *request = [BLIPRequest requestWithBody:nil properties:dictionary];
+
+  NSData *codeData = [code dataUsingEncoding:NSUTF8StringEncoding];
+  BLIPRequest *request = [BLIPRequest requestWithBody:codeData properties:dictionary];
   [_connection sendRequest:request];
 }
 

diff --git a/SampleDesktop/PairingCodeWindowController.m b/SampleDesktop/PairingCodeWindowController.m
@@ -43,6 +43,7 @@ - (id)initWithCodeString:(NSString*)string;
 
 - (void) dealloc
 {
+  DLog(@"%s window released cleanly", __PRETTY_FUNCTION__);
   [codeString release], codeString = nil;
   [super dealloc];
 }

diff --git a/SharedCode/ZSyncShared.h b/SharedCode/ZSyncShared.h
@@ -4,7 +4,6 @@
 
 #define zsAction @"kZSyncAction"
 #define zsDeviceID @"kZSyncDeviceID"
-#define zsAuthenticationCode @"zsAuthenticationCode"
 
 enum {
   zsActionRequestPairing = 1123,