[Procurement-PoE#1140,1141,1142,1144,1146,1147,1148] Temporary fix fo…

…r "Error downloading account name".
Omga4000 · Dec 22, 2022 · d8c2e2f · d8c2e2f
1 parent 0ac32e5
commit d8c2e2f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/POEApi.Model/POEModel.cs b/POEApi.Model/POEModel.cs
@@ -62,7 +62,7 @@ public bool Authenticate(string email, SecureString password, bool offline, stri
             return true;
         }
 
-        public string GetAccountName(string realm)
+        public string GetAccountName(string username, string realm)
         {
             try
             {
@@ -71,7 +71,8 @@ public string GetAccountName(string realm)
                     return string.Empty;
                 }
 
-                var account = GetProperObjectFromTransport<Account>(Transport.GetAccountName(realm));
+                var account = GetProperObjectFromTransport<Account>(Transport.GetAccountName(username, realm));
+                account.AccountName = username;
 
                 if (string.IsNullOrEmpty(account?.AccountName))
                 {

diff --git a/POEApi.Transport/CachedTransport.cs b/POEApi.Transport/CachedTransport.cs
@@ -37,9 +37,9 @@ public bool Authenticate(string email, SecureString password)
             return _innerTranport.Authenticate(email, password);
         }
 
-        public Stream GetAccountName(string realm)
+        public Stream GetAccountName(string username, string realm)
         {
-            return _innerTranport.GetAccountName(realm);
+            return _innerTranport.GetAccountName(username, realm);
         }
 
         public Stream GetStash(int index, string league, string accountName, string realm, bool refresh)

diff --git a/POEApi.Transport/HttpTransport.cs b/POEApi.Transport/HttpTransport.cs
@@ -27,7 +27,7 @@ protected enum HttpMethod { GET, POST }
 
         private const string LoginURL = @"https://www.pathofexile.com/login";
         private const string AccountURL = @"https://www.pathofexile.com/my-account";
-        private const string AccountNameURL = @"https://www.pathofexile.com/character-window/get-account-name?realm={0}";
+        private const string AccountNameURL = @"https://api.poe.watch/char?name={0}&realm={1}";
         private const string CharacterURL = @"https://www.pathofexile.com/character-window/get-characters?&realm={0}";
         private const string StashURL = @"https://www.pathofexile.com/character-window/get-stash-items?league={0}&tabs=1&tabIndex={1}&accountName={2}&realm={3}";
         private const string InventoryURL = @"https://www.pathofexile.com/character-window/get-items?character={0}&accountName={1}&realm={2}";
@@ -219,9 +219,9 @@ public Stream GetCharacters(string realm )
             return PerformHttpRequest(HttpMethod.GET, string.Format(CharacterURL, realm));
         }
 
-        public Stream GetAccountName(string realm )
+        public Stream GetAccountName(string username, string realm )
         {
-            return PerformHttpRequest(HttpMethod.GET, string.Format(AccountNameURL, realm));
+            return PerformHttpRequest(HttpMethod.GET, string.Format(AccountNameURL, username, realm));
         }
 
         // TODO(20180928): Throttle performing these requests?

diff --git a/POEApi.Transport/ITransport.cs b/POEApi.Transport/ITransport.cs
@@ -7,7 +7,7 @@ namespace POEApi.Transport
     public interface ITransport
     {
         bool Authenticate(string email, SecureString password);
-        Stream GetAccountName(string realm);
+        Stream GetAccountName(string username, string realm);
         Stream GetStash(int index, string league, string accountName, string realm);
         Stream GetStash(int index, string league, string accountName, string realm, bool refresh);
         Stream GetImage(string url);

diff --git a/Procurement/Procurement.csproj b/Procurement/Procurement.csproj
@@ -54,8 +54,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject>Procurement.App</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Images\Procurement.ico</ApplicationIcon>

diff --git a/Procurement/ViewModel/LoginWindowViewModel.cs b/Procurement/ViewModel/LoginWindowViewModel.cs
@@ -151,7 +151,7 @@ public void Login(bool offline)
                 if (!offline)
                 {
                     _statusController.DisplayMessage("Fetching account name...");
-                    ApplicationState.AccountName = ApplicationState.Model.GetAccountName(ApplicationState.CurrentRealm);
+                    ApplicationState.AccountName = ApplicationState.Model.GetAccountName(Email, ApplicationState.CurrentRealm);
                     _statusController.Ok();
                     if (ForceRefresh)
                     {

diff --git a/Tests/POEApi.Model.Tests/PoeModelTests.cs b/Tests/POEApi.Model.Tests/PoeModelTests.cs
@@ -178,9 +178,9 @@ public void GetAccountNameTest()
 
             using (var stream = GenerateStreamFromString(fakeAccountNameResponse))
             {
-                _mockTransport.Setup(m => m.GetAccountName(Realm.PC)).Returns(stream);
+                _mockTransport.Setup(m => m.GetAccountName("fakeAccountName", Realm.PC)).Returns(stream);
 
-                var account = _model.GetAccountName(Realm.PC);
+                var account = _model.GetAccountName("fakeAccountName", Realm.PC);
 
                 Assert.AreEqual("fakeAccountName", account);
             }