Revision ac137734

b/trunk/Pithos.Client.WPF/Preferences/AddAccountViewModel.cs
257 257 
                var credentials = PithosAccount.RetrieveCredentials(loginUri.ToString());
258 258 
                if (credentials == null)
259 259 
                    return;
260 
                AccountName = credentials.UserName;
260 
                //AccountName = credentials.UserName;
261 261 
                Token = credentials.Password;
262 
                AccountName = PithosAccount.GetUserID(new Uri(CurrentServer), Token);
262 263 

  		





  263
  264
  
    
                IsConfirmed = true;


  		





  264
  265
  
    

  		












  

    
      b/trunk/Pithos.Network/CloudFilesClient.cs
    
  






  226
  226
  
    

  		





  227
  227
  
    
            var groups = new List<Group>();


  		





  228
  228
  
    

  		





  229
  
  
    
            using (var authClient = new HttpClient(_httpClientHandler,false){ BaseAddress = new Uri(AuthenticationUrl),Timeout=TimeSpan.FromSeconds(30) })


  		





  
  229
  
    
//            using (var authClient = new HttpClient(_httpClientHandler,false){ BaseAddress = new Uri(AuthenticationUrl),Timeout=TimeSpan.FromSeconds(30) })


  		





  
  230
  
    
            using (var authClient = new HttpClient(_httpClientHandler, false) { BaseAddress = new Uri(AuthenticationUrl), Timeout = TimeSpan.FromSeconds(30) })


  		





  230
  231
  
    
            {                


  		





  231
  232
  
    

  		





  232
  233
  
    
                authClient.DefaultRequestHeaders.Add("X-Auth-User", UserName);


  		





  ......




  235
  236
  
    
                string storageUrl;


  		





  236
  237
  
    
                string token;


  		





  237
  238
  
    
                


  		





  238
  
  
    
                using (var response = await authClient.GetAsyncWithRetries(new Uri(VersionPath, UriKind.Relative),3).ConfigureAwait(false)) // .DownloadStringWithRetryRelative(new Uri(VersionPath, UriKind.Relative), 3);                    


  		





  
  239
  
    
                //using (var response = await authClient.GetAsyncWithRetries(new Uri(VersionPath, UriKind.Relative),3).ConfigureAwait(false)) // .DownloadStringWithRetryRelative(new Uri(VersionPath, UriKind.Relative), 3);                    


  		





  
  240
  
    
                using (var response = await authClient.GetAsyncWithRetries(new Uri("", UriKind.Relative), 3).ConfigureAwait(false)) // .DownloadStringWithRetryRelative(new Uri(VersionPath, UriKind.Relative), 3);                    


  		





  239
  241
  
    
                {


  		





  240
  242
  
    
                    AssertStatusOK(response,"Authentication failed");


  		





  241
  243
  
    
                


  		





  ......




  296
  298
  
    
            {


  		





  297
  299
  
    
                displayName = await ResolveName(uuid);


  		





  298
  300
  
    
            }


  		





  299
  
  
    
            return new AccountInfo {StorageUri = StorageUrl, Token = Token, UserName = UserName,DisplayName=displayName,Groups=groups};            


  		





  
  301
  
    
            return new AccountInfo {StorageUri = StorageUrl, Token = Token, UserName = UserName, DisplayName=displayName, Groups=groups};            


  		





  300
  302
  
    

  		





  301
  303
  
    
        }


  		





  302
  304
  
    

  		












Also available in:
  Unified diff