Merge pull request ResearchKit#135 from EricSiegNW/feature/FPHS-694

FPHS 694

Author: Erin-Mounts

APCAppCore/APCAppCore/Startup/APCAppDelegate.h

@@ -152,4 +152,6 @@ extern NSString *const kNewsFeedStoryBoardKey;
  */
 - (void) resetAppAndProceedToSignIn;
 
+- (void) clearPreviousUserData;
+
 @end

APCAppCore/APCAppCore/Startup/APCAppDelegate.m

@@ -1246,17 +1246,21 @@ - (void) resetAppAndProceedToSignIn
     UIViewController * vc =  [[UIViewController alloc] init];
     vc.view.backgroundColor = [UIColor whiteColor];
     appDelegate.window.rootViewController = vc;
-    
-    // Clear all user info, in case they log in or sign up as a different user afterwards
-    [appDelegate clearNSUserDefaults];
-    [APCKeychainStore resetKeyChain];
-    [appDelegate.dataSubstrate resetCoreData];
-    
+
     // This is all that is needed to force the re-registration of the PIN
     APCUser* user = [((id<APCOnboardingManagerProvider>)appDelegate) onboardingManager].user;
     user.secondaryInfoSaved = NO;
 
     [self logOutAndGoToSignIn];
 }
 
+- (void) clearPreviousUserData
+{
+    // Clear all user info, in case they log in or sign up as a different user afterwards
+    APCAppDelegate * appDelegate = (APCAppDelegate*) [UIApplication sharedApplication].delegate;
+    [appDelegate clearNSUserDefaults];
+    [APCKeychainStore resetKeyChain];
+    [appDelegate.dataSubstrate resetCoreData];
+}
+
 @end

APCAppCore/APCAppCore/UI/Onboarding/SignIn/APCSignInViewController.m

@@ -177,9 +177,14 @@ - (void) signIn
 
         APCUser * user = [self user];
 
-        user.email = self.userHandleTextField.text;
+        if (user.email != nil && ![user.email isEqualToString:self.userHandleTextField.text] ) {
+            // Trying to log in as a different user, so clear cached data from the previously logged in user
+            [((APCAppDelegate*)[UIApplication sharedApplication].delegate) clearPreviousUserData];
+        }
 
+        user.email = self.userHandleTextField.text;
         user.password = self.passwordTextField.text;
+        
         [user signInOnCompletion:^(NSError *error) {
             if (error) {
                 [spinnerController dismissViewControllerAnimated:YES completion:^{