fixed some google login stuff

Sen66 [2016-07-22 05:12:19]
fixed some google login stuff
Filename
PokemonGo/RocketAPI/Client.cs
PokemonGo/RocketAPI/Console/App.config
diff --git a/PokemonGo/RocketAPI/Client.cs b/PokemonGo/RocketAPI/Client.cs
index 6ca4ead..01fc070 100644
--- a/PokemonGo/RocketAPI/Client.cs
+++ b/PokemonGo/RocketAPI/Client.cs
@@ -80,18 +80,22 @@ namespace PokemonGo.RocketAPI

         public async Task DoGoogleLogin()
         {
-            _authType = AuthType.Google;
-            if (_settings.GoogleRefreshToken != string.Empty)
+            if (_settings.GoogleRefreshToken == string.Empty && accestoken == string.Empty)
             {
-                var tokenResponse = await GoogleLogin.GetAccessToken(_settings.GoogleRefreshToken);
+                var tokenResponse = await GoogleLogin.GetAccessToken();
                 _accessToken = tokenResponse.id_token;
+                Console.WriteLine($"Put RefreshToken in settings for direct login: {tokenResponse.access_token}");
+                accestoken = tokenResponse.access_token;
             }
-
-            if (_accessToken == null)
+            else
             {
-                var tokenResponse = await GoogleLogin.GetAccessToken();
+                GoogleLogin.TokenResponseModel tokenResponse;
+                if (_settings.GoogleRefreshToken != string.Empty)
+                    tokenResponse = await GoogleLogin.GetAccessToken(_settings.GoogleRefreshToken);
+                else
+                    tokenResponse = await GoogleLogin.GetAccessToken(accestoken);
                 _accessToken = tokenResponse.id_token;
-                _settings.GoogleRefreshToken = tokenResponse.access_token;
+                _authType = AuthType.Google;
             }
         }

diff --git a/PokemonGo/RocketAPI/Console/App.config b/PokemonGo/RocketAPI/Console/App.config
index e21bcb4..54cda01 100644
--- a/PokemonGo/RocketAPI/Console/App.config
+++ b/PokemonGo/RocketAPI/Console/App.config
@@ -17,9 +17,9 @@
     <add key="PtcUsername" value="username" />
     <add key="PtcPassword" value="pw" />
     <add key="GoogleRefreshToken" value="" />
-    <add key="DefaultLatitude" value="48.45" />
+    <add key="DefaultLatitude" value="48.398358" />
     <!--Default Amsterdam Central Station-->
-    <add key="DefaultLongitude" value="13.4333" />
+    <add key="DefaultLongitude" value="13.436663" />
     <!--Default Amsterdam Central Station-->
     <add key="LevelOutput" value="levelup" />
     <!--2 Modes: "time": Every XXX seconds and "levelup" every levelup-->
You may download the files in Public Git.