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

api-defaultvalue: delete DataMembers

Browse Source
This commit is contained in:
SuhorukovAnton 2020-07-07 12:59:12 +03:00
parent a43c14dcb3
commit 88cad55450
13 changed files with 7 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1642,49 +1642,41 @@ namespace ASC.Api.Documents
/// <summary> /// <summary>
/// Result of file conversation operation. /// Result of file conversation operation.
/// </summary> /// </summary>
[DataContract(Name = "operation_result", Namespace = "")]
public class ConversationResult<T> public class ConversationResult<T>
{ {
/// <summary> /// <summary>
/// Operation Id. /// Operation Id.
/// </summary> /// </summary>
[DataMember(Name = "id")]
public string Id { get; set; } public string Id { get; set; }
/// <summary> /// <summary>
/// Operation type. /// Operation type.
/// </summary> /// </summary>
[DataMember(Name = "operation")]
public FileOperationType OperationType { get; set; } public FileOperationType OperationType { get; set; }
/// <summary> /// <summary>
/// Operation progress. /// Operation progress.
/// </summary> /// </summary>
[DataMember(Name = "progress")]
public int Progress { get; set; } public int Progress { get; set; }
/// <summary> /// <summary>
/// Source files for operation. /// Source files for operation.
/// </summary> /// </summary>
[DataMember(Name = "source")]
public string Source { get; set; } public string Source { get; set; }
/// <summary> /// <summary>
/// Result file of operation. /// Result file of operation.
/// </summary> /// </summary>
[DataMember(Name = "result")]
public FileWrapper<T> File { get; set; } public FileWrapper<T> File { get; set; }
/// <summary> /// <summary>
/// Error during conversation. /// Error during conversation.
/// </summary> /// </summary>
[DataMember(Name = "error")]
public string Error { get; set; } public string Error { get; set; }
/// <summary> /// <summary>
/// Is operation processed. /// Is operation processed.
/// </summary> /// </summary>
[DataMember(Name = "processed")]
public string Processed { get; set; } public string Processed { get; set; }
} }
} }

5
products/ASC.Files/Server/Core/Entries/AuthData.cs
View File

@ -29,20 +29,15 @@ using System.Runtime.Serialization;
namespace ASC.Files.Core namespace ASC.Files.Core
{ {
[DataContract(Name = "AuthData", Namespace = "")]
[DebuggerDisplay("{Login} {Password} {Token} {Url}")] [DebuggerDisplay("{Login} {Password} {Token} {Url}")]
public class AuthData public class AuthData
{ {
[DataMember(Name = "login")]
public string Login { get; set; } public string Login { get; set; }
[DataMember(Name = "password")]
public string Password { get; set; } public string Password { get; set; }
[DataMember(Name = "token")]
public string Token { get; set; } public string Token { get; set; }
[DataMember(Name = "url")]
public string Url { get; set; } public string Url { get; set; }
public AuthData(string url = null, string login = null, string password = null, string token = null) public AuthData(string url = null, string login = null, string password = null, string token = null)

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

@ -37,13 +37,10 @@ using ASC.Web.Studio.Core;
namespace ASC.Web.Files.Core.Entries namespace ASC.Web.Files.Core.Entries
{ {
[DataContract(Name = "account", Namespace = "")]
public class EncryptionAddress public class EncryptionAddress
{ {
[DataMember(Name = "address")]
public string Address; public string Address;
[DataMember(Name = "publicKey")]
public string PublicKey; public string PublicKey;
} }

1
products/ASC.Files/Server/Core/Entries/File.cs
View File

@ -85,7 +85,6 @@ namespace ASC.Files.Core
set { base.Title = value; } set { base.Title = value; }
} }
[DataMember(Name = "title", IsRequired = true)]
public override string Title public override string Title
{ {
get get

28
products/ASC.Files/Server/Core/Entries/Folder.cs
View File

@ -32,25 +32,17 @@ using ASC.Web.Files.Classes;
namespace ASC.Files.Core namespace ASC.Files.Core
{ {
[DataContract(Namespace = "")]
public enum FolderType public enum FolderType
{ {
[EnumMember] DEFAULT = 0, DEFAULT = 0,
COMMON = 1,
[EnumMember] COMMON = 1, BUNCH = 2,
TRASH = 3,
[EnumMember] BUNCH = 2, USER = 5,
SHARE = 6,
[EnumMember] TRASH = 3, Projects = 8
[EnumMember] USER = 5,
[EnumMember] SHARE = 6,
[EnumMember] Projects = 8
} }
[DataContract(Name = "folder", Namespace = "")]
[DebuggerDisplay("{Title} ({ID})")] [DebuggerDisplay("{Title} ({ID})")]
public class Folder<T> : FileEntry<T> public class Folder<T> : FileEntry<T>
{ {
@ -58,19 +50,14 @@ namespace ASC.Files.Core
public T ParentFolderID { get; set; } public T ParentFolderID { get; set; }
[DataMember(Name = "total_files")]
public int TotalFiles { get; set; } public int TotalFiles { get; set; }
[DataMember(Name = "total_sub_folder")]
public int TotalSubFolders { get; set; } public int TotalSubFolders { get; set; }
[DataMember(Name = "shareable", EmitDefaultValue = false)]
public bool Shareable { get; set; } public bool Shareable { get; set; }
[DataMember(Name = "isnew")]
public int NewForMe { get; set; } public int NewForMe { get; set; }
[DataMember(Name = "folder_url", EmitDefaultValue = false)]
public string FolderUrl { get; set; } public string FolderUrl { get; set; }
public override bool IsNew public override bool IsNew
@ -81,7 +68,6 @@ namespace ASC.Files.Core
private T _folderIdDisplay; private T _folderIdDisplay;
[DataMember(Name = "folder_id")]
public override T FolderIdDisplay public override T FolderIdDisplay
{ {
get get

14
products/ASC.Files/Server/Model/FileEntryWrapper.cs
View File

@ -37,39 +37,32 @@ namespace ASC.Api.Documents
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataContract(Namespace = "")]
public abstract class FileEntryWrapper public abstract class FileEntryWrapper
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(IsRequired = true)]
public string Title { get; set; } public string Title { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember]
public FileShare Access { get; set; } public FileShare Access { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember]
public bool Shared { get; set; } public bool Shared { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Order = 50)]
public ApiDateTime Created { get; set; } public ApiDateTime Created { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Order = 51, EmitDefaultValue = false)]
public EmployeeWraper CreatedBy { get; set; } public EmployeeWraper CreatedBy { get; set; }
private ApiDateTime _updated; private ApiDateTime _updated;
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Order = 52, EmitDefaultValue = false)]
public ApiDateTime Updated public ApiDateTime Updated
{ {
get get
@ -81,27 +74,22 @@ namespace ASC.Api.Documents
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Order = 41, EmitDefaultValue = false)]
public FolderType RootFolderType { get; set; } public FolderType RootFolderType { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Order = 41, EmitDefaultValue = false)]
public EmployeeWraper UpdatedBy { get; set; } public EmployeeWraper UpdatedBy { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Order = 55, EmitDefaultValue = false)]
public bool? ProviderItem { get; set; } public bool? ProviderItem { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Order = 56, EmitDefaultValue = false)]
public string ProviderKey { get; set; } public string ProviderKey { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Order = 57, EmitDefaultValue = false)]
public int? ProviderId { get; set; } public int? ProviderId { get; set; }
@ -135,12 +123,10 @@ namespace ASC.Api.Documents
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataContract(Namespace = "")]
public abstract class FileEntryWrapper<T> : FileEntryWrapper public abstract class FileEntryWrapper<T> : FileEntryWrapper
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember]
public T Id { get; set; } public T Id { get; set; }

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

@ -39,52 +39,42 @@ namespace ASC.Api.Documents
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataContract(Name = "operation_result", Namespace = "")]
public class FileOperationWraper public class FileOperationWraper
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Name = "id", IsRequired = false)]
public string Id { get; set; } public string Id { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Name = "operation", IsRequired = false)]
public FileOperationType OperationType { get; set; } public FileOperationType OperationType { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Name = "progress", IsRequired = false)]
public int Progress { get; set; } public int Progress { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Name = "error", IsRequired = false)]
public string Error { get; set; } public string Error { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Name = "processed", IsRequired = false)]
public string Processed { get; set; } public string Processed { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Name = "finished", IsRequired = false)]
public bool Finished { get; set; } public bool Finished { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Name = "url", IsRequired = false)]
public string Url { get; set; } public string Url { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Name = "files", IsRequired = true, EmitDefaultValue = true)]
public List<FileEntryWrapper> Files { get; set; } public List<FileEntryWrapper> Files { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(Name = "folders", IsRequired = true, EmitDefaultValue = true)]
public List<FileEntryWrapper> Folders { get; set; } public List<FileEntryWrapper> Folders { get; set; }
/// <summary> /// <summary>

13
products/ASC.Files/Server/Model/FileWrapper.cs
View File

@ -46,69 +46,56 @@ namespace ASC.Api.Documents
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataContract(Name = "file", Namespace = "")]
public class FileWrapper<T> : FileEntryWrapper<T> public class FileWrapper<T> : FileEntryWrapper<T>
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = false, IsRequired = false)]
public T FolderId { get; set; } public T FolderId { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = true, IsRequired = false)]
public int Version { get; set; } public int Version { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = true, IsRequired = false)]
public int VersionGroup { get; set; } public int VersionGroup { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = false, IsRequired = true)]
public string ContentLength { get; set; } public string ContentLength { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = false, IsRequired = true)]
public long? PureContentLength { get; set; } public long? PureContentLength { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = true, IsRequired = false)]
public FileStatus FileStatus { get; set; } public FileStatus FileStatus { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = false, IsRequired = false)]
public string ViewUrl { get; set; } public string ViewUrl { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = false, IsRequired = false)]
public string WebUrl { get; set; } public string WebUrl { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = false, IsRequired = false)]
public FileType FileType { get; set; } public FileType FileType { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = false, IsRequired = false)]
public string FileExst { get; set; } public string FileExst { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = true, IsRequired = false)]
public string Comment { get; set; } public string Comment { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = false)]
public bool? Encrypted { get; set; } public bool? Encrypted { get; set; }
/// <summary> /// <summary>

8
products/ASC.Files/Server/Model/FolderContentWrapper.cs
View File

@ -39,42 +39,34 @@ namespace ASC.Api.Documents
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataContract(Name = "content", Namespace = "")]
public class FolderContentWrapper<T> public class FolderContentWrapper<T>
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(IsRequired = false, EmitDefaultValue = false)]
public List<FileWrapper<T>> Files { get; set; } public List<FileWrapper<T>> Files { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(IsRequired = false, EmitDefaultValue = false)]
public List<FileEntryWrapper> Folders { get; set; } public List<FileEntryWrapper> Folders { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(IsRequired = false, EmitDefaultValue = true)]
public FolderWrapper<T> Current { get; set; } public FolderWrapper<T> Current { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(IsRequired = false, EmitDefaultValue = true)]
public object PathParts { get; set; } public object PathParts { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(IsRequired = false, EmitDefaultValue = true)]
public int StartIndex { get; set; } public int StartIndex { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(IsRequired = false, EmitDefaultValue = true)]
public int Count { get; set; } public int Count { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(IsRequired = false, EmitDefaultValue = true)]
public int Total { get; set; } public int Total { get; set; }
public int New { get; set; } public int New { get; set; }

5
products/ASC.Files/Server/Model/FolderWrapper.cs
View File

@ -41,27 +41,22 @@ namespace ASC.Api.Documents
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataContract(Name = "folder", Namespace = "")]
public class FolderWrapper<T> : FileEntryWrapper<T> public class FolderWrapper<T> : FileEntryWrapper<T>
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(IsRequired = true, EmitDefaultValue = true)]
public T ParentId { get; set; } public T ParentId { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = true, IsRequired = false)]
public int FilesCount { get; set; } public int FilesCount { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = true, IsRequired = false)]
public int FoldersCount { get; set; } public int FoldersCount { get; set; }
/// <summary> /// <summary>
/// </summary> /// </summary>
[DataMember(EmitDefaultValue = false, IsRequired = false)]
public bool? IsShareable { get; set; } public bool? IsShareable { get; set; }
public int New { get; set; } public int New { get; set; }

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

@ -68,7 +68,6 @@ namespace ASC.Web.Files.Services.DocumentService
External, External,
} }
[DataContract(Name = "editorConfig", Namespace = "")]
public class Configuration<T> public class Configuration<T>
{ {
public static readonly Dictionary<FileType, string> DocType = new Dictionary<FileType, string> public static readonly Dictionary<FileType, string> DocType = new Dictionary<FileType, string>
@ -99,10 +98,8 @@ namespace ASC.Web.Files.Services.DocumentService
#region Property #region Property
[DataMember(Name = "document")]
public DocumentConfig<T> Document { get; set; } public DocumentConfig<T> Document { get; set; }
[DataMember(Name = "documentType")]
public string DocumentType public string DocumentType
{ {
set { } set { }
@ -113,13 +110,10 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataMember(Name = "editorConfig")]
public EditorConfiguration<T> EditorConfig { get; set; } public EditorConfiguration<T> EditorConfig { get; set; }
[DataMember(Name = "token", EmitDefaultValue = false)]
public string Token { get; set; } public string Token { get; set; }
[DataMember(Name = "type")]
public string Type public string Type
{ {
set { EditorType = (EditorType)Enum.Parse(typeof(EditorType), value, true); } set { EditorType = (EditorType)Enum.Parse(typeof(EditorType), value, true); }
@ -137,7 +131,6 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataMember(Name = "error", EmitDefaultValue = false)]
public string ErrorMessage { get; set; } public string ErrorMessage { get; set; }
#endregion #endregion
@ -153,7 +146,6 @@ namespace ASC.Web.Files.Services.DocumentService
} }
#region Nested Classes #region Nested Classes
[DataContract(Name = "document", Namespace = "")]
public class DocumentConfig<T> public class DocumentConfig<T>
{ {
public string SharedLinkKey; public string SharedLinkKey;
@ -171,34 +163,28 @@ namespace ASC.Web.Files.Services.DocumentService
private string _title = null; private string _title = null;
[DataMember(Name = "fileType")]
public string FileType public string FileType
{ {
set { } set { }
get { return Info.File.ConvertedExtension.Trim('.'); } get { return Info.File.ConvertedExtension.Trim('.'); }
} }
[DataMember(Name = "info")]
public InfoConfig<T> Info { get; set; } public InfoConfig<T> Info { get; set; }
[DataMember(Name = "key")]
public string Key public string Key
{ {
set { _key = value; } set { _key = value; }
get { return DocumentServiceConnector.GenerateRevisionId(_key); } get { return DocumentServiceConnector.GenerateRevisionId(_key); }
} }
[DataMember(Name = "permissions")]
public PermissionsConfig Permissions { get; set; } public PermissionsConfig Permissions { get; set; }
[DataMember(Name = "title")]
public string Title public string Title
{ {
set { _title = value; } set { _title = value; }
get { return _title ?? Info.File.Title; } get { return _title ?? Info.File.Title; }
} }
[DataMember(Name = "url")]
public string Url public string Url
{ {
set { _fileUri = DocumentServiceConnector.ReplaceCommunityAdress(value); } set { _fileUri = DocumentServiceConnector.ReplaceCommunityAdress(value); }
@ -216,7 +202,6 @@ namespace ASC.Web.Files.Services.DocumentService
private PathProvider PathProvider { get; } private PathProvider PathProvider { get; }
} }
[DataContract(Name = "info", Namespace = "")]
public class InfoConfig<T> public class InfoConfig<T>
{ {
public File<T> File; public File<T> File;
@ -231,7 +216,6 @@ namespace ASC.Web.Files.Services.DocumentService
} }
[Obsolete("Use owner (since v5.4)")] [Obsolete("Use owner (since v5.4)")]
[DataMember(Name = "author")]
public string Author public string Author
{ {
set { } set { }
@ -239,14 +223,12 @@ namespace ASC.Web.Files.Services.DocumentService
} }
[Obsolete("Use uploaded (since v5.4)")] [Obsolete("Use uploaded (since v5.4)")]
[DataMember(Name = "created")]
public string Created public string Created
{ {
set { } set { }
get { return File.CreateOnString; } get { return File.CreateOnString; }
} }
[DataMember(Name = "folder", EmitDefaultValue = false)]
public string Folder public string Folder
{ {
set { } set { }
@ -265,21 +247,18 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataMember(Name = "owner")]
public string Owner public string Owner
{ {
set { } set { }
get { return File.CreateByString; } get { return File.CreateByString; }
} }
[DataMember(Name = "uploaded")]
public string Uploaded public string Uploaded
{ {
set { } set { }
get { return File.CreateOnString; } get { return File.CreateOnString; }
} }
[DataMember(Name = "sharingSettings", EmitDefaultValue = false)]
public ItemList<AceShortWrapper> SharingSettings public ItemList<AceShortWrapper> SharingSettings
{ {
set { } set { }
@ -304,36 +283,26 @@ namespace ASC.Web.Files.Services.DocumentService
private FileSharing FileSharing { get; } private FileSharing FileSharing { get; }
} }
[DataContract(Name = "permissions", Namespace = "")]
public class PermissionsConfig public class PermissionsConfig
{ {
[Obsolete("Since DS v5.5")] [Obsolete("Since DS v5.5")]
[DataMember(Name = "changeHistory")]
public bool ChangeHistory { get; set; } = false; public bool ChangeHistory { get; set; } = false;
[DataMember(Name = "comment")]
public bool Comment { get; set; } = true; public bool Comment { get; set; } = true;
[DataMember(Name = "download")]
public bool Download { get; set; } = true; public bool Download { get; set; } = true;
[DataMember(Name = "edit")]
public bool Edit { get; set; } = true; public bool Edit { get; set; } = true;
[DataMember(Name = "fillForms")]
public bool FillForms { get; set; } = true; public bool FillForms { get; set; } = true;
[DataMember(Name = "print")]
public bool Print { get; set; } = true; public bool Print { get; set; } = true;
[DataMember(Name = "rename")]
public bool Rename { get; set; } = false; public bool Rename { get; set; } = false;
[DataMember(Name = "review")]
public bool Review { get; set; } = true; public bool Review { get; set; } = true;
} }
[DataContract(Name = "editorConfig", Namespace = "")]
public class EditorConfiguration<T> public class EditorConfiguration<T>
{ {
public EditorConfiguration( public EditorConfiguration(
@ -381,7 +350,6 @@ namespace ASC.Web.Files.Services.DocumentService
private readonly UserInfo _userInfo; private readonly UserInfo _userInfo;
private EmbeddedConfig _embeddedConfig; private EmbeddedConfig _embeddedConfig;
[DataMember(Name = "actionLink", EmitDefaultValue = false)]
public ActionLinkConfig ActionLink { get; set; } public ActionLinkConfig ActionLink { get; set; }
public string ActionLinkString public string ActionLinkString
@ -404,10 +372,8 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataMember(Name = "callbackUrl", EmitDefaultValue = false)]
public string CallbackUrl { get; set; } public string CallbackUrl { get; set; }
[DataMember(Name = "createUrl", EmitDefaultValue = false)]
public string CreateUrl public string CreateUrl
{ {
set { } set { }
@ -420,23 +386,18 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataMember(Name = "plugins", EmitDefaultValue = false)]
public PluginsConfig Plugins { get; set; } public PluginsConfig Plugins { get; set; }
[DataMember(Name = "customization", EmitDefaultValue = false)]
public CustomizationConfig<T> Customization { get; set; } public CustomizationConfig<T> Customization { get; set; }
[DataMember(Name = "embedded", EmitDefaultValue = false)]
public EmbeddedConfig Embedded public EmbeddedConfig Embedded
{ {
set { _embeddedConfig = value; } set { _embeddedConfig = value; }
get { return _configuration.Document.Info.Type == EditorType.Embedded ? _embeddedConfig : null; } get { return _configuration.Document.Info.Type == EditorType.Embedded ? _embeddedConfig : null; }
} }
[DataMember(Name = "fileChoiceUrl", EmitDefaultValue = false)]
public string FileChoiceUrl { get; set; } public string FileChoiceUrl { get; set; }
[DataMember(Name = "lang")]
public string Lang public string Lang
{ {
set { } set { }
@ -444,10 +405,8 @@ namespace ASC.Web.Files.Services.DocumentService
} }
//todo: remove old feild after release 5.2+ //todo: remove old feild after release 5.2+
[DataMember(Name = "mergeFolderUrl", EmitDefaultValue = false)]
public string MergeFolderUrl { get; set; } public string MergeFolderUrl { get; set; }
[DataMember(Name = "mode")]
public string Mode public string Mode
{ {
set { } set { }
@ -459,13 +418,10 @@ namespace ASC.Web.Files.Services.DocumentService
private FilesLinkUtility FilesLinkUtility { get; } private FilesLinkUtility FilesLinkUtility { get; }
private BaseCommonLinkUtility BaseCommonLinkUtility { get; } private BaseCommonLinkUtility BaseCommonLinkUtility { get; }
[DataMember(Name = "saveAsUrl", EmitDefaultValue = false)]
public string SaveAsUrl { get; set; } public string SaveAsUrl { get; set; }
[DataMember(Name = "sharingSettingsUrl", EmitDefaultValue = false)]
public string SharingSettingsUrl { get; set; } public string SharingSettingsUrl { get; set; }
[DataMember(Name = "user")]
public UserConfig User { get; set; } public UserConfig User { get; set; }
private string GetCreateUrl(FileType fileType) private string GetCreateUrl(FileType fileType)
@ -497,20 +453,15 @@ namespace ASC.Web.Files.Services.DocumentService
#endregion #endregion
[DataContract(Name = "actionLink", Namespace = "")]
public class ActionLinkConfig public class ActionLinkConfig
{ {
[DataMember(Name = "action", EmitDefaultValue = false)]
public ActionConfig Action { get; set; } public ActionConfig Action { get; set; }
[DataContract(Name = "action", Namespace = "")]
public class ActionConfig public class ActionConfig
{ {
[DataMember(Name = "type", EmitDefaultValue = false)]
public string Type { get; set; } public string Type { get; set; }
[DataMember(Name = "data", EmitDefaultValue = false)]
public string Data { get; set; } public string Data { get; set; }
} }
@ -527,26 +478,22 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataContract(Name = "embedded", Namespace = "")]
public class EmbeddedConfig public class EmbeddedConfig
{ {
public string ShareLinkParam { get; set; } public string ShareLinkParam { get; set; }
[DataMember(Name = "embedUrl", EmitDefaultValue = false)]
public string EmbedUrl public string EmbedUrl
{ {
set { } set { }
get { return BaseCommonLinkUtility.GetFullAbsolutePath(FilesLinkUtility.FilesBaseAbsolutePath + FilesLinkUtility.EditorPage + "?" + FilesLinkUtility.Action + "=embedded" + ShareLinkParam); } get { return BaseCommonLinkUtility.GetFullAbsolutePath(FilesLinkUtility.FilesBaseAbsolutePath + FilesLinkUtility.EditorPage + "?" + FilesLinkUtility.Action + "=embedded" + ShareLinkParam); }
} }
[DataMember(Name = "saveUrl", EmitDefaultValue = false)]
public string SaveUrl public string SaveUrl
{ {
set { } set { }
get { return BaseCommonLinkUtility.GetFullAbsolutePath(FilesLinkUtility.FileHandlerPath + "?" + FilesLinkUtility.Action + "=download" + ShareLinkParam); } get { return BaseCommonLinkUtility.GetFullAbsolutePath(FilesLinkUtility.FileHandlerPath + "?" + FilesLinkUtility.Action + "=download" + ShareLinkParam); }
} }
[DataMember(Name = "shareUrl", EmitDefaultValue = false)]
public string ShareUrl public string ShareUrl
{ {
set { } set { }
@ -556,7 +503,6 @@ namespace ASC.Web.Files.Services.DocumentService
public BaseCommonLinkUtility BaseCommonLinkUtility { get; } public BaseCommonLinkUtility BaseCommonLinkUtility { get; }
public FilesLinkUtility FilesLinkUtility { get; } public FilesLinkUtility FilesLinkUtility { get; }
[DataMember(Name = "toolbarDocked")]
public string ToolbarDocked { get => "top"; } public string ToolbarDocked { get => "top"; }
public EmbeddedConfig(BaseCommonLinkUtility baseCommonLinkUtility, FilesLinkUtility filesLinkUtility) public EmbeddedConfig(BaseCommonLinkUtility baseCommonLinkUtility, FilesLinkUtility filesLinkUtility)
@ -566,10 +512,8 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataContract(Name = "plugins", Namespace = "")]
public class PluginsConfig public class PluginsConfig
{ {
[DataMember(Name = "pluginsData", EmitDefaultValue = false)]
public string[] PluginsData public string[] PluginsData
{ {
set { } set { }
@ -605,7 +549,6 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataContract(Name = "customization", Namespace = "")]
public class CustomizationConfig<T> public class CustomizationConfig<T>
{ {
public CustomizationConfig( public CustomizationConfig(
@ -651,17 +594,14 @@ namespace ASC.Web.Files.Services.DocumentService
public bool IsRetina = false; public bool IsRetina = false;
[DataMember(Name = "about")]
public bool About public bool About
{ {
set { } set { }
get { return !CoreBaseSettings.Standalone && !CoreBaseSettings.CustomMode; } get { return !CoreBaseSettings.Standalone && !CoreBaseSettings.CustomMode; }
} }
[DataMember(Name = "customer")]
public CustomerConfig<T> Customer { get; set; } public CustomerConfig<T> Customer { get; set; }
[DataMember(Name = "feedback", EmitDefaultValue = false)]
public FeedbackConfig Feedback public FeedbackConfig Feedback
{ {
set { } set { }
@ -691,7 +631,6 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataMember(Name = "goback", EmitDefaultValue = false)]
public GobackConfig Goback public GobackConfig Goback
{ {
set { } set { }
@ -738,7 +677,6 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataMember(Name = "loaderLogo", EmitDefaultValue = false)]
public string LoaderLogo public string LoaderLogo
{ {
set { } set { }
@ -750,7 +688,6 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataMember(Name = "loaderName", EmitDefaultValue = false)]
public string LoaderName public string LoaderName
{ {
set { } set { }
@ -762,10 +699,8 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataMember(Name = "logo")]
public LogoConfig<T> Logo { get; set; } public LogoConfig<T> Logo { get; set; }
[DataMember(Name = "reviewDisplay", EmitDefaultValue = false)]
public string ReviewDisplay public string ReviewDisplay
{ {
set { } set { }
@ -785,7 +720,6 @@ namespace ASC.Web.Files.Services.DocumentService
private BaseCommonLinkUtility BaseCommonLinkUtility { get; } private BaseCommonLinkUtility BaseCommonLinkUtility { get; }
} }
[DataContract(Name = "customer", Namespace = "")]
public class CustomerConfig<T> public class CustomerConfig<T>
{ {
public CustomerConfig( public CustomerConfig(
@ -805,14 +739,12 @@ namespace ASC.Web.Files.Services.DocumentService
_configuration = configuration; _configuration = configuration;
} }
[DataMember(Name = "logo")]
public string Logo public string Logo
{ {
set { } set { }
get { return BaseCommonLinkUtility.GetFullAbsolutePath(TenantLogoHelper.GetLogo(WhiteLabelLogoTypeEnum.Dark, !_configuration.EditorConfig.Customization.IsRetina)); } get { return BaseCommonLinkUtility.GetFullAbsolutePath(TenantLogoHelper.GetLogo(WhiteLabelLogoTypeEnum.Dark, !_configuration.EditorConfig.Customization.IsRetina)); }
} }
[DataMember(Name = "name")]
public string Name public string Name
{ {
set { } set { }
@ -828,24 +760,18 @@ namespace ASC.Web.Files.Services.DocumentService
private TenantLogoHelper TenantLogoHelper { get; } private TenantLogoHelper TenantLogoHelper { get; }
} }
[DataContract(Name = "feedback", Namespace = "")]
public class FeedbackConfig public class FeedbackConfig
{ {
[DataMember(Name = "url")]
public string Url { get; set; } public string Url { get; set; }
[DataMember(Name = "visible")]
public bool Visible { get => true; } public bool Visible { get => true; }
} }
[DataContract(Name = "goback", Namespace = "")]
public class GobackConfig public class GobackConfig
{ {
[DataMember(Name = "url", EmitDefaultValue = false)]
public string Url { get; set; } public string Url { get; set; }
} }
[DataContract(Name = "logo", Namespace = "")]
public class LogoConfig<T> public class LogoConfig<T>
{ {
public LogoConfig( public LogoConfig(
@ -864,7 +790,6 @@ namespace ASC.Web.Files.Services.DocumentService
_configuration = configuration; _configuration = configuration;
} }
[DataMember(Name = "image")]
public string Image public string Image
{ {
set { } set { }
@ -877,7 +802,6 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataMember(Name = "imageEmbedded", EmitDefaultValue = false)]
public string ImageEmbedded public string ImageEmbedded
{ {
set { } set { }
@ -890,7 +814,6 @@ namespace ASC.Web.Files.Services.DocumentService
} }
} }
[DataMember(Name = "url")]
public string Url public string Url
{ {
set { } set { }
@ -902,13 +825,10 @@ namespace ASC.Web.Files.Services.DocumentService
private SettingsManager SettingsManager { get; } private SettingsManager SettingsManager { get; }
} }
[DataContract(Name = "user", Namespace = "")]
public class UserConfig public class UserConfig
{ {
[DataMember(Name = "id", EmitDefaultValue = false)]
public string Id { get; set; } public string Id { get; set; }
[DataMember(Name = "name", EmitDefaultValue = false)]
public string Name { get; set; } public string Name { get; set; }
} }

17
products/ASC.Files/Server/Services/WCFService/Wrappers/AceWrapper.cs
View File

@ -33,57 +33,40 @@ using ASC.Files.Resources;
namespace ASC.Web.Files.Services.WCFService namespace ASC.Web.Files.Services.WCFService
{ {
[DataContract(Name = "ace_collection", Namespace = "")]
public class AceCollection public class AceCollection
{ {
[DataMember(Name = "entries", Order = 1)]
public ItemList<string> Entries { get; set; } public ItemList<string> Entries { get; set; }
[DataMember(Name = "aces", Order = 2)]
public ItemList<AceWrapper> Aces { get; set; } public ItemList<AceWrapper> Aces { get; set; }
[DataMember(Name = "message", Order = 3, IsRequired = false)]
public string Message { get; set; } public string Message { get; set; }
} }
[DataContract(Name = "ace_wrapper", Namespace = "")]
public class AceWrapper public class AceWrapper
{ {
[DataMember(Name = "id", Order = 1)]
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
[DataMember(Name = "title", Order = 2, EmitDefaultValue = false)]
public string SubjectName { get; set; } public string SubjectName { get; set; }
[DataMember(Name = "link", Order = 3, EmitDefaultValue = false)]
public string Link { get; set; } public string Link { get; set; }
[DataMember(Name = "is_group", Order = 4)]
public bool SubjectGroup { get; set; } public bool SubjectGroup { get; set; }
[DataMember(Name = "owner", Order = 5)]
public bool Owner { get; set; } public bool Owner { get; set; }
[DataMember(Name = "ace_status", Order = 6)]
public FileShare Share { get; set; } public FileShare Share { get; set; }
[DataMember(Name = "locked", Order = 7)]
public bool LockedRights { get; set; } public bool LockedRights { get; set; }
[DataMember(Name = "disable_remove", Order = 8)]
public bool DisableRemove { get; set; } public bool DisableRemove { get; set; }
} }
[DataContract(Name = "sharingSettings", Namespace = "")]
public class AceShortWrapper public class AceShortWrapper
{ {
[DataMember(Name = "user")]
public string User { get; set; } public string User { get; set; }
[DataMember(Name = "permissions")]
public string Permissions { get; set; } public string Permissions { get; set; }
[DataMember(Name = "isLink", EmitDefaultValue = false, IsRequired = false)]
public bool? IsLink { get; set; } public bool? IsLink { get; set; }
public AceShortWrapper(AceWrapper aceWrapper) public AceShortWrapper(AceWrapper aceWrapper)

6
products/ASC.Files/Server/Services/WCFService/Wrappers/ThirdPartyParams.cs
View File

@ -29,22 +29,16 @@ using ASC.Files.Core;
namespace ASC.Web.Files.Services.WCFService namespace ASC.Web.Files.Services.WCFService
{ {
[DataContract(Name = "third_party", Namespace = "")]
public class ThirdPartyParams public class ThirdPartyParams
{ {
[DataMember(Name = "auth_data", EmitDefaultValue = false)]
public AuthData AuthData { get; set; } public AuthData AuthData { get; set; }
[DataMember(Name = "corporate")]
public bool Corporate { get; set; } public bool Corporate { get; set; }
[DataMember(Name = "customer_title")]
public string CustomerTitle { get; set; } public string CustomerTitle { get; set; }
[DataMember(Name = "provider_id")]
public string ProviderId { get; set; } public string ProviderId { get; set; }
[DataMember(Name = "provider_key")]
public string ProviderKey { get; set; } public string ProviderKey { get; set; }
} }
} }