fixed something with Google Login
Sen66 [2016-07-22 05:07:12]
fixed something with Google Login
diff --git a/PokemonGo/RocketAPI/Client.cs b/PokemonGo/RocketAPI/Client.cs
index 9597bf8..6ca4ead 100644
--- a/PokemonGo/RocketAPI/Client.cs
+++ b/PokemonGo/RocketAPI/Client.cs
@@ -80,23 +80,18 @@ namespace PokemonGo.RocketAPI
public async Task DoGoogleLogin()
{
- if (_settings.GoogleRefreshToken == string.Empty && accestoken == string.Empty)
+ _authType = AuthType.Google;
+ if (_settings.GoogleRefreshToken != string.Empty)
{
- var tokenResponse = await GoogleLogin.GetAccessToken();
+ var tokenResponse = await GoogleLogin.GetAccessToken(_settings.GoogleRefreshToken);
_accessToken = tokenResponse.id_token;
- _settings.GoogleRefreshToken = tokenResponse.access_token;
- Console.WriteLine($"Put RefreshToken in settings for direct login: {tokenResponse.access_token}");
- accestoken = tokenResponse.access_token;
}
- else
+
+ if (_accessToken == null)
{
- PokemonGo.RocketAPI.Login.GoogleLogin.TokenResponseModel tokenResponse;
- if (_settings.GoogleRefreshToken != string.Empty)
- tokenResponse = await GoogleLogin.GetAccessToken(_settings.GoogleRefreshToken);
- else
- tokenResponse = await GoogleLogin.GetAccessToken(accestoken);
+ var tokenResponse = await GoogleLogin.GetAccessToken();
_accessToken = tokenResponse.id_token;
- _authType = AuthType.Google;
+ _settings.GoogleRefreshToken = tokenResponse.access_token;
}
}
You may download the files in Public Git.