Revision 84b880b5
| b/trunk/CommonAssemblyVersion.cs | ||
|---|---|---|
| 46 | 46 |
// associated with an assembly. |
| 47 | 47 |
[assembly: AssemblyCompany("GRNET")]
|
| 48 | 48 |
[assembly: AssemblyCopyright("Copyright © GRNet 2011-2013")]
|
| 49 |
[assembly: AssemblyInformationalVersion("2013-09-09")]
|
|
| 49 |
[assembly: AssemblyInformationalVersion("2013-12-18")]
|
|
| 50 | 50 |
|
| 51 | 51 |
|
| 52 | 52 |
|
| ... | ... | |
| 60 | 60 |
// You can specify all the values or you can default the Build and Revision Numbers |
| 61 | 61 |
// by using the '*' as shown below: |
| 62 | 62 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 63 |
[assembly: AssemblyVersion("1.8.30909.188")]
|
|
| 63 |
[assembly: AssemblyVersion("1.8.31218.201")]
|
|
| b/trunk/Pithos.Client.WPF/PithosAccount.cs | ||
|---|---|---|
| 162 | 162 |
|
| 163 | 163 |
webLogin = webLogin.Combine("login");
|
| 164 | 164 |
|
| 165 |
//MessageBox.Show(okeanosServices["access"]["serviceCatalog"][0]["endpoints"][0]["publicURL"].ToString()); |
|
| 166 |
|
|
| 165 | 167 |
//MessageBox.Show(GetUserID(serverUri, "mkavGw6HOZymWR3k1u2clwOP1poOYukBl5P80PQ_nzE")); |
| 166 | 168 |
|
| 167 | 169 |
return webLogin; |
| ... | ... | |
| 209 | 211 |
|
| 210 | 212 |
//MessageBox.Show(tokenreponse.ToString()); |
| 211 | 213 |
User = tokenreponse["access"]["token"]["tenant"]["id"].ToString(); |
| 214 |
//MessageBox.Show(tokenreponse["access"]["token"]["tenant"]["id"].ToString()); |
|
| 212 | 215 |
|
| 213 | 216 |
read.Close(); |
| 214 | 217 |
} |
| b/trunk/Pithos.Client.WPF/Preferences/AddAccountView.xaml | ||
|---|---|---|
| 79 | 79 |
<RowDefinition Height="Auto"/> |
| 80 | 80 |
<RowDefinition /> |
| 81 | 81 |
</Grid.RowDefinitions> |
| 82 |
<Label Content="User ID" Grid.Column="0" Grid.Row="0" Margin="0,5" HorizontalAlignment="Left"/> |
|
| 83 |
<TextBox Name="AccountName" Grid.Column="1" Grid.Row="0" Margin="5"/>
|
|
| 84 |
<Label Content="API Key" Grid.Column="0" Grid.Row="1" Margin="0,5" HorizontalAlignment="Left"/>
|
|
| 82 |
<!-- <Label Content="User ID" Grid.Column="0" Grid.Row="0" Margin="0,5" HorizontalAlignment="Left"/>
|
|
| 83 |
<TextBox Name="AccountName" Grid.Column="1" Grid.Row="0" Margin="5"/> -->
|
|
| 84 |
<Label Content="Token" Grid.Column="0" Grid.Row="1" Margin="0,5" HorizontalAlignment="Left"/>
|
|
| 85 | 85 |
<TextBox Name="Token" Grid.Column="1" Grid.Row="1" Margin="5"/> |
| 86 | 86 |
<Button x:Name="TestManualAccount" Content="Validate Credentials" IsEnabled="{Binding HasCredentials}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right" cal:Message.Attach="TestAccount" Margin="5"/>
|
| 87 | 87 |
<TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding ValidationMessage}" Margin="10" HorizontalAlignment="Center"/>
|
| b/trunk/Pithos.Client.WPF/Preferences/AddAccountViewModel.cs | ||
|---|---|---|
| 376 | 376 |
{
|
| 377 | 377 |
SetBusy("Validating Credentials", "");
|
| 378 | 378 |
var client = new CloudFilesClient(AccountName, Token) { AuthenticationUrl = CurrentServer,/*Proxy=Proxy */};
|
| 379 |
//MessageBox.Show(AccountName); |
|
| 380 |
//MessageBox.Show(Token); |
|
| 381 |
//MessageBox.Show(CurrentServer); |
|
| 379 | 382 |
await client.Authenticate().ConfigureAwait(false); |
| 380 | 383 |
await client.ListContainers(AccountName).ConfigureAwait(false); |
| 381 | 384 |
HasValidCredentials = true; |
| b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs | ||
|---|---|---|
| 309 | 309 |
//var name = CurrentAccount.AccountName; |
| 310 | 310 |
var AuthToken = credentials.Password; |
| 311 | 311 |
var name = PithosAccount.GetUserID(new Uri(CurrentAccount.ServerUrl), AuthToken); |
| 312 |
MessageBox.Show(CurrentAccount.ServerUrl); |
|
| 312 |
//MessageBox.Show(CurrentAccount.ServerUrl);
|
|
| 313 | 313 |
//The server will return credentials for a different account, not just the current account |
| 314 | 314 |
//We need to find the correct account first |
| 315 | 315 |
AccountViewModel account = null; |
| b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 93 | 93 |
// You can specify all the values or you can default the Build and Revision Numbers |
| 94 | 94 |
// by using the '*' as shown below: |
| 95 | 95 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 96 |
[assembly: AssemblyInformationalVersion("2013-09-09")]
|
|
| 97 |
[assembly: AssemblyVersion("0.8.30909.188")]
|
|
| 96 |
[assembly: AssemblyInformationalVersion("2013-12-18")]
|
|
| 97 |
[assembly: AssemblyVersion("0.8.31218.201")]
|
|
| b/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs | ||
|---|---|---|
| 1 | 1 |
//------------------------------------------------------------------------------ |
| 2 | 2 |
// <auto-generated> |
| 3 | 3 |
// This code was generated by a tool. |
| 4 |
// Runtime Version:4.0.30319.18033
|
|
| 4 |
// Runtime Version:4.0.30319.34003
|
|
| 5 | 5 |
// |
| 6 | 6 |
// Changes to this file may cause incorrect behavior and will be lost if |
| 7 | 7 |
// the code is regenerated. |
| b/trunk/Pithos.Installer/Output/rnotes.0.8.31211.html | ||
|---|---|---|
| 1 |
<html> |
|
| 2 |
<body> |
|
| 3 |
<h2>Pithos MS Client v. 0.8.31211</h2> |
|
| 4 |
Release Date: December 11, 2013, 12:05 |
|
| 5 |
Includes: |
|
| 6 |
<br/> |
|
| 7 |
<ul> |
|
| 8 |
<li>Minor issue on Build 199: Debug Build</li> |
|
| 9 |
<li>Fix for Auth Issue on expired token</li> |
|
| 10 |
<li>Minor Update to Browser call on web login</li> |
|
| 11 |
<li>Minor issues in the labelling of edit boxes</li> |
|
| 12 |
<li>Fixed issue with memory leak on object reuse</li> |
|
| 13 |
<li>Changed settings for storing multiple Pithos+ Providers (next version will allow them to be updated on the fly)</li> |
|
| 14 |
<li>Changed port authorization registration to be compatible with various AV</li> |
|
| 15 |
<li>Fixed issue when other clients increase the accuracy of timestamps</li> |
|
| 16 |
<li>Small delay added during initial sync of large file bases to be able to catch redundant actions, this will need fine tunning</li> |
|
| 17 |
<li>New library written for detection of pre-reqs, will be used in the next versions</li> |
|
| 18 |
<li>Re wrote initial account wizard to support more types of layers for the wizard redesign</li> |
|
| 19 |
<li>Fix on plugin registration of app startup</li> |
|
| 20 |
</ul> |
|
| 21 |
</body> |
|
| 22 |
</html> |
|
| b/trunk/Pithos.Installer/rnotes.0.8.31017.html | ||
|---|---|---|
| 1 |
<html> |
|
| 2 |
<body> |
|
| 3 |
<h2>Pithos MS Client v. 0.8.31017</h2> |
|
| 4 |
Release Date: October 17, 2013, 15:54 |
|
| 5 |
Includes: |
|
| 6 |
<br/> |
|
| 7 |
<ul> |
|
| 8 |
<li>Fixed issue with W2008 x64</li> |
|
| 9 |
<li>Changed Installer to non silent mode for 3rd party libraries</li> |
|
| 10 |
<li>Minor issues in the labelling of edit boxes</li> |
|
| 11 |
<li>Updated installer to allow for external resources</li> |
|
| 12 |
<li>Issue on non uploading empty directories</li> |
|
| 13 |
<li>Small delay added to container checks after a whole tree is deleted or moved in server</li> |
|
| 14 |
<li>Changed requirement for manual token retrieval (needs update in GUI)</li> |
|
| 15 |
<li>Snappier checks on non changed containers</li> |
|
| 16 |
<li>gzip support for Containers Listing supported</li> |
|
| 17 |
</ul> |
|
| 18 |
</body> |
|
| 19 |
</html> |
|
| b/trunk/Pithos.Installer/rnotes.0.8.31211.html | ||
|---|---|---|
| 1 |
<html> |
|
| 2 |
<body> |
|
| 3 |
<h2>Pithos MS Client v. 0.8.31211</h2> |
|
| 4 |
Release Date: December 11, 2013, 12:05 |
|
| 5 |
Includes: |
|
| 6 |
<br/> |
|
| 7 |
<ul> |
|
| 8 |
<li>Minor issue on Build 199: Debug Build</li> |
|
| 9 |
<li>Fix for Auth Issue on expired token</li> |
|
| 10 |
<li>Minor Update to Browser call on web login</li> |
|
| 11 |
<li>Minor issues in the labelling of edit boxes</li> |
|
| 12 |
<li>Fixed issue with memory leak on object reuse</li> |
|
| 13 |
<li>Changed settings for storing multiple Pithos+ Providers (next version will allow them to be updated on the fly)</li> |
|
| 14 |
<li>Changed port authorization registration to be compatible with various AV</li> |
|
| 15 |
<li>Fixed issue when other clients increase the accuracy of timestamps</li> |
|
| 16 |
<li>Small delay added during initial sync of large file bases to be able to catch redundant actions, this will need fine tunning</li> |
|
| 17 |
<li>New library written for detection of pre-reqs, will be used in the next versions</li> |
|
| 18 |
<li>Re wrote initial account wizard to support more types of layers for the wizard redesign</li> |
|
| 19 |
<li>Fix on plugin registration of app startup</li> |
|
| 20 |
</ul> |
|
| 21 |
</body> |
|
| 22 |
</html> |
|
| b/trunk/Pithos.Installer/rnotes.0.8.31218.html | ||
|---|---|---|
| 1 |
<html> |
|
| 2 |
<body> |
|
| 3 |
<h2>Pithos MS Client v. 0.8.31218</h2> |
|
| 4 |
Release Date: December 18, 2013, 18:50 |
|
| 5 |
Includes: |
|
| 6 |
<br/> |
|
| 7 |
<ul> |
|
| 8 |
<li>Minor issue on verification of authentication, the client would authenticate but tried to verify the token is correct on the first available known endpoint. This has been switched to try to verify on pithos only.</li> |
|
| 9 |
</ul> |
|
| 10 |
</body> |
|
| 11 |
</html> |
|
| b/trunk/Pithos.Interfaces/PithosDateTimeConverter.cs | ||
|---|---|---|
| 106 | 106 |
return null; |
| 107 | 107 |
} |
| 108 | 108 |
|
| 109 |
var seconds = double.Parse((string)reader.Value,CultureInfo.InvariantCulture);
|
|
| 109 |
var seconds = double.Parse(reader.Value.ToString()); //CultureInfo.InvariantCulture);
|
|
| 110 | 110 |
|
| 111 | 111 |
DateTime d = _epoch.AddSeconds(seconds); |
| 112 | 112 |
|
| b/trunk/Pithos.Network/CloudFilesClient.cs | ||
|---|---|---|
| 252 | 252 |
JObject json = (JObject) JsonConvert.DeserializeObject(body); |
| 253 | 253 |
dynamic jsonD = json; |
| 254 | 254 |
|
| 255 |
objectStorageService = json["access"]["serviceCatalog"][6]["endpoints"][0]["publicURL"].ToString(); |
|
| 255 |
objectStorageService = json["access"]["serviceCatalog"][9]["endpoints"][0]["publicURL"].ToString(); |
|
| 256 |
Log.InfoFormat("[ServicePoint] {0}", json["access"]["serviceCatalog"][0]["endpoints"][0]["publicURL"].ToString());
|
|
| 257 |
Log.InfoFormat("[ServicePoint] {0}", json["access"]["serviceCatalog"][1]["endpoints"][0]["publicURL"].ToString());
|
|
| 258 |
Log.InfoFormat("[ServicePoint] {0}", json["access"]["serviceCatalog"][2]["endpoints"][0]["publicURL"].ToString());
|
|
| 259 |
Log.InfoFormat("[ServicePoint] {0}", json["access"]["serviceCatalog"][3]["endpoints"][0]["publicURL"].ToString());
|
|
| 260 |
Log.InfoFormat("[ServicePoint] {0}", json["access"]["serviceCatalog"][4]["endpoints"][0]["publicURL"].ToString());
|
|
| 261 |
Log.InfoFormat("[ServicePoint] {0}", json["access"]["serviceCatalog"][5]["endpoints"][0]["publicURL"].ToString());
|
|
| 262 |
Log.InfoFormat("[ServicePoint] {0}", json["access"]["serviceCatalog"][6]["endpoints"][0]["publicURL"].ToString());
|
|
| 263 |
Log.InfoFormat("[ServicePoint] {0}", json["access"]["serviceCatalog"][7]["endpoints"][0]["publicURL"].ToString());
|
|
| 264 |
Log.InfoFormat("[ServicePoint] {0}", json["access"]["serviceCatalog"][8]["endpoints"][0]["publicURL"].ToString());
|
|
| 265 |
Log.InfoFormat("[ServicePoint] {0}", json["access"]["serviceCatalog"][9]["endpoints"][0]["publicURL"].ToString());
|
|
| 266 |
|
|
| 256 | 267 |
if (String.IsNullOrWhiteSpace(objectStorageService)) |
| 257 | 268 |
throw new InvalidOperationException("Failed to obtain storage url");
|
| 258 | 269 |
|
| b/trunk/Pithos.Network/RestClient.cs | ||
|---|---|---|
| 494 | 494 |
{
|
| 495 | 495 |
Contract.Requires<ArgumentNullException>(source != null); |
| 496 | 496 |
Contract.Requires<ArgumentNullException>(target != null); |
| 497 |
throw new ArgumentNullException("source", "source can't be null");
|
|
| 497 |
//throw new ArgumentNullException("source", "source can't be null");
|
|
| 498 | 498 |
if (target == null) |
| 499 | 499 |
throw new ArgumentNullException("target", "target can't be null");
|
| 500 | 500 |
Contract.EndContractBlock(); |
Also available in: Unified diff