notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests 1 Projects 2 Releases 9 Packages Wiki Activity Actions

a better task handling

Browse source
This commit is contained in:
Paul Schneider 2017-02-18 02:28:19 +01:00
commit 85cfd10544
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ZicMoove/ZicMoove.Droid/OAuth2/YaOAuth2Authenticator.cs
View file

@ -381,22 +381,33 @@ public class YaOAuth2Authenticator : WebRedirectAuthenticator
var auth = req.GetResponseAsync().ContinueWith(task => var auth = req.GetResponseAsync().ContinueWith(task =>
{ {
var text = task.Result.GetResponseText(); if (task.IsCompleted)
req.Abort(); {
// Parse the response var text = task.Result.GetResponseText();
var data = text.Contains("{") ? WebEx.JsonDecode(text) : WebEx.FormDecode(text); req.Abort();
// Parse the response
var data = text.Contains("{") ? WebEx.JsonDecode(text) : WebEx.FormDecode(text);
if (data.ContainsKey("error")) if (data.ContainsKey("error"))
{ {
throw new AuthException("Error authenticating: " + data["error"]); throw new AuthException("Error authenticating: " + data["error"]);
}
else if (data.ContainsKey("access_token"))
{
return data;
}
else
{
throw new AuthException("Expected access_token in access token response, but did not receive one.");
}
} }
else if (data.ContainsKey("access_token")) else if (task.IsFaulted)
{ {
return data; throw new AuthException("Unexpected fault");
} }
else else
{ {
throw new AuthException("Expected access_token in access token response, but did not receive one."); throw new AuthException($"Ended: {task.Status}");
} }
}); });