IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Files: fix names and Serializers

Browse Source
This commit is contained in:
pavelbannov 2020-07-09 12:02:44 +03:00
parent feba6bb1c0
commit 71c267939d
8 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
products/ASC.Files/Server/Configuration/FilesSettings.cs
View File

@ -25,6 +25,7 @@
using System;
using System.Text.Json.Serialization;
using ASC.Common;
using ASC.Core;
@ -38,24 +39,34 @@ namespace ASC.Web.Files.Classes
{
public bool EnableThirdpartySetting { get; set; }
[JsonPropertyName("FastDelete")]
public bool FastDeleteSetting { get; set; }
[JsonPropertyName("StoreOriginalFiles")]
public bool StoreOriginalFilesSetting { get; set; }
[JsonPropertyName("UpdateIfExist")]
public bool UpdateIfExistSetting { get; set; }
[JsonPropertyName("ConvertNotify")]
public bool ConvertNotifySetting { get; set; }
[JsonPropertyName("DefaultSortedBy")]
public SortedByType DefaultSortedBySetting { get; set; }
[JsonPropertyName("DefaultSortedAsc")]
public bool DefaultSortedAscSetting { get; set; }
[JsonPropertyName("HideConfirmConvertSave")]
public bool HideConfirmConvertSaveSetting { get; set; }
[JsonPropertyName("HideConfirmConvertOpen")]
public bool HideConfirmConvertOpenSetting { get; set; }
[JsonPropertyName("Forcesave")]
public bool ForcesaveSetting { get; set; }
[JsonPropertyName("StoreForcesave")]
public bool StoreForcesaveSetting { get; set; }
public ISettings GetDefault(IServiceProvider serviceProvider)

3
products/ASC.Files/Server/Controllers/FilesController.cs
View File

@ -30,6 +30,7 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
using ASC.Api.Core;
@ -1651,6 +1652,7 @@ namespace ASC.Api.Documents
/// <summary>
/// Operation type.
/// </summary>
[JsonPropertyName("Operation")]
public FileOperationType OperationType { get; set; }
/// <summary>
@ -1666,6 +1668,7 @@ namespace ASC.Api.Documents
/// <summary>
/// Result file of operation.
/// </summary>
[JsonPropertyName("result")]
public FileWrapper<T> File { get; set; }
/// <summary>

41
products/ASC.Files/Server/Core/Entries/EditHistory.cs
View File

@ -28,6 +28,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text.Json.Serialization;
using ASC.Common.Logging;
using ASC.Core;
@ -59,15 +60,17 @@ namespace ASC.Files.Core
DisplayUserSettingsHelper = displayUserSettingsHelper;
}
public int ID;
public string Key;
public int Version;
public int VersionGroup;
public int ID { get; set; }
public string Key { get; set; }
public int Version { get; set; }
public int VersionGroup { get; set; }
public EditHistoryAuthor ModifiedBy;
[JsonPropertyName("user")]
public EditHistoryAuthor ModifiedBy { get; set; }
[JsonPropertyName("changeshistory")]
public string ChangesString { get; set; }
public string ChangesString;
public List<EditHistoryChanges> Changes
{
get
@ -150,7 +153,7 @@ namespace ASC.Files.Core
public UserManager UserManager { get; }
public DisplayUserSettingsHelper DisplayUserSettingsHelper { get; }
public string ServerVersion;
public string ServerVersion;
}
[DebuggerDisplay("{Id} {Name}")]
@ -166,7 +169,7 @@ namespace ASC.Files.Core
DisplayUserSettingsHelper = displayUserSettingsHelper;
}
public Guid Id;
public Guid Id { get; set; }
private string _name;
@ -202,10 +205,12 @@ namespace ASC.Files.Core
TenantUtil = tenantUtil;
}
public EditHistoryAuthor Author;
[JsonPropertyName("user")]
public EditHistoryAuthor Author { get; set; }
private DateTime _date;
[JsonPropertyName("created")]
public string Date
{
get { return _date.Equals(default) ? null : _date.ToString("g"); }
@ -224,24 +229,24 @@ namespace ASC.Files.Core
[DebuggerDisplay("{Version}")]
public class EditHistoryData
{
public string ChangesUrl;
public string ChangesUrl { get; set; }
public string Key;
public string Key { get; set; }
public EditHistoryUrl Previous;
public EditHistoryUrl Previous { get; set; }
public string Token;
public string Token { get; set; }
public string Url;
public string Url { get; set; }
public int Version;
public int Version { get; set; }
}
[DebuggerDisplay("{Key} - {Url}")]
public class EditHistoryUrl
{
public string Key;
public string Key { get; set; }
public string Url;
public string Url { get; set; }
}
}

6
products/ASC.Files/Server/Core/Entries/EncryptedData.cs
View File

@ -27,10 +27,10 @@ namespace ASC.Web.Files.Core.Entries
{
public class EncryptedData
{
public string PublicKey;
public string PublicKey { get; set; }
public string FileHash;
public string FileHash { get; set; }
public string Data;
public string Data { get; set; }
}
}

4
products/ASC.Files/Server/Core/Entries/EncryptionAddress.cs
View File

@ -38,9 +38,9 @@ namespace ASC.Web.Files.Core.Entries
{
public class EncryptionAddress
{
public string Address;
public string Address { get; set; }
public string PublicKey;
public string PublicKey { get; set; }
}
public class EncryptionAddressHelper

2
products/ASC.Files/Server/Model/FileOperationWraper.cs
View File

@ -27,6 +27,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json.Serialization;
using ASC.Common;
using ASC.Files.Core;
@ -46,6 +47,7 @@ namespace ASC.Api.Documents
/// <summary>
/// </summary>
[JsonPropertyName("Operation")]
public FileOperationType OperationType { get; set; }
/// <summary>

2
products/ASC.Files/Server/Services/DocumentService/Configuration.cs
View File

@ -31,6 +31,7 @@ using System.IO;
using System.Linq;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Text.Json.Serialization;
using System.Web;
using ASC.Common;
@ -130,6 +131,7 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
[JsonPropertyName("Error")]
public string ErrorMessage { get; set; }
#endregion

13
products/ASC.Files/Server/Services/DocumentService/DocumentServiceParams.cs
View File

@ -23,11 +23,6 @@
*
*/
using System.IO;
using System.Runtime.Serialization.Json;
using System.Text;
namespace ASC.Web.Files.Services.DocumentService
{
public class DocumentServiceParams
@ -65,13 +60,7 @@ namespace ASC.Web.Files.Services.DocumentService
public static string Serialize(DocumentServiceParams docServiceParams)
{
using (var ms = new MemoryStream())
{
var serializer = new DataContractJsonSerializer(typeof (DocumentServiceParams));
serializer.WriteObject(ms, docServiceParams);
ms.Seek(0, SeekOrigin.Begin);
return Encoding.UTF8.GetString(ms.GetBuffer(), 0, (int)ms.Length);
}
return System.Text.Json.JsonSerializer.Serialize(docServiceParams);
}
}
}