From 88cad55450782f3633ca7f7c0c02390940868f62 Mon Sep 17 00:00:00 2001
From: SuhorukovAnton <62381554+SuhorukovAnton@users.noreply.github.com>
Date: Tue, 7 Jul 2020 12:59:12 +0300
Subject: [PATCH] api-defaultvalue: delete DataMembers
---
.../Server/Controllers/FilesController.cs | 8 --
.../ASC.Files/Server/Core/Entries/AuthData.cs | 5 --
.../Server/Core/Entries/EncryptionAddress.cs | 3 -
.../ASC.Files/Server/Core/Entries/File.cs | 1 -
.../ASC.Files/Server/Core/Entries/Folder.cs | 28 ++-----
.../Server/Model/FileEntryWrapper.cs | 14 ----
.../Server/Model/FileOperationWraper.cs | 10 ---
.../ASC.Files/Server/Model/FileWrapper.cs | 13 ---
.../Server/Model/FolderContentWrapper.cs | 8 --
.../ASC.Files/Server/Model/FolderWrapper.cs | 5 --
.../Services/DocumentService/Configuration.cs | 80 -------------------
.../WCFService/Wrappers/AceWrapper.cs | 17 ----
.../WCFService/Wrappers/ThirdPartyParams.cs | 6 --
13 files changed, 7 insertions(+), 191 deletions(-)
diff --git a/products/ASC.Files/Server/Controllers/FilesController.cs b/products/ASC.Files/Server/Controllers/FilesController.cs
index becd597b32..2cbbf25d2c 100644
--- a/products/ASC.Files/Server/Controllers/FilesController.cs
+++ b/products/ASC.Files/Server/Controllers/FilesController.cs
@@ -1642,49 +1642,41 @@ namespace ASC.Api.Documents
///
/// Result of file conversation operation.
///
- [DataContract(Name = "operation_result", Namespace = "")]
public class ConversationResult
{
///
/// Operation Id.
///
- [DataMember(Name = "id")]
public string Id { get; set; }
///
/// Operation type.
///
- [DataMember(Name = "operation")]
public FileOperationType OperationType { get; set; }
///
/// Operation progress.
///
- [DataMember(Name = "progress")]
public int Progress { get; set; }
///
/// Source files for operation.
///
- [DataMember(Name = "source")]
public string Source { get; set; }
///
/// Result file of operation.
///
- [DataMember(Name = "result")]
public FileWrapper File { get; set; }
///
/// Error during conversation.
///
- [DataMember(Name = "error")]
public string Error { get; set; }
///
/// Is operation processed.
///
- [DataMember(Name = "processed")]
public string Processed { get; set; }
}
}
diff --git a/products/ASC.Files/Server/Core/Entries/AuthData.cs b/products/ASC.Files/Server/Core/Entries/AuthData.cs
index e3e335c2ae..e7b67455b5 100644
--- a/products/ASC.Files/Server/Core/Entries/AuthData.cs
+++ b/products/ASC.Files/Server/Core/Entries/AuthData.cs
@@ -29,20 +29,15 @@ using System.Runtime.Serialization;
namespace ASC.Files.Core
{
- [DataContract(Name = "AuthData", Namespace = "")]
[DebuggerDisplay("{Login} {Password} {Token} {Url}")]
public class AuthData
{
- [DataMember(Name = "login")]
public string Login { get; set; }
- [DataMember(Name = "password")]
public string Password { get; set; }
- [DataMember(Name = "token")]
public string Token { get; set; }
- [DataMember(Name = "url")]
public string Url { get; set; }
public AuthData(string url = null, string login = null, string password = null, string token = null)
diff --git a/products/ASC.Files/Server/Core/Entries/EncryptionAddress.cs b/products/ASC.Files/Server/Core/Entries/EncryptionAddress.cs
index 94d205d9d9..ae1e73f159 100644
--- a/products/ASC.Files/Server/Core/Entries/EncryptionAddress.cs
+++ b/products/ASC.Files/Server/Core/Entries/EncryptionAddress.cs
@@ -37,13 +37,10 @@ using ASC.Web.Studio.Core;
namespace ASC.Web.Files.Core.Entries
{
- [DataContract(Name = "account", Namespace = "")]
public class EncryptionAddress
{
- [DataMember(Name = "address")]
public string Address;
- [DataMember(Name = "publicKey")]
public string PublicKey;
}
diff --git a/products/ASC.Files/Server/Core/Entries/File.cs b/products/ASC.Files/Server/Core/Entries/File.cs
index ac2ecfc7aa..4a5b09a342 100644
--- a/products/ASC.Files/Server/Core/Entries/File.cs
+++ b/products/ASC.Files/Server/Core/Entries/File.cs
@@ -85,7 +85,6 @@ namespace ASC.Files.Core
set { base.Title = value; }
}
- [DataMember(Name = "title", IsRequired = true)]
public override string Title
{
get
diff --git a/products/ASC.Files/Server/Core/Entries/Folder.cs b/products/ASC.Files/Server/Core/Entries/Folder.cs
index 8962ec8a93..4cd2fa30de 100644
--- a/products/ASC.Files/Server/Core/Entries/Folder.cs
+++ b/products/ASC.Files/Server/Core/Entries/Folder.cs
@@ -32,25 +32,17 @@ using ASC.Web.Files.Classes;
namespace ASC.Files.Core
{
- [DataContract(Namespace = "")]
public enum FolderType
{
- [EnumMember] DEFAULT = 0,
-
- [EnumMember] COMMON = 1,
-
- [EnumMember] BUNCH = 2,
-
- [EnumMember] TRASH = 3,
-
- [EnumMember] USER = 5,
-
- [EnumMember] SHARE = 6,
-
- [EnumMember] Projects = 8
+ DEFAULT = 0,
+ COMMON = 1,
+ BUNCH = 2,
+ TRASH = 3,
+ USER = 5,
+ SHARE = 6,
+ Projects = 8
}
- [DataContract(Name = "folder", Namespace = "")]
[DebuggerDisplay("{Title} ({ID})")]
public class Folder : FileEntry
{
@@ -58,19 +50,14 @@ namespace ASC.Files.Core
public T ParentFolderID { get; set; }
- [DataMember(Name = "total_files")]
public int TotalFiles { get; set; }
- [DataMember(Name = "total_sub_folder")]
public int TotalSubFolders { get; set; }
- [DataMember(Name = "shareable", EmitDefaultValue = false)]
public bool Shareable { get; set; }
- [DataMember(Name = "isnew")]
public int NewForMe { get; set; }
- [DataMember(Name = "folder_url", EmitDefaultValue = false)]
public string FolderUrl { get; set; }
public override bool IsNew
@@ -81,7 +68,6 @@ namespace ASC.Files.Core
private T _folderIdDisplay;
- [DataMember(Name = "folder_id")]
public override T FolderIdDisplay
{
get
diff --git a/products/ASC.Files/Server/Model/FileEntryWrapper.cs b/products/ASC.Files/Server/Model/FileEntryWrapper.cs
index 40ff6366a0..a601682b43 100644
--- a/products/ASC.Files/Server/Model/FileEntryWrapper.cs
+++ b/products/ASC.Files/Server/Model/FileEntryWrapper.cs
@@ -37,39 +37,32 @@ namespace ASC.Api.Documents
{
///
///
- [DataContract(Namespace = "")]
public abstract class FileEntryWrapper
{
///
///
- [DataMember(IsRequired = true)]
public string Title { get; set; }
///
///
- [DataMember]
public FileShare Access { get; set; }
///
///
- [DataMember]
public bool Shared { get; set; }
///
///
- [DataMember(Order = 50)]
public ApiDateTime Created { get; set; }
///
///
- [DataMember(Order = 51, EmitDefaultValue = false)]
public EmployeeWraper CreatedBy { get; set; }
private ApiDateTime _updated;
///
///
- [DataMember(Order = 52, EmitDefaultValue = false)]
public ApiDateTime Updated
{
get
@@ -81,27 +74,22 @@ namespace ASC.Api.Documents
///
///
- [DataMember(Order = 41, EmitDefaultValue = false)]
public FolderType RootFolderType { get; set; }
///
///
- [DataMember(Order = 41, EmitDefaultValue = false)]
public EmployeeWraper UpdatedBy { get; set; }
///
///
- [DataMember(Order = 55, EmitDefaultValue = false)]
public bool? ProviderItem { get; set; }
///
///
- [DataMember(Order = 56, EmitDefaultValue = false)]
public string ProviderKey { get; set; }
///
///
- [DataMember(Order = 57, EmitDefaultValue = false)]
public int? ProviderId { get; set; }
@@ -135,12 +123,10 @@ namespace ASC.Api.Documents
///
///
- [DataContract(Namespace = "")]
public abstract class FileEntryWrapper : FileEntryWrapper
{
///
///
- [DataMember]
public T Id { get; set; }
diff --git a/products/ASC.Files/Server/Model/FileOperationWraper.cs b/products/ASC.Files/Server/Model/FileOperationWraper.cs
index 682c2e093f..f096aa530b 100644
--- a/products/ASC.Files/Server/Model/FileOperationWraper.cs
+++ b/products/ASC.Files/Server/Model/FileOperationWraper.cs
@@ -39,52 +39,42 @@ namespace ASC.Api.Documents
{
///
///
- [DataContract(Name = "operation_result", Namespace = "")]
public class FileOperationWraper
{
///
///
- [DataMember(Name = "id", IsRequired = false)]
public string Id { get; set; }
///
///
- [DataMember(Name = "operation", IsRequired = false)]
public FileOperationType OperationType { get; set; }
///
///
- [DataMember(Name = "progress", IsRequired = false)]
public int Progress { get; set; }
///
///
- [DataMember(Name = "error", IsRequired = false)]
public string Error { get; set; }
///
///
- [DataMember(Name = "processed", IsRequired = false)]
public string Processed { get; set; }
///
///
- [DataMember(Name = "finished", IsRequired = false)]
public bool Finished { get; set; }
///
///
- [DataMember(Name = "url", IsRequired = false)]
public string Url { get; set; }
///
///
- [DataMember(Name = "files", IsRequired = true, EmitDefaultValue = true)]
public List Files { get; set; }
///
///
- [DataMember(Name = "folders", IsRequired = true, EmitDefaultValue = true)]
public List Folders { get; set; }
///
diff --git a/products/ASC.Files/Server/Model/FileWrapper.cs b/products/ASC.Files/Server/Model/FileWrapper.cs
index b873534734..4ee2283332 100644
--- a/products/ASC.Files/Server/Model/FileWrapper.cs
+++ b/products/ASC.Files/Server/Model/FileWrapper.cs
@@ -46,69 +46,56 @@ namespace ASC.Api.Documents
{
///
///
- [DataContract(Name = "file", Namespace = "")]
public class FileWrapper : FileEntryWrapper
{
///
///
- [DataMember(EmitDefaultValue = false, IsRequired = false)]
public T FolderId { get; set; }
///
///
- [DataMember(EmitDefaultValue = true, IsRequired = false)]
public int Version { get; set; }
///
///
- [DataMember(EmitDefaultValue = true, IsRequired = false)]
public int VersionGroup { get; set; }
///
///
- [DataMember(EmitDefaultValue = false, IsRequired = true)]
public string ContentLength { get; set; }
///
///
- [DataMember(EmitDefaultValue = false, IsRequired = true)]
public long? PureContentLength { get; set; }
///
///
- [DataMember(EmitDefaultValue = true, IsRequired = false)]
public FileStatus FileStatus { get; set; }
///
///
- [DataMember(EmitDefaultValue = false, IsRequired = false)]
public string ViewUrl { get; set; }
///
///
- [DataMember(EmitDefaultValue = false, IsRequired = false)]
public string WebUrl { get; set; }
///
///
///
- [DataMember(EmitDefaultValue = false, IsRequired = false)]
public FileType FileType { get; set; }
///
///
///
- [DataMember(EmitDefaultValue = false, IsRequired = false)]
public string FileExst { get; set; }
///
///
- [DataMember(EmitDefaultValue = true, IsRequired = false)]
public string Comment { get; set; }
///
///
- [DataMember(EmitDefaultValue = false)]
public bool? Encrypted { get; set; }
///
diff --git a/products/ASC.Files/Server/Model/FolderContentWrapper.cs b/products/ASC.Files/Server/Model/FolderContentWrapper.cs
index cff1db8601..183637c328 100644
--- a/products/ASC.Files/Server/Model/FolderContentWrapper.cs
+++ b/products/ASC.Files/Server/Model/FolderContentWrapper.cs
@@ -39,42 +39,34 @@ namespace ASC.Api.Documents
{
///
///
- [DataContract(Name = "content", Namespace = "")]
public class FolderContentWrapper
{
///
///
- [DataMember(IsRequired = false, EmitDefaultValue = false)]
public List> Files { get; set; }
///
///
- [DataMember(IsRequired = false, EmitDefaultValue = false)]
public List Folders { get; set; }
///
///
- [DataMember(IsRequired = false, EmitDefaultValue = true)]
public FolderWrapper Current { get; set; }
///
///
- [DataMember(IsRequired = false, EmitDefaultValue = true)]
public object PathParts { get; set; }
///
///
- [DataMember(IsRequired = false, EmitDefaultValue = true)]
public int StartIndex { get; set; }
///
///
- [DataMember(IsRequired = false, EmitDefaultValue = true)]
public int Count { get; set; }
///
///
- [DataMember(IsRequired = false, EmitDefaultValue = true)]
public int Total { get; set; }
public int New { get; set; }
diff --git a/products/ASC.Files/Server/Model/FolderWrapper.cs b/products/ASC.Files/Server/Model/FolderWrapper.cs
index 38514f6d17..7e90b88511 100644
--- a/products/ASC.Files/Server/Model/FolderWrapper.cs
+++ b/products/ASC.Files/Server/Model/FolderWrapper.cs
@@ -41,27 +41,22 @@ namespace ASC.Api.Documents
{
///
///
- [DataContract(Name = "folder", Namespace = "")]
public class FolderWrapper : FileEntryWrapper
{
///
///
- [DataMember(IsRequired = true, EmitDefaultValue = true)]
public T ParentId { get; set; }
///
///
- [DataMember(EmitDefaultValue = true, IsRequired = false)]
public int FilesCount { get; set; }
///
///
- [DataMember(EmitDefaultValue = true, IsRequired = false)]
public int FoldersCount { get; set; }
///
///
- [DataMember(EmitDefaultValue = false, IsRequired = false)]
public bool? IsShareable { get; set; }
public int New { get; set; }
diff --git a/products/ASC.Files/Server/Services/DocumentService/Configuration.cs b/products/ASC.Files/Server/Services/DocumentService/Configuration.cs
index 13622d8317..e75b6f4b32 100644
--- a/products/ASC.Files/Server/Services/DocumentService/Configuration.cs
+++ b/products/ASC.Files/Server/Services/DocumentService/Configuration.cs
@@ -68,7 +68,6 @@ namespace ASC.Web.Files.Services.DocumentService
External,
}
- [DataContract(Name = "editorConfig", Namespace = "")]
public class Configuration
{
public static readonly Dictionary DocType = new Dictionary
@@ -99,10 +98,8 @@ namespace ASC.Web.Files.Services.DocumentService
#region Property
- [DataMember(Name = "document")]
public DocumentConfig Document { get; set; }
- [DataMember(Name = "documentType")]
public string DocumentType
{
set { }
@@ -113,13 +110,10 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataMember(Name = "editorConfig")]
public EditorConfiguration EditorConfig { get; set; }
- [DataMember(Name = "token", EmitDefaultValue = false)]
public string Token { get; set; }
- [DataMember(Name = "type")]
public string Type
{
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; }
#endregion
@@ -153,7 +146,6 @@ namespace ASC.Web.Files.Services.DocumentService
}
#region Nested Classes
- [DataContract(Name = "document", Namespace = "")]
public class DocumentConfig
{
public string SharedLinkKey;
@@ -171,34 +163,28 @@ namespace ASC.Web.Files.Services.DocumentService
private string _title = null;
- [DataMember(Name = "fileType")]
public string FileType
{
set { }
get { return Info.File.ConvertedExtension.Trim('.'); }
}
- [DataMember(Name = "info")]
public InfoConfig Info { get; set; }
- [DataMember(Name = "key")]
public string Key
{
set { _key = value; }
get { return DocumentServiceConnector.GenerateRevisionId(_key); }
}
- [DataMember(Name = "permissions")]
public PermissionsConfig Permissions { get; set; }
- [DataMember(Name = "title")]
public string Title
{
set { _title = value; }
get { return _title ?? Info.File.Title; }
}
- [DataMember(Name = "url")]
public string Url
{
set { _fileUri = DocumentServiceConnector.ReplaceCommunityAdress(value); }
@@ -216,7 +202,6 @@ namespace ASC.Web.Files.Services.DocumentService
private PathProvider PathProvider { get; }
}
- [DataContract(Name = "info", Namespace = "")]
public class InfoConfig
{
public File File;
@@ -231,7 +216,6 @@ namespace ASC.Web.Files.Services.DocumentService
}
[Obsolete("Use owner (since v5.4)")]
- [DataMember(Name = "author")]
public string Author
{
set { }
@@ -239,14 +223,12 @@ namespace ASC.Web.Files.Services.DocumentService
}
[Obsolete("Use uploaded (since v5.4)")]
- [DataMember(Name = "created")]
public string Created
{
set { }
get { return File.CreateOnString; }
}
- [DataMember(Name = "folder", EmitDefaultValue = false)]
public string Folder
{
set { }
@@ -265,21 +247,18 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataMember(Name = "owner")]
public string Owner
{
set { }
get { return File.CreateByString; }
}
- [DataMember(Name = "uploaded")]
public string Uploaded
{
set { }
get { return File.CreateOnString; }
}
- [DataMember(Name = "sharingSettings", EmitDefaultValue = false)]
public ItemList SharingSettings
{
set { }
@@ -304,36 +283,26 @@ namespace ASC.Web.Files.Services.DocumentService
private FileSharing FileSharing { get; }
}
- [DataContract(Name = "permissions", Namespace = "")]
public class PermissionsConfig
{
[Obsolete("Since DS v5.5")]
- [DataMember(Name = "changeHistory")]
public bool ChangeHistory { get; set; } = false;
- [DataMember(Name = "comment")]
public bool Comment { get; set; } = true;
- [DataMember(Name = "download")]
public bool Download { get; set; } = true;
- [DataMember(Name = "edit")]
public bool Edit { get; set; } = true;
- [DataMember(Name = "fillForms")]
public bool FillForms { get; set; } = true;
- [DataMember(Name = "print")]
public bool Print { get; set; } = true;
- [DataMember(Name = "rename")]
public bool Rename { get; set; } = false;
- [DataMember(Name = "review")]
public bool Review { get; set; } = true;
}
- [DataContract(Name = "editorConfig", Namespace = "")]
public class EditorConfiguration
{
public EditorConfiguration(
@@ -381,7 +350,6 @@ namespace ASC.Web.Files.Services.DocumentService
private readonly UserInfo _userInfo;
private EmbeddedConfig _embeddedConfig;
- [DataMember(Name = "actionLink", EmitDefaultValue = false)]
public ActionLinkConfig ActionLink { get; set; }
public string ActionLinkString
@@ -404,10 +372,8 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataMember(Name = "callbackUrl", EmitDefaultValue = false)]
public string CallbackUrl { get; set; }
- [DataMember(Name = "createUrl", EmitDefaultValue = false)]
public string CreateUrl
{
set { }
@@ -420,23 +386,18 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataMember(Name = "plugins", EmitDefaultValue = false)]
public PluginsConfig Plugins { get; set; }
- [DataMember(Name = "customization", EmitDefaultValue = false)]
public CustomizationConfig Customization { get; set; }
- [DataMember(Name = "embedded", EmitDefaultValue = false)]
public EmbeddedConfig Embedded
{
set { _embeddedConfig = value; }
get { return _configuration.Document.Info.Type == EditorType.Embedded ? _embeddedConfig : null; }
}
- [DataMember(Name = "fileChoiceUrl", EmitDefaultValue = false)]
public string FileChoiceUrl { get; set; }
- [DataMember(Name = "lang")]
public string Lang
{
set { }
@@ -444,10 +405,8 @@ namespace ASC.Web.Files.Services.DocumentService
}
//todo: remove old feild after release 5.2+
- [DataMember(Name = "mergeFolderUrl", EmitDefaultValue = false)]
public string MergeFolderUrl { get; set; }
- [DataMember(Name = "mode")]
public string Mode
{
set { }
@@ -459,13 +418,10 @@ namespace ASC.Web.Files.Services.DocumentService
private FilesLinkUtility FilesLinkUtility { get; }
private BaseCommonLinkUtility BaseCommonLinkUtility { get; }
- [DataMember(Name = "saveAsUrl", EmitDefaultValue = false)]
public string SaveAsUrl { get; set; }
- [DataMember(Name = "sharingSettingsUrl", EmitDefaultValue = false)]
public string SharingSettingsUrl { get; set; }
- [DataMember(Name = "user")]
public UserConfig User { get; set; }
private string GetCreateUrl(FileType fileType)
@@ -497,20 +453,15 @@ namespace ASC.Web.Files.Services.DocumentService
#endregion
- [DataContract(Name = "actionLink", Namespace = "")]
public class ActionLinkConfig
{
- [DataMember(Name = "action", EmitDefaultValue = false)]
public ActionConfig Action { get; set; }
- [DataContract(Name = "action", Namespace = "")]
public class ActionConfig
{
- [DataMember(Name = "type", EmitDefaultValue = false)]
public string Type { get; set; }
- [DataMember(Name = "data", EmitDefaultValue = false)]
public string Data { get; set; }
}
@@ -527,26 +478,22 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataContract(Name = "embedded", Namespace = "")]
public class EmbeddedConfig
{
public string ShareLinkParam { get; set; }
- [DataMember(Name = "embedUrl", EmitDefaultValue = false)]
public string EmbedUrl
{
set { }
get { return BaseCommonLinkUtility.GetFullAbsolutePath(FilesLinkUtility.FilesBaseAbsolutePath + FilesLinkUtility.EditorPage + "?" + FilesLinkUtility.Action + "=embedded" + ShareLinkParam); }
}
- [DataMember(Name = "saveUrl", EmitDefaultValue = false)]
public string SaveUrl
{
set { }
get { return BaseCommonLinkUtility.GetFullAbsolutePath(FilesLinkUtility.FileHandlerPath + "?" + FilesLinkUtility.Action + "=download" + ShareLinkParam); }
}
- [DataMember(Name = "shareUrl", EmitDefaultValue = false)]
public string ShareUrl
{
set { }
@@ -556,7 +503,6 @@ namespace ASC.Web.Files.Services.DocumentService
public BaseCommonLinkUtility BaseCommonLinkUtility { get; }
public FilesLinkUtility FilesLinkUtility { get; }
- [DataMember(Name = "toolbarDocked")]
public string ToolbarDocked { get => "top"; }
public EmbeddedConfig(BaseCommonLinkUtility baseCommonLinkUtility, FilesLinkUtility filesLinkUtility)
@@ -566,10 +512,8 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataContract(Name = "plugins", Namespace = "")]
public class PluginsConfig
{
- [DataMember(Name = "pluginsData", EmitDefaultValue = false)]
public string[] PluginsData
{
set { }
@@ -605,7 +549,6 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataContract(Name = "customization", Namespace = "")]
public class CustomizationConfig
{
public CustomizationConfig(
@@ -651,17 +594,14 @@ namespace ASC.Web.Files.Services.DocumentService
public bool IsRetina = false;
- [DataMember(Name = "about")]
public bool About
{
set { }
get { return !CoreBaseSettings.Standalone && !CoreBaseSettings.CustomMode; }
}
- [DataMember(Name = "customer")]
public CustomerConfig Customer { get; set; }
- [DataMember(Name = "feedback", EmitDefaultValue = false)]
public FeedbackConfig Feedback
{
set { }
@@ -691,7 +631,6 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataMember(Name = "goback", EmitDefaultValue = false)]
public GobackConfig Goback
{
set { }
@@ -738,7 +677,6 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataMember(Name = "loaderLogo", EmitDefaultValue = false)]
public string LoaderLogo
{
set { }
@@ -750,7 +688,6 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataMember(Name = "loaderName", EmitDefaultValue = false)]
public string LoaderName
{
set { }
@@ -762,10 +699,8 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataMember(Name = "logo")]
public LogoConfig Logo { get; set; }
- [DataMember(Name = "reviewDisplay", EmitDefaultValue = false)]
public string ReviewDisplay
{
set { }
@@ -785,7 +720,6 @@ namespace ASC.Web.Files.Services.DocumentService
private BaseCommonLinkUtility BaseCommonLinkUtility { get; }
}
- [DataContract(Name = "customer", Namespace = "")]
public class CustomerConfig
{
public CustomerConfig(
@@ -805,14 +739,12 @@ namespace ASC.Web.Files.Services.DocumentService
_configuration = configuration;
}
- [DataMember(Name = "logo")]
public string Logo
{
set { }
get { return BaseCommonLinkUtility.GetFullAbsolutePath(TenantLogoHelper.GetLogo(WhiteLabelLogoTypeEnum.Dark, !_configuration.EditorConfig.Customization.IsRetina)); }
}
- [DataMember(Name = "name")]
public string Name
{
set { }
@@ -828,24 +760,18 @@ namespace ASC.Web.Files.Services.DocumentService
private TenantLogoHelper TenantLogoHelper { get; }
}
- [DataContract(Name = "feedback", Namespace = "")]
public class FeedbackConfig
{
- [DataMember(Name = "url")]
public string Url { get; set; }
- [DataMember(Name = "visible")]
public bool Visible { get => true; }
}
- [DataContract(Name = "goback", Namespace = "")]
public class GobackConfig
{
- [DataMember(Name = "url", EmitDefaultValue = false)]
public string Url { get; set; }
}
- [DataContract(Name = "logo", Namespace = "")]
public class LogoConfig
{
public LogoConfig(
@@ -864,7 +790,6 @@ namespace ASC.Web.Files.Services.DocumentService
_configuration = configuration;
}
- [DataMember(Name = "image")]
public string Image
{
set { }
@@ -877,7 +802,6 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataMember(Name = "imageEmbedded", EmitDefaultValue = false)]
public string ImageEmbedded
{
set { }
@@ -890,7 +814,6 @@ namespace ASC.Web.Files.Services.DocumentService
}
}
- [DataMember(Name = "url")]
public string Url
{
set { }
@@ -902,13 +825,10 @@ namespace ASC.Web.Files.Services.DocumentService
private SettingsManager SettingsManager { get; }
}
- [DataContract(Name = "user", Namespace = "")]
public class UserConfig
{
- [DataMember(Name = "id", EmitDefaultValue = false)]
public string Id { get; set; }
- [DataMember(Name = "name", EmitDefaultValue = false)]
public string Name { get; set; }
}
diff --git a/products/ASC.Files/Server/Services/WCFService/Wrappers/AceWrapper.cs b/products/ASC.Files/Server/Services/WCFService/Wrappers/AceWrapper.cs
index 1c0c9d1056..3f0604fbae 100644
--- a/products/ASC.Files/Server/Services/WCFService/Wrappers/AceWrapper.cs
+++ b/products/ASC.Files/Server/Services/WCFService/Wrappers/AceWrapper.cs
@@ -33,57 +33,40 @@ using ASC.Files.Resources;
namespace ASC.Web.Files.Services.WCFService
{
- [DataContract(Name = "ace_collection", Namespace = "")]
public class AceCollection
{
- [DataMember(Name = "entries", Order = 1)]
public ItemList Entries { get; set; }
- [DataMember(Name = "aces", Order = 2)]
public ItemList Aces { get; set; }
- [DataMember(Name = "message", Order = 3, IsRequired = false)]
public string Message { get; set; }
}
- [DataContract(Name = "ace_wrapper", Namespace = "")]
public class AceWrapper
{
- [DataMember(Name = "id", Order = 1)]
public Guid SubjectId { get; set; }
- [DataMember(Name = "title", Order = 2, EmitDefaultValue = false)]
public string SubjectName { get; set; }
- [DataMember(Name = "link", Order = 3, EmitDefaultValue = false)]
public string Link { get; set; }
- [DataMember(Name = "is_group", Order = 4)]
public bool SubjectGroup { get; set; }
- [DataMember(Name = "owner", Order = 5)]
public bool Owner { get; set; }
- [DataMember(Name = "ace_status", Order = 6)]
public FileShare Share { get; set; }
- [DataMember(Name = "locked", Order = 7)]
public bool LockedRights { get; set; }
- [DataMember(Name = "disable_remove", Order = 8)]
public bool DisableRemove { get; set; }
}
- [DataContract(Name = "sharingSettings", Namespace = "")]
public class AceShortWrapper
{
- [DataMember(Name = "user")]
public string User { get; set; }
- [DataMember(Name = "permissions")]
public string Permissions { get; set; }
- [DataMember(Name = "isLink", EmitDefaultValue = false, IsRequired = false)]
public bool? IsLink { get; set; }
public AceShortWrapper(AceWrapper aceWrapper)
diff --git a/products/ASC.Files/Server/Services/WCFService/Wrappers/ThirdPartyParams.cs b/products/ASC.Files/Server/Services/WCFService/Wrappers/ThirdPartyParams.cs
index 7d12a40e0f..351aae7991 100644
--- a/products/ASC.Files/Server/Services/WCFService/Wrappers/ThirdPartyParams.cs
+++ b/products/ASC.Files/Server/Services/WCFService/Wrappers/ThirdPartyParams.cs
@@ -29,22 +29,16 @@ using ASC.Files.Core;
namespace ASC.Web.Files.Services.WCFService
{
- [DataContract(Name = "third_party", Namespace = "")]
public class ThirdPartyParams
{
- [DataMember(Name = "auth_data", EmitDefaultValue = false)]
public AuthData AuthData { get; set; }
- [DataMember(Name = "corporate")]
public bool Corporate { get; set; }
- [DataMember(Name = "customer_title")]
public string CustomerTitle { get; set; }
- [DataMember(Name = "provider_id")]
public string ProviderId { get; set; }
- [DataMember(Name = "provider_key")]
public string ProviderKey { get; set; }
}
}
\ No newline at end of file