Fix #19: Get logged in user when starting new sessions

Jawbone · Jun 13, 2014 · ba75a19 · ba75a19
1 parent 6adefd8
commit ba75a19
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 10 deletions.
diff --git a/Examples/APIExplorer/APIExplorer/JBLandingViewController.m b/Examples/APIExplorer/APIExplorer/JBLandingViewController.m
@@ -10,8 +10,8 @@
 
 #import "UP.h"
 
-NSString *const kAPIExplorerID = @"3ZYR1YjGd3Q";
-NSString *const kAPIExplorerSecret = @"4dd5b10b3a3a16dbf3082c86d5faff09e11a682b";
+NSString *const kAPIExplorerID = @"pHekFTFd7qA";
+NSString *const kAPIExplorerSecret = @"93ff020364207ebe820c4215c8f3a694b1b4ff63";
 
 @interface JBLandingViewController ()
 
@@ -37,6 +37,7 @@ - (void)viewDidLoad
 
 		if (session != nil)
 		{
+            NSLog(@"Continued session for %@ %@", session.currentUser.firstName, session.currentUser.lastName);
 			[self performSegueWithIdentifier:@"LoggedIn" sender:nil];
 		}
 	}];
@@ -55,6 +56,7 @@ - (IBAction)login:(id)sender
 
 		if (session != nil)
 		{
+            NSLog(@"Started session for %@ %@", session.currentUser.firstName, session.currentUser.lastName);
 			[self performSegueWithIdentifier:@"LoggedIn" sender:nil];
 		}
 		else

diff --git a/UPPlatformSDK/UPPlatformSDK/UPPlatform.m b/UPPlatformSDK/UPPlatformSDK/UPPlatform.m
@@ -311,7 +311,16 @@ - (void)startSessionWithClientID:(NSString *)clientID clientSecret:(NSString *)c
     if (token != nil)
     {
         self.currentSession = [[UPSession alloc] initWithToken:token];
-        self.sessionCompletion(self.currentSession, nil);
+
+        [UPUserAPI getCurrentUserWithCompletion:^(UPUser *user, UPURLResponse *response, NSError *error) {
+            if (user != nil)
+            {
+                self.currentSession.currentUser = user;
+            }
+
+            self.sessionCompletion(self.currentSession, nil);
+        }];
+
         return;
     }
 
@@ -371,14 +380,32 @@ - (void)authViewController:(UPAuthViewController *)viewController didCompleteWit
         if (error == nil && data.length)
         {
             NSDictionary *responseJSON = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
-            NSString *authToken = responseJSON[@"access_token"];
-            NSString *refreshToken = responseJSON[@"refresh_token"];
 
-            [self setExistingAuthToken:authToken];
-            [self setRefreshToken:refreshToken];
-
-            self.currentSession = [[UPSession alloc] initWithToken:authToken];
-            self.sessionCompletion(self.currentSession, nil);
+            NSString *jsonError = responseJSON[@"error"];
+            if (jsonError.length == 0)
+            {
+                NSString *authToken = responseJSON[@"access_token"];
+                NSString *refreshToken = responseJSON[@"refresh_token"];
+
+                [self setExistingAuthToken:authToken];
+                [self setRefreshToken:refreshToken];
+
+                self.currentSession = [[UPSession alloc] initWithToken:authToken];
+
+                [UPUserAPI getCurrentUserWithCompletion:^(UPUser *user, UPURLResponse *response, NSError *error) {
+                    if (user != nil)
+                    {
+                        self.currentSession.currentUser = user;
+                    }
+
+                    self.sessionCompletion(self.currentSession, nil);
+                }];
+            }
+            else
+            {
+                NSString *errorDescription = responseJSON[@"error_description"];
+                self.sessionCompletion(nil, [NSError errorWithDomain:@"com.jawbone.up" code:0 userInfo:@{ NSLocalizedDescriptionKey : errorDescription }]);
+            }
         }
         else
         {