Fix merge csproj

Author: FeroxRev

PokemonGo.RocketAPI/Login/GoogleLogin.cs

@@ -1,4 +1,4 @@
-using DankMemes.GPSOAuthSharp;
+using DankMemes.GPSOAuthSharp;
 using PokemonGo.RocketAPI.Exceptions;
 using System;
 using System.Collections.Generic;
@@ -24,25 +24,25 @@ public GoogleLogin(string email, string password)
 
         public async Task<string> GetAccessToken()
         {
-            var client = new GPSOAuthClient(email, password);
+            var client = new GPSOAuthClient(email, password);
             var response = client.PerformMasterLogin();
 
-            if (response.ContainsKey("Error"))
-                throw new GoogleException(response["Error"]);
-
-            //Todo: captcha/2fa implementation
-
-            if (!response.ContainsKey("Auth"))
-                throw new GoogleOfflineException();
-
-            var oauthResponse = client.PerformOAuth(response["Token"],
-                "audience:server:client_id:848232511240-7so421jotr2609rmqakceuu1luuq0ptb.apps.googleusercontent.com",
-                "com.nianticlabs.pokemongo",
-                "321187995bc7cdc2b5fc91b11a96e2baa8602c62");
-
-            if (!oauthResponse.ContainsKey("Auth"))
-                throw new GoogleOfflineException();
-
+            if (response.ContainsKey("Error"))
+                throw new GoogleException(response["Error"]);
+
+            //Todo: captcha/2fa implementation
+
+            if (!response.ContainsKey("Auth"))
+                throw new GoogleOfflineException();
+
+            var oauthResponse = client.PerformOAuth(response["Token"],
+                "audience:server:client_id:848232511240-7so421jotr2609rmqakceuu1luuq0ptb.apps.googleusercontent.com",
+                "com.nianticlabs.pokemongo",
+                "321187995bc7cdc2b5fc91b11a96e2baa8602c62");
+
+            if (!oauthResponse.ContainsKey("Auth"))
+                throw new GoogleOfflineException();
+
             return oauthResponse["Auth"];
         }
     }

PokemonGo.RocketAPI/Login/PtcLogin.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PokemonGo.RocketAPI.Exceptions;
 using System.Collections.Generic;
 using System.Net;
@@ -26,7 +26,7 @@ public async Task<string> GetAccessToken()
                 AllowAutoRedirect = false
             };
 
-            using (var tempHttpClient = new HttpClient(handler))
+            using (var tempHttpClient = new System.Net.Http.HttpClient(handler))
             {
                 //Get session cookie
                 var sessionData = await GetSessionCookie(tempHttpClient).ConfigureAwait(false);
@@ -73,7 +73,7 @@ private static IDictionary<string, string> GenerateTokenVarRequest(string ticket
                 {"code", ticketId}
             };
 
-        private static async Task<string> GetLoginTicket(string username, string password, HttpClient tempHttpClient, SessionData sessionData)
+        private static async Task<string> GetLoginTicket(string username, string password, System.Net.Http.HttpClient tempHttpClient, SessionData sessionData)
         {
             HttpResponseMessage loginResp;
             var loginRequest = GenerateLoginRequest(sessionData, username, password);
@@ -86,15 +86,15 @@ private static async Task<string> GetLoginTicket(string username, string passwor
             return ticketId;
         }
 
-        private static async Task<SessionData> GetSessionCookie(HttpClient tempHttpClient)
+        private static async Task<SessionData> GetSessionCookie(System.Net.Http.HttpClient tempHttpClient)
         {
             var sessionResp = await tempHttpClient.GetAsync(Resources.PtcLoginUrl).ConfigureAwait(false);
             var data = await sessionResp.Content.ReadAsStringAsync().ConfigureAwait(false);
             var sessionData = JsonConvert.DeserializeObject<SessionData>(data);
             return sessionData;
         }
 
-        private static async Task<string> GetToken(HttpClient tempHttpClient, string ticketId)
+        private static async Task<string> GetToken(System.Net.Http.HttpClient tempHttpClient, string ticketId)
         {
             HttpResponseMessage tokenResp;
             var tokenRequest = GenerateTokenVarRequest(ticketId);

PokemonGo.RocketAPI/PokemonGo.RocketAPI.csproj

@@ -85,6 +85,7 @@
   <ItemGroup>
     <Compile Include="Exceptions\GoogleException.cs" />
     <Compile Include="Exceptions\GoogleOfflineException.cs" />
+    <Compile Include="Exceptions\LoginFailedException.cs" />
     <Compile Include="HttpClient\PokemonClient.cs" />
     <Compile Include="Enums\AuthType.cs" />
     <Compile Include="Exceptions\AccessTokenExpiredException.cs" />
@@ -99,7 +100,7 @@
     <Compile Include="Helpers\Utils.cs" />
     <Compile Include="ISettings.cs" />
     <Compile Include="Login\GoogleLogin.cs" />
-    <Compile Include="Login\GoogleLoginGPSOAuth.cs" />
+    <Compile Include="Login\ILoginType.cs" />
     <Compile Include="Login\PtcLogin.cs" />
     <Compile Include="Rpc\BaseRpc.cs" />
     <Compile Include="Rpc\Download.cs" />