Revision 20e9a378 trunk/Pithos.Client.WPF/PithosAccount.cs

b/trunk/Pithos.Client.WPF/PithosAccount.cs
32 32
        /// <summary>
33 33
        /// Asynchronously retrieves PITHOS credentials
34 34
        /// </summary>
35
        /// <param name="pithosSite">URL to retrieve the account info from PITHOS. Must end with =</param>
35
        /// <param name="loginUrl">URL to retrieve the account info from PITHOS. Must end with =</param>
36 36
        /// <returns>The credentials wrapped in a Task</returns>
37
        public static Task<NetworkCredential> RetrieveCredentialsAsync(string pithosSite)
37
        public static Task<NetworkCredential> RetrieveCredentialsAsync(string loginUrl)
38 38
        {
39
            Contract.Requires(Uri.IsWellFormedUriString(pithosSite, UriKind.Absolute));
39
            Contract.Requires(Uri.IsWellFormedUriString(loginUrl, UriKind.Absolute));
40 40

  
41
            if (!Uri.IsWellFormedUriString(pithosSite, UriKind.Absolute))
42
                throw new ArgumentException("The pithosSite parameter must be a valid absolute URL", "pithosSite");
41
            if (!Uri.IsWellFormedUriString(loginUrl, UriKind.Absolute))
42
                throw new ArgumentException("The pithosSite parameter must be a valid absolute URL", "loginUrl");
43 43
            
44 44
            int port = GetFreePort();
45 45

  
......
98 98
                    }
99 99
                });
100 100

  
101
            var uriBuilder=new UriBuilder(pithosSite);
102
            uriBuilder.Path="login";            
101
            var uriBuilder=new UriBuilder(loginUrl);                       
103 102
            uriBuilder.Query="next=" + listenerUrl;
104 103

  
105 104
            var retrieveUri = uriBuilder.Uri;

Also available in: Unified diff