Extracted a method that calculates the login url to PithosAccount

diff --git a/trunk/Pithos.Client.WPF/PithosAccount.cs b/trunk/Pithos.Client.WPF/PithosAccount.cs
index dfa18ef..e9dbf5c 100644 (file)
--- a/trunk/Pithos.Client.WPF/PithosAccount.cs
+++ b/trunk/Pithos.Client.WPF/PithosAccount.cs
@@ -45,7 +45,8 @@
 \r
 using System.Reflection;
 using Pithos.Client.WPF.Preferences;
-using Pithos.Client.WPF.Properties;
+using Pithos.Client.WPF.Properties;\r
+using Pithos.Interfaces;\r
 using Pithos.Network;
 using log4net;
 
@@ -124,7 +125,15 @@ namespace Pithos.Client.WPF
 */
         }
 
+        public static Uri GetLoginUri(string serverUrl)\r
+        {\r
+            return GetLoginUri(new Uri(serverUrl));\r
+        }\r
 \r
+        public static Uri GetLoginUri(Uri serverUri)\r
+        {\r
+            var loginUri = serverUri.Combine("im/login");\r
+        }\r
 \r
 \r
     }

diff --git a/trunk/Pithos.Client.WPF/Preferences/AddAccountViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/AddAccountViewModel.cs
index f4cdaab..bbd6ae8 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/AddAccountViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/AddAccountViewModel.cs
@@ -253,7 +253,7 @@ namespace Pithos.Client.WPF.Preferences
 \r
             try\r
             {\r
-                var loginUri=new Uri(CurrentServer).Combine("login");\r
+                var loginUri = PithosAccount.GetLoginUri(CurrentServer);\r
                 var credentials = PithosAccount.RetrieveCredentials(loginUri.ToString());\r
                 if (credentials == null)\r
                     return;\r

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
index 59fcf95..7b91d07 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
@@ -281,7 +281,7 @@ namespace Pithos.Client.WPF.Preferences
 \r
                 var name = CurrentAccount.AccountName;\r
 \r
-                var loginUri = new Uri(CurrentAccount.ServerUrl).Combine("login");\r
+                var loginUri = PithosAccount.GetLoginUri(CurrentAccount.ServerUrl);\r
                 var credentials = PithosAccount.RetrieveCredentials(loginUri.ToString(), name);\r
                 if (credentials == null)\r
                     return;\r