Improve error message when logging in with Microsoft Account and using the Credential parameter

cormacpayne · cormacpayne · commit e2e47f2443c8 · 2016-12-06T13:44:05.000-08:00
diff --git a/src/Common/Commands.Common.Authentication/Authentication/UserTokenProvider.cs b/src/Common/Commands.Common.Authentication/Authentication/UserTokenProvider.cs
@@ -189,7 +189,8 @@ private AuthenticationResult SafeAquireToken(
 
                     ex = new AadAuthenticationFailedWithoutPopupException(message, adalEx);
                 }
-                else if (adalEx.ErrorCode == AdalError.MissingFederationMetadataUrl)
+                else if (adalEx.ErrorCode == AdalError.MissingFederationMetadataUrl ||
+                         adalEx.ErrorCode == AdalError.FederatedServiceReturnedError)
                 {
                     ex = new AadAuthenticationFailedException(Resources.CredentialOrganizationIdMessage, adalEx);
                 }

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,8 @@ private AuthenticationResult SafeAquireToken(`
`189`	`189`
`190`	`190`	`ex = new AadAuthenticationFailedWithoutPopupException(message, adalEx);`
`191`	`191`	`}`
`192`		`- else if (adalEx.ErrorCode == AdalError.MissingFederationMetadataUrl)`
	`192`	`+ else if (adalEx.ErrorCode == AdalError.MissingFederationMetadataUrl \|\|`
	`193`	`+ adalEx.ErrorCode == AdalError.FederatedServiceReturnedError)`
`193`	`194`	`{`
`194`	`195`	`ex = new AadAuthenticationFailedException(Resources.CredentialOrganizationIdMessage, adalEx);`
`195`	`196`	`}`