Corrected bug where a changed password would keep your account in limbo

Author: thedillonb

CodeHub.Core/ViewModels/Accounts/AccountsViewModel.cs

@@ -27,11 +27,12 @@ protected override void AddAccount()
 		protected async override void SelectAccount(IAccount account)
         {
             var githubAccount = (GitHubAccount) account;
+			var isEnterprise = githubAccount.IsEnterprise || !string.IsNullOrEmpty(githubAccount.Password);
 
 			if (githubAccount.DontRemember)
 			{
 				//Hack for now
-				if (githubAccount.IsEnterprise || !string.IsNullOrEmpty(githubAccount.Password))
+				if (isEnterprise)
 				{
 					ShowViewModel<AddAccountViewModel>(new AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });
 				}
@@ -49,9 +50,17 @@ protected async override void SelectAccount(IAccount account)
 				var client = await _loginService.LoginAccount(githubAccount);
 				_applicationService.ActivateUser(githubAccount, client);
 			}
+			catch (GitHubSharp.UnauthorizedException e)
+			{
+				ReportError(e);
+				if (isEnterprise)
+					ShowViewModel<AddAccountViewModel>(new AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = githubAccount.Id });
+				else
+					ShowViewModel<LoginViewModel>(LoginViewModel.NavObject.CreateDontRemember(githubAccount));
+			}
 			catch (Exception e)
 			{
-				Error = e;
+				ReportError(e);
 			}
 			finally
 			{

CodeHub.Core/ViewModels/App/StartupViewModel.cs

@@ -33,12 +33,13 @@ protected async override void Startup()
 				return;
 			}
 
+			var isEnterprise = account.IsEnterprise || !string.IsNullOrEmpty(account.Password);
 			if (account.DontRemember)
 			{
 				ShowViewModel<Accounts.AccountsViewModel>();
 
 				//Hack for now
-				if (account.IsEnterprise || !string.IsNullOrEmpty(account.Password))
+				if (isEnterprise)
 				{
 					ShowViewModel<Accounts.AddAccountViewModel>(new Accounts.AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });
 				}
@@ -57,9 +58,19 @@ protected async override void Startup()
 				var client = await _loginService.LoginAccount(account);
 				_applicationService.ActivateUser(account, client);
 			}
+			catch (GitHubSharp.UnauthorizedException e)
+			{
+				ReportError(e);
+				ShowViewModel<Accounts.AccountsViewModel>();
+				if (isEnterprise)
+					ShowViewModel<Accounts.AddAccountViewModel>(new Accounts.AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });
+				else
+					ShowViewModel<Accounts.LoginViewModel>(Accounts.LoginViewModel.NavObject.CreateDontRemember(account));
+			}
 			catch (Exception e)
 			{
-				Error = e;
+				ReportError(e);
+				ShowViewModel<Accounts.AccountsViewModel>();
 			}
 			finally
 			{