From 453019b84fb832b12f62ccecc62da1e124497767 Mon Sep 17 00:00:00 2001 From: Kirill Teplinskiy Date: Thu, 27 Jun 2024 18:40:20 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D1=81=D1=82=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20Obsolete=20=D0=B2=D1=81=D0=B5=D0=BC=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D0=BC=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ComDiadocApi.cs | 40 +++++++++++++++++++++++ src/Constants/ObsoleteReasons.cs | 7 +++++ src/DiadocHttpApi.Invoicing.cs | 3 ++ src/DiadocHttpApi.InvoicingAsync.cs | 3 ++ src/DiadocHttpApi.Parse.cs | 15 +++++++++ src/DiadocHttpApi.ParseAsync.cs | 15 +++++++++ src/DiadocHttpApi.Recognize.cs | 5 ++- src/DiadocHttpApi.RecognizeAsync.cs | 5 ++- src/DiadocHttpApi.References.cs | 8 +++++ src/DiadocHttpApi.ReferencesAsync.cs | 8 +++++ src/IDiadocApi.cs | 47 ++++++++++++++++++++++++++++ tests/AuthToken_Test.cs | 21 +++++++++++++ 12 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 src/Constants/ObsoleteReasons.cs diff --git a/src/ComDiadocApi.cs b/src/ComDiadocApi.cs index f4211b3d..d8010353 100644 --- a/src/ComDiadocApi.cs +++ b/src/ComDiadocApi.cs @@ -3,6 +3,7 @@ using System.Runtime.InteropServices; using System.Security; using Diadoc.Api.Com; +using Diadoc.Api.Constants; using Diadoc.Api.Cryptography; using Diadoc.Api.Http; using Diadoc.Api.Proto; @@ -56,12 +57,16 @@ public interface IComDiadocApi ReadonlyList GetOrganizationUsers(string authToken, string orgId); ReadonlyList GetOrganizationUsersV2(string authToken, string boxId); ReadonlyList GetMyOrganizations(string authToken, bool autoRegister = true); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] ReadonlyList GetOrganizationsByInnKpp(string inn, string kpp); ReadonlyList GetOrganizationsByInnKpp(string authToken, string inn, string kpp); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Organization GetOrganizationById(string orgId); Organization GetOrganizationById(string authToken, string orgId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Organization GetOrganizationByInn(string inn); Organization GetOrganizationByInn(string authToken, string inn); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] ReadonlyList GetOrganizationsByInnList([MarshalAs(UnmanagedType.IDispatch)] object innList); ReadonlyList GetOrganizationsByInnList(string authToken, [MarshalAs(UnmanagedType.IDispatch)] object innList); @@ -70,8 +75,10 @@ ReadonlyList GetOrganizationsByInnList( string myOrgId, [MarshalAs(UnmanagedType.IDispatch)] object innList); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Organization GetOrganizationByFnsParticipantId(string fnsParticipantId); Organization GetOrganizationByFnsParticipantId(string authToken, string fnsParticipantId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Box GetBox(string boxId); Box GetBox(string authToken, string boxId); Department GetDepartment(string authToken, string orgId, string departmentId); @@ -364,10 +371,13 @@ BoxCounteragentEventList GetCounteragentEvents( string UploadFileToShelf(string authToken, string fileName); void GetFileFromShelf(string authToken, string nameOnShelf, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] RussianAddress ParseRussianAddress(string address); RussianAddress ParseRussianAddress(string authToken, string address); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] InvoiceInfo ParseInvoiceXml(byte[] invoiceXmlContent); InvoiceInfo ParseInvoiceXml(string authToken, byte[] invoiceXmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] InvoiceInfo ParseInvoiceXmlFromFile(string fileName); InvoiceInfo ParseInvoiceXmlFromFile(string authToken, string fileName); @@ -392,52 +402,76 @@ GeneratedFile GenerateReceiptXmlV2( string boxId, [MarshalAs(UnmanagedType.IDispatch)] object receiptGenerationRequest); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Torg12SellerTitleInfo ParseTorg12SellerTitleXml(byte[] torg12SellerTitleXmlContent); Torg12SellerTitleInfo ParseTorg12SellerTitleXml(string authToken, byte[] torg12SellerTitleXmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Torg12SellerTitleInfo ParseTorg12SellerTitleXmlFromFile(string fileName); Torg12SellerTitleInfo ParseTorg12SellerTitleXmlFromFile(string authToken, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Torg12BuyerTitleInfo ParseTorg12BuyerTitleXml(byte[] content); Torg12BuyerTitleInfo ParseTorg12BuyerTitleXml(string authToken, byte[] content); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Torg12BuyerTitleInfo ParseTorg12BuyerTitleXmlFromFile(string fileName); Torg12BuyerTitleInfo ParseTorg12BuyerTitleXmlFromFile(string authToken, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] TovTorgSellerTitleInfo ParseTovTorg551SellerTitleXml(byte[] torg12SellerTitleXmlContent); TovTorgSellerTitleInfo ParseTovTorg551SellerTitleXml(string authToken, byte[] torg12SellerTitleXmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] TovTorgSellerTitleInfo ParseTovTorg551SellerTitleXmlFromFile(string fileName); TovTorgSellerTitleInfo ParseTovTorg551SellerTitleXmlFromFile(string authToken, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] TovTorgBuyerTitleInfo ParseTovTorg551BuyerTitleXml(byte[] content); TovTorgBuyerTitleInfo ParseTovTorg551BuyerTitleXml(string authToken, byte[] content); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] TovTorgBuyerTitleInfo ParseTovTorg551BuyerTitleXmlFromFile(string fileName); TovTorgBuyerTitleInfo ParseTovTorg551BuyerTitleXmlFromFile(string authToken, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificateSellerTitleInfo ParseAcceptanceCertificateSellerTitleXml(byte[] xmlContent); AcceptanceCertificateSellerTitleInfo ParseAcceptanceCertificateSellerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificateSellerTitleInfo ParseAcceptanceCertificateSellerTitleXmlFromFile(string fileName); AcceptanceCertificateSellerTitleInfo ParseAcceptanceCertificateSellerTitleXmlFromFile(string authToken, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificateBuyerTitleInfo ParseAcceptanceCertificateBuyerTitleXml(byte[] xmlContent); AcceptanceCertificateBuyerTitleInfo ParseAcceptanceCertificateBuyerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificateBuyerTitleInfo ParseAcceptanceCertificateBuyerTitleXmlFromFile(string fileName); AcceptanceCertificateBuyerTitleInfo ParseAcceptanceCertificateBuyerTitleXmlFromFile(string authToken, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificate552SellerTitleInfo ParseAcceptanceCertificate552SellerTitleXml(byte[] xmlContent); AcceptanceCertificate552SellerTitleInfo ParseAcceptanceCertificate552SellerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificate552SellerTitleInfo ParseAcceptanceCertificate552SellerTitleXmlFromFile(string fileName); AcceptanceCertificate552SellerTitleInfo ParseAcceptanceCertificate552SellerTitleXmlFromFile(string authToken, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificate552BuyerTitleInfo ParseAcceptanceCertificate552BuyerTitleXml(byte[] xmlContent); AcceptanceCertificate552BuyerTitleInfo ParseAcceptanceCertificate552BuyerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificate552BuyerTitleInfo ParseAcceptanceCertificate552BuyerTitleXmlFromFile(string fileName); AcceptanceCertificate552BuyerTitleInfo ParseAcceptanceCertificate552BuyerTitleXmlFromFile(string authToken, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalTransferDocumentSellerTitleInfo ParseUniversalTransferDocumentSellerTitleXml(byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Utd); UniversalTransferDocumentSellerTitleInfo ParseUniversalTransferDocumentSellerTitleXml(string authToken, byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Utd); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalTransferDocumentSellerTitleInfo ParseUniversalTransferDocumentSellerTitleXmlFromFile(string fileName, string documentVersion = DefaultDocumentVersions.Utd); UniversalTransferDocumentSellerTitleInfo ParseUniversalTransferDocumentSellerTitleXmlFromFile(string authToken, string fileName, string documentVersion = DefaultDocumentVersions.Utd); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalTransferDocumentBuyerTitleInfo ParseUniversalTransferDocumentBuyerTitleXml(byte[] xmlContent); UniversalTransferDocumentBuyerTitleInfo ParseUniversalTransferDocumentBuyerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalTransferDocumentBuyerTitleInfo ParseUniversalTransferDocumentBuyerTitleXmlFromFile(string fileName); UniversalTransferDocumentBuyerTitleInfo ParseUniversalTransferDocumentBuyerTitleXmlFromFile(string authToken, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalCorrectionDocumentSellerTitleInfo ParseUniversalCorrectionDocumentSellerTitleXml(byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Ucd); UniversalCorrectionDocumentSellerTitleInfo ParseUniversalCorrectionDocumentSellerTitleXml(string authToken, byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Ucd); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalCorrectionDocumentSellerTitleInfo ParseUniversalCorrectionDocumentSellerTitleXmlFromFile(string fileName, string documentVersion = DefaultDocumentVersions.Ucd); UniversalCorrectionDocumentSellerTitleInfo ParseUniversalCorrectionDocumentSellerTitleXmlFromFile(string authToken, string fileName, string documentVersion = DefaultDocumentVersions.Ucd); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalTransferDocumentBuyerTitleInfo ParseUniversalCorrectionDocumentBuyerTitleXml(byte[] xmlContent); UniversalTransferDocumentBuyerTitleInfo ParseUniversalCorrectionDocumentBuyerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalTransferDocumentBuyerTitleInfo ParseUniversalCorrectionDocumentBuyerTitleXmlFromFile(string fileName); UniversalTransferDocumentBuyerTitleInfo ParseUniversalCorrectionDocumentBuyerTitleXmlFromFile(string authToken, string fileName); @@ -471,16 +505,22 @@ GeneratedFile GenerateSignatureRejectionXmlV2( string boxId, [MarshalAs(UnmanagedType.IDispatch)] object signatureRejectionGenerationRequest); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] RevocationRequestInfo ParseRevocationRequestXml(byte[] revocationRequestXmlContent); RevocationRequestInfo ParseRevocationRequestXml(string authToken, byte[] revocationRequestXmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] RevocationRequestInfo ParseRevocationRequestXmlFromFile(string fileName); RevocationRequestInfo ParseRevocationRequestXmlFromFile(string authToken, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] SignatureRejectionInfo ParseSignatureRejectionXml(byte[] signatureRejectionXmlContent); SignatureRejectionInfo ParseSignatureRejectionXml(string authToken, byte[] signatureRejectionXmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] SignatureRejectionInfo ParseSignatureRejectionXmlFromFile(string fileName); SignatureRejectionInfo ParseSignatureRejectionXmlFromFile(string authToken, string fileName); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Organization GetOrganizationByBoxId(string boxId); Organization GetOrganizationByBoxId(string authToken, string boxId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Organization GetOrganizationByInnKpp(string inn, string kpp); Organization GetOrganizationByInnKpp(string authToken, string inn, string kpp); IDocumentProtocolResult GenerateDocumentProtocol(string authToken, string boxId, string messageId, string documentId); diff --git a/src/Constants/ObsoleteReasons.cs b/src/Constants/ObsoleteReasons.cs new file mode 100644 index 00000000..cf32a671 --- /dev/null +++ b/src/Constants/ObsoleteReasons.cs @@ -0,0 +1,7 @@ +namespace Diadoc.Api.Constants +{ + internal static class ObsoleteReasons + { + public const string UseAuthTokenOverload = "Use overload with authToken argument"; + } +} diff --git a/src/DiadocHttpApi.Invoicing.cs b/src/DiadocHttpApi.Invoicing.cs index 2b0d1993..b1a759f2 100644 --- a/src/DiadocHttpApi.Invoicing.cs +++ b/src/DiadocHttpApi.Invoicing.cs @@ -1,6 +1,7 @@ using System; using System.Net; using System.Security.Cryptography.X509Certificates; +using Diadoc.Api.Constants; using Diadoc.Api.Http; using Diadoc.Api.Proto.Events; using Diadoc.Api.Proto.Invoicing; @@ -248,6 +249,7 @@ public void SendFnsRegistrationMessage(string authToken, string boxId, FnsRegist HttpClient.PerformHttpRequest(request); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public RevocationRequestInfo ParseRevocationRequestXml(byte[] xmlContent) { return ParseRevocationRequestXml(null, xmlContent); @@ -258,6 +260,7 @@ public RevocationRequestInfo ParseRevocationRequestXml(string authToken, byte[] return PerformHttpRequest(authToken, "POST", "/ParseRevocationRequestXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public SignatureRejectionInfo ParseSignatureRejectionXml(byte[] xmlContent) { return ParseSignatureRejectionXml(null, xmlContent); diff --git a/src/DiadocHttpApi.InvoicingAsync.cs b/src/DiadocHttpApi.InvoicingAsync.cs index 8f76002e..832ec6c1 100644 --- a/src/DiadocHttpApi.InvoicingAsync.cs +++ b/src/DiadocHttpApi.InvoicingAsync.cs @@ -2,6 +2,7 @@ using System.Net; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; +using Diadoc.Api.Constants; using Diadoc.Api.Http; using Diadoc.Api.Proto.Events; using Diadoc.Api.Proto.Invoicing; @@ -261,6 +262,7 @@ public Task SendFnsRegistrationMessageAsync(string authToken, string boxId, FnsR return HttpClient.PerformHttpRequestAsync(request); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseRevocationRequestXmlAsync(byte[] xmlContent) { return ParseRevocationRequestXmlAsync(null, xmlContent); @@ -271,6 +273,7 @@ public Task ParseRevocationRequestXmlAsync(string authTok return PerformHttpRequestAsync(authToken, "POST", "/ParseRevocationRequestXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseSignatureRejectionXmlAsync(byte[] xmlContent) { return ParseSignatureRejectionXmlAsync(null, xmlContent); diff --git a/src/DiadocHttpApi.Parse.cs b/src/DiadocHttpApi.Parse.cs index c6aabfb5..4aff1896 100644 --- a/src/DiadocHttpApi.Parse.cs +++ b/src/DiadocHttpApi.Parse.cs @@ -1,3 +1,5 @@ +using System; +using Diadoc.Api.Constants; using Diadoc.Api.Http; using Diadoc.Api.Proto.Invoicing; @@ -5,6 +7,7 @@ namespace Diadoc.Api { public partial class DiadocHttpApi { + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public InvoiceInfo ParseInvoiceXml(byte[] invoiceXmlContent) { return ParseInvoiceXml(null, invoiceXmlContent); @@ -15,6 +18,7 @@ public InvoiceInfo ParseInvoiceXml(string authToken, byte[] invoiceXmlContent) return PerformHttpRequest(authToken, "POST", "/ParseInvoiceXml", invoiceXmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Torg12SellerTitleInfo ParseTorg12SellerTitleXml(byte[] xmlContent) { return ParseTorg12SellerTitleXml(null, xmlContent); @@ -25,6 +29,7 @@ public Torg12SellerTitleInfo ParseTorg12SellerTitleXml(string authToken, byte[] return PerformHttpRequest(authToken, "POST", "/ParseTorg12SellerTitleXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Torg12BuyerTitleInfo ParseTorg12BuyerTitleXml(byte[] xmlContent) { return ParseTorg12BuyerTitleXml(null, xmlContent); @@ -35,6 +40,7 @@ public Torg12BuyerTitleInfo ParseTorg12BuyerTitleXml(string authToken, byte[] xm return PerformHttpRequest(authToken, "POST", "/ParseTorg12BuyerTitleXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public TovTorgSellerTitleInfo ParseTovTorg551SellerTitleXml(byte[] xmlContent) { return ParseTovTorg551SellerTitleXml(null, xmlContent); @@ -45,6 +51,7 @@ public TovTorgSellerTitleInfo ParseTovTorg551SellerTitleXml(string authToken, by return PerformHttpRequest(authToken, "POST", $"/ParseTorg12SellerTitleXml?documentVersion={DefaultDocumentVersions.TovTorg551}", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public TovTorgBuyerTitleInfo ParseTovTorg551BuyerTitleXml(byte[] xmlContent) { return ParseTovTorg551BuyerTitleXml(null, xmlContent); @@ -55,6 +62,7 @@ public TovTorgBuyerTitleInfo ParseTovTorg551BuyerTitleXml(string authToken, byte return PerformHttpRequest(authToken, "POST", $"/ParseTorg12BuyerTitleXml?documentVersion={DefaultDocumentVersions.TovTorg551}", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public AcceptanceCertificateSellerTitleInfo ParseAcceptanceCertificateSellerTitleXml(byte[] xmlContent) { return ParseAcceptanceCertificateSellerTitleXml(null, xmlContent); @@ -65,6 +73,7 @@ public AcceptanceCertificateSellerTitleInfo ParseAcceptanceCertificateSellerTitl return PerformHttpRequest(authToken, "POST", "/ParseAcceptanceCertificateSellerTitleXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public AcceptanceCertificateBuyerTitleInfo ParseAcceptanceCertificateBuyerTitleXml(byte[] xmlContent) { return ParseAcceptanceCertificateBuyerTitleXml(null, xmlContent); @@ -75,6 +84,7 @@ public AcceptanceCertificateBuyerTitleInfo ParseAcceptanceCertificateBuyerTitleX return PerformHttpRequest(authToken, "POST", "/ParseAcceptanceCertificateBuyerTitleXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public AcceptanceCertificate552SellerTitleInfo ParseAcceptanceCertificate552SellerTitleXml(byte[] xmlContent) { return ParseAcceptanceCertificate552SellerTitleXml(null, xmlContent); @@ -85,6 +95,7 @@ public AcceptanceCertificate552SellerTitleInfo ParseAcceptanceCertificate552Sell return PerformHttpRequest(authToken, "POST", $"/ParseAcceptanceCertificateSellerTitleXml?documentVersion={DefaultDocumentVersions.AcceptanceCerttificate552}", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public AcceptanceCertificate552BuyerTitleInfo ParseAcceptanceCertificate552BuyerTitleXml(byte[] xmlContent) { return ParseAcceptanceCertificate552BuyerTitleXml(null, xmlContent); @@ -95,6 +106,7 @@ public AcceptanceCertificate552BuyerTitleInfo ParseAcceptanceCertificate552Buyer return PerformHttpRequest(authToken, "POST", $"/ParseAcceptanceCertificateBuyerTitleXml?documentVersion={DefaultDocumentVersions.AcceptanceCerttificate552}", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public UniversalTransferDocumentSellerTitleInfo ParseUniversalTransferDocumentSellerTitleXml(byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Utd) { return ParseUniversalTransferDocumentSellerTitleXml(null, xmlContent, documentVersion); @@ -107,6 +119,7 @@ public UniversalTransferDocumentSellerTitleInfo ParseUniversalTransferDocumentSe return PerformHttpRequest(authToken, "POST", query.BuildPathAndQuery(), xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public UniversalTransferDocumentBuyerTitleInfo ParseUniversalTransferDocumentBuyerTitleXml(byte[] xmlContent) { return ParseUniversalTransferDocumentBuyerTitleXml(null, xmlContent); @@ -117,6 +130,7 @@ public UniversalTransferDocumentBuyerTitleInfo ParseUniversalTransferDocumentBuy return PerformHttpRequest(authToken, "POST", "/ParseUniversalTransferDocumentBuyerTitleXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public UniversalCorrectionDocumentSellerTitleInfo ParseUniversalCorrectionDocumentSellerTitleXml(byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Ucd) { return ParseUniversalCorrectionDocumentSellerTitleXml(null, xmlContent, documentVersion); @@ -129,6 +143,7 @@ public UniversalCorrectionDocumentSellerTitleInfo ParseUniversalCorrectionDocume return PerformHttpRequest(authToken, "POST", query.BuildPathAndQuery(), xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public UniversalTransferDocumentBuyerTitleInfo ParseUniversalCorrectionDocumentBuyerTitleXml(byte[] xmlContent) { return ParseUniversalCorrectionDocumentBuyerTitleXml(null, xmlContent); diff --git a/src/DiadocHttpApi.ParseAsync.cs b/src/DiadocHttpApi.ParseAsync.cs index 64026a5b..d471e47b 100644 --- a/src/DiadocHttpApi.ParseAsync.cs +++ b/src/DiadocHttpApi.ParseAsync.cs @@ -1,4 +1,6 @@ +using System; using System.Threading.Tasks; +using Diadoc.Api.Constants; using Diadoc.Api.Http; using Diadoc.Api.Proto.Invoicing; @@ -6,6 +8,7 @@ namespace Diadoc.Api { public partial class DiadocHttpApi { + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseInvoiceXmlAsync(byte[] invoiceXmlContent) { return ParseInvoiceXmlAsync(null, invoiceXmlContent); @@ -16,6 +19,7 @@ public Task ParseInvoiceXmlAsync(string authToken, byte[] invoiceXm return PerformHttpRequestAsync(authToken, "POST", "/ParseInvoiceXml", invoiceXmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseTorg12SellerTitleXmlAsync(byte[] xmlContent) { return ParseTorg12SellerTitleXmlAsync(null, xmlContent); @@ -26,6 +30,7 @@ public Task ParseTorg12SellerTitleXmlAsync(string authTok return PerformHttpRequestAsync(authToken, "POST", "/ParseTorg12SellerTitleXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseTorg12BuyerTitleXmlAsync(byte[] xmlContent) { return ParseTorg12BuyerTitleXmlAsync(null, xmlContent); @@ -36,6 +41,7 @@ public Task ParseTorg12BuyerTitleXmlAsync(string authToken return PerformHttpRequestAsync(authToken, "POST", "/ParseTorg12BuyerTitleXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseTovTorg551SellerTitleXmlAsync(byte[] xmlContent) { return ParseTovTorg551SellerTitleXmlAsync(null, xmlContent); @@ -46,6 +52,7 @@ public Task ParseTovTorg551SellerTitleXmlAsync(string au return PerformHttpRequestAsync(authToken, "POST", $"/ParseTorg12SellerTitleXml?documentVersion={DefaultDocumentVersions.TovTorg551}", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseTovTorg551BuyerTitleXmlAsync(byte[] xmlContent) { return ParseTovTorg551BuyerTitleXmlAsync(null, xmlContent); @@ -56,6 +63,7 @@ public Task ParseTovTorg551BuyerTitleXmlAsync(string auth return PerformHttpRequestAsync(authToken, "POST", $"/ParseTorg12BuyerTitleXml?documentVersion={DefaultDocumentVersions.TovTorg551}", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseAcceptanceCertificateSellerTitleXmlAsync(byte[] xmlContent) { return ParseAcceptanceCertificateSellerTitleXmlAsync(null, xmlContent); @@ -66,6 +74,7 @@ public Task ParseAcceptanceCertificateSell return PerformHttpRequestAsync(authToken, "POST", "/ParseAcceptanceCertificateSellerTitleXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseAcceptanceCertificateBuyerTitleXmlAsync(byte[] xmlContent) { return ParseAcceptanceCertificateBuyerTitleXmlAsync(null, xmlContent); @@ -76,6 +85,7 @@ public Task ParseAcceptanceCertificateBuyer return PerformHttpRequestAsync(authToken, "POST", "/ParseAcceptanceCertificateBuyerTitleXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseAcceptanceCertificate552SellerTitleXmlAsync(byte[] xmlContent) { return ParseAcceptanceCertificate552SellerTitleXmlAsync(null, xmlContent); @@ -86,6 +96,7 @@ public Task ParseAcceptanceCertificate5 return PerformHttpRequestAsync(authToken, "POST", $"/ParseAcceptanceCertificateSellerTitleXml?documentVersion={DefaultDocumentVersions.AcceptanceCerttificate552}", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseAcceptanceCertificate552BuyerTitleXmlAsync(byte[] xmlContent) { return ParseAcceptanceCertificate552BuyerTitleXmlAsync(null, xmlContent); @@ -96,6 +107,7 @@ public Task ParseAcceptanceCertificate55 return PerformHttpRequestAsync(authToken, "POST", $"/ParseAcceptanceCertificateBuyerTitleXml?documentVersion={DefaultDocumentVersions.AcceptanceCerttificate552}", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseUniversalTransferDocumentSellerTitleXmlAsync(byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Utd) { return ParseUniversalTransferDocumentSellerTitleXmlAsync(null, xmlContent, documentVersion); @@ -108,6 +120,7 @@ public Task ParseUniversalTransferDocu return PerformHttpRequestAsync(authToken, "POST", query.BuildPathAndQuery(), xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseUniversalTransferDocumentBuyerTitleXmlAsync(byte[] xmlContent) { return ParseUniversalTransferDocumentBuyerTitleXmlAsync(null, xmlContent); @@ -118,6 +131,7 @@ public Task ParseUniversalTransferDocum return PerformHttpRequestAsync(authToken, "POST", "/ParseUniversalTransferDocumentBuyerTitleXml", xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseUniversalCorrectionDocumentSellerTitleXmlAsync(byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Ucd) { return ParseUniversalCorrectionDocumentSellerTitleXmlAsync(null, xmlContent, documentVersion); @@ -130,6 +144,7 @@ public Task ParseUniversalCorrection return PerformHttpRequestAsync(authToken, "POST", query.BuildPathAndQuery(), xmlContent); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseUniversalCorrectionDocumentBuyerTitleXmlAsync(byte[] xmlContent) { return ParseUniversalCorrectionDocumentBuyerTitleXmlAsync(null, xmlContent); diff --git a/src/DiadocHttpApi.Recognize.cs b/src/DiadocHttpApi.Recognize.cs index 3e6a3e6f..3285994f 100644 --- a/src/DiadocHttpApi.Recognize.cs +++ b/src/DiadocHttpApi.Recognize.cs @@ -1,4 +1,6 @@ -using System.Text; +using System; +using System.Text; +using Diadoc.Api.Constants; using Diadoc.Api.Proto; using Diadoc.Api.Proto.Recognition; @@ -19,6 +21,7 @@ public Recognized GetRecognized(string recognitionId) return PerformHttpRequest(null, "GET", queryString); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public RussianAddress ParseRussianAddress(string address) { return ParseRussianAddress(null, address); diff --git a/src/DiadocHttpApi.RecognizeAsync.cs b/src/DiadocHttpApi.RecognizeAsync.cs index 75017b44..68625d81 100644 --- a/src/DiadocHttpApi.RecognizeAsync.cs +++ b/src/DiadocHttpApi.RecognizeAsync.cs @@ -1,5 +1,7 @@ -using System.Text; +using System; +using System.Text; using System.Threading.Tasks; +using Diadoc.Api.Constants; using Diadoc.Api.Proto; using Diadoc.Api.Proto.Recognition; @@ -20,6 +22,7 @@ public Task GetRecognizedAsync(string recognitionId) return PerformHttpRequestAsync(null, "GET", queryString); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task ParseRussianAddressAsync(string address) { return ParseRussianAddressAsync(null, address); diff --git a/src/DiadocHttpApi.References.cs b/src/DiadocHttpApi.References.cs index 64f82535..382a3e19 100644 --- a/src/DiadocHttpApi.References.cs +++ b/src/DiadocHttpApi.References.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Diadoc.Api.Constants; using Diadoc.Api.Http; using Diadoc.Api.Proto; using Diadoc.Api.Proto.Certificates; @@ -47,6 +48,7 @@ public CertificateList GetMyCertificates(string authToken, string boxId) return PerformHttpRequest(authToken, "GET", queryBuilder.BuildPathAndQuery()); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public OrganizationList GetOrganizationsByInnKpp(string inn, string kpp, bool includeRelations = false) { return GetOrganizationsByInnKpp(null, inn, kpp, includeRelations); @@ -62,6 +64,7 @@ public OrganizationList GetOrganizationsByInnKpp(string authToken, string inn, s return PerformHttpRequest(authToken, "GET", qsb.BuildPathAndQuery()); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Organization GetOrganizationById(string orgId) { return GetOrganizationById(null, orgId); @@ -72,6 +75,7 @@ public Organization GetOrganizationById(string authToken, string orgId) return GetOrganization(authToken, string.Format("/GetOrganization?orgId={0}", orgId)); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Organization GetOrganizationByBoxId(string boxId) { return GetOrganizationByBoxId(null, boxId); @@ -82,6 +86,7 @@ public Organization GetOrganizationByBoxId(string authToken, string boxId) return GetOrganization(authToken, string.Format("/GetOrganization?boxId={0}", boxId)); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Organization GetOrganizationByFnsParticipantId(string fnsParticipantId) { return GetOrganizationByFnsParticipantId(null, fnsParticipantId); @@ -92,6 +97,7 @@ public Organization GetOrganizationByFnsParticipantId(string authToken, string f return GetOrganization(authToken, string.Format("/GetOrganization?fnsParticipantId={0}", fnsParticipantId)); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Organization GetOrganizationByInnKpp(string inn, string kpp) { return GetOrganizationByInnKpp(null, inn, kpp); @@ -112,6 +118,7 @@ private Organization GetOrganization(string authToken, string queryString) return PerformHttpRequest(authToken, "GET", queryString); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Box GetBox(string boxId) { return GetBox(null, boxId); @@ -149,6 +156,7 @@ public OrganizationUsersList GetOrganizationUsersV2(string authToken, string box return PerformHttpRequest(authToken, "GET", queryString); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public List GetOrganizationsByInnList(GetOrganizationsByInnListRequest innList) { return GetOrganizationsByInnList(null, innList); diff --git a/src/DiadocHttpApi.ReferencesAsync.cs b/src/DiadocHttpApi.ReferencesAsync.cs index 3e5fa491..12cac3eb 100644 --- a/src/DiadocHttpApi.ReferencesAsync.cs +++ b/src/DiadocHttpApi.ReferencesAsync.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Diadoc.Api.Constants; using Diadoc.Api.Http; using Diadoc.Api.Proto; using Diadoc.Api.Proto.Certificates; @@ -48,6 +49,7 @@ public Task GetMyCertificatesAsync(string authToken, string box return PerformHttpRequestAsync(authToken, "GET", queryBuilder.BuildPathAndQuery()); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task GetOrganizationsByInnKppAsync(string inn, string kpp, bool includeRelations = false) { return GetOrganizationsByInnKppAsync(null, inn, kpp, includeRelations); @@ -63,6 +65,7 @@ public Task GetOrganizationsByInnKppAsync(string authToken, st return PerformHttpRequestAsync(authToken, "GET", qsb.BuildPathAndQuery()); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task GetOrganizationByIdAsync(string orgId) { return GetOrganizationByIdAsync(null, orgId); @@ -73,6 +76,7 @@ public Task GetOrganizationByIdAsync(string authToken, string orgI return GetOrganizationAsync(authToken, $"/GetOrganization?orgId={orgId}"); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task GetOrganizationByBoxIdAsync(string boxId) { return GetOrganizationByBoxIdAsync(null, boxId); @@ -83,6 +87,7 @@ public Task GetOrganizationByBoxIdAsync(string authToken, string b return GetOrganizationAsync(authToken, $"/GetOrganization?boxId={boxId}"); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task GetOrganizationByFnsParticipantIdAsync(string fnsParticipantId) { return GetOrganizationByFnsParticipantIdAsync(null, fnsParticipantId); @@ -93,6 +98,7 @@ public Task GetOrganizationByFnsParticipantIdAsync(string authToke return GetOrganizationAsync(authToken, $"/GetOrganization?fnsParticipantId={fnsParticipantId}"); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task GetOrganizationByInnKppAsync(string inn, string kpp) { return GetOrganizationByInnKppAsync(null, inn, kpp); @@ -113,6 +119,7 @@ private Task GetOrganizationAsync(string authToken, string querySt return PerformHttpRequestAsync(authToken, "GET", queryString); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task GetBoxAsync(string boxId) { return GetBoxAsync(null, boxId); @@ -150,6 +157,7 @@ public Task GetOrganizationUsersV2Async(string authToken, return PerformHttpRequestAsync(authToken, "GET", queryString); } + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] public Task> GetOrganizationsByInnListAsync(GetOrganizationsByInnListRequest innList) { return GetOrganizationsByInnListAsync(null, innList); diff --git a/src/IDiadocApi.cs b/src/IDiadocApi.cs index 545960a2..6e6e4c81 100644 --- a/src/IDiadocApi.cs +++ b/src/IDiadocApi.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Net; using System.Security; +using Diadoc.Api.Constants; using Diadoc.Api.Proto; using Diadoc.Api.Proto.Docflow; using Diadoc.Api.Proto.Documents; @@ -61,17 +62,23 @@ public interface IDiadocApi string AuthenticateWithKeyConfirm(string thumbprint, string token, bool saveBinding = false); OrganizationUserPermissions GetMyPermissions(string authToken, string orgId); OrganizationList GetMyOrganizations(string authToken, bool autoRegister = true); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] OrganizationList GetOrganizationsByInnKpp(string inn, string kpp, bool includeRelations = false); OrganizationList GetOrganizationsByInnKpp(string authToken, string inn, string kpp, bool includeRelations = false); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Organization GetOrganizationById(string orgId); Organization GetOrganizationById(string authToken, string orgId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Organization GetOrganizationByBoxId(string boxId); Organization GetOrganizationByBoxId(string authToken, string boxId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Organization GetOrganizationByFnsParticipantId(string fnsParticipantId); Organization GetOrganizationByFnsParticipantId(string authToken, string fnsParticipantId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Organization GetOrganizationByInnKpp(string inn, string kpp); Organization GetOrganizationByInnKpp(string authToken, string inn, string kpp); RoamingOperatorList GetRoamingOperators(string authToken, string boxId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Box GetBox(string boxId); Box GetBox(string authToken, string boxId); Department GetDepartment(string authToken, string orgId, string departmentId); @@ -193,33 +200,47 @@ BoxCounteragentEventList GetCounteragentEvents( int? limit = null); string UploadFileToShelf(string authToken, byte[] data); byte[] GetFileFromShelf(string authToken, string nameOnShelf); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] RussianAddress ParseRussianAddress(string address); RussianAddress ParseRussianAddress(string authToken, string address); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] InvoiceInfo ParseInvoiceXml(byte[] invoiceXmlContent); InvoiceInfo ParseInvoiceXml(string authToken, byte[] invoiceXmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Torg12SellerTitleInfo ParseTorg12SellerTitleXml(byte[] xmlContent); Torg12SellerTitleInfo ParseTorg12SellerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Torg12BuyerTitleInfo ParseTorg12BuyerTitleXml(byte[] xmlContent); Torg12BuyerTitleInfo ParseTorg12BuyerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] TovTorgSellerTitleInfo ParseTovTorg551SellerTitleXml(byte[] xmlContent); TovTorgSellerTitleInfo ParseTovTorg551SellerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] TovTorgBuyerTitleInfo ParseTovTorg551BuyerTitleXml(byte[] xmlContent); TovTorgBuyerTitleInfo ParseTovTorg551BuyerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificateSellerTitleInfo ParseAcceptanceCertificateSellerTitleXml(byte[] xmlContent); AcceptanceCertificateSellerTitleInfo ParseAcceptanceCertificateSellerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificateBuyerTitleInfo ParseAcceptanceCertificateBuyerTitleXml(byte[] xmlContent); AcceptanceCertificateBuyerTitleInfo ParseAcceptanceCertificateBuyerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificate552SellerTitleInfo ParseAcceptanceCertificate552SellerTitleXml(byte[] xmlContent); AcceptanceCertificate552SellerTitleInfo ParseAcceptanceCertificate552SellerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] AcceptanceCertificate552BuyerTitleInfo ParseAcceptanceCertificate552BuyerTitleXml(byte[] xmlContent); AcceptanceCertificate552BuyerTitleInfo ParseAcceptanceCertificate552BuyerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalTransferDocumentSellerTitleInfo ParseUniversalTransferDocumentSellerTitleXml(byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Utd); UniversalTransferDocumentSellerTitleInfo ParseUniversalTransferDocumentSellerTitleXml(string authToken, byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Utd); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalTransferDocumentBuyerTitleInfo ParseUniversalTransferDocumentBuyerTitleXml(byte[] xmlContent); UniversalTransferDocumentBuyerTitleInfo ParseUniversalTransferDocumentBuyerTitleXml(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalCorrectionDocumentSellerTitleInfo ParseUniversalCorrectionDocumentSellerTitleXml(byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Ucd); UniversalCorrectionDocumentSellerTitleInfo ParseUniversalCorrectionDocumentSellerTitleXml(string authToken, byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Ucd); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] UniversalTransferDocumentBuyerTitleInfo ParseUniversalCorrectionDocumentBuyerTitleXml(byte[] xmlContent); UniversalTransferDocumentBuyerTitleInfo ParseUniversalCorrectionDocumentBuyerTitleXml(string authToken, byte[] xmlContent); @@ -235,11 +256,14 @@ byte[] ParseTitleXml( [Obsolete("Use GetOrganizationUsersV2()")] OrganizationUsersList GetOrganizationUsers(string authToken, string orgId); OrganizationUsersList GetOrganizationUsersV2(string authToken, string boxId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] List GetOrganizationsByInnList(GetOrganizationsByInnListRequest innList); List GetOrganizationsByInnList(string authToken, GetOrganizationsByInnListRequest innList); List GetOrganizationsByInnList(string authToken, string myOrgId, GetOrganizationsByInnListRequest innList); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] RevocationRequestInfo ParseRevocationRequestXml(byte[] revocationRequestXmlContent); RevocationRequestInfo ParseRevocationRequestXml(string authToken, byte[] revocationRequestXmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] SignatureRejectionInfo ParseSignatureRejectionXml(byte[] signatureRejectionXmlContent); SignatureRejectionInfo ParseSignatureRejectionXml(string authToken, byte[] signatureRejectionXmlContent); DocumentProtocolResult GenerateDocumentProtocol(string authToken, string boxId, string messageId, string documentId); @@ -376,17 +400,23 @@ Task AuthenticateWithKeyAsync(byte[] certificateBytes, bool useLocalSyst Task GetMyUserV2Async(string authToken); Task UpdateMyUserAsync(string authToken, UserToUpdate userToUpdate); Task GetMyCertificatesAsync(string authToken, string boxId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task GetOrganizationsByInnKppAsync(string inn, string kpp, bool includeRelations = false); Task GetOrganizationsByInnKppAsync(string authToken, string inn, string kpp, bool includeRelations = false); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task GetOrganizationByIdAsync(string orgId); Task GetOrganizationByIdAsync(string authToken, string orgId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task GetOrganizationByBoxIdAsync(string boxId); Task GetOrganizationByBoxIdAsync(string authToken, string boxId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task GetOrganizationByFnsParticipantIdAsync(string fnsParticipantId); Task GetOrganizationByFnsParticipantIdAsync(string authToken, string fnsParticipantId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task GetOrganizationByInnKppAsync(string inn, string kpp); Task GetOrganizationByInnKppAsync(string authToken, string inn, string kpp); Task GetRoamingOperatorsAsync(string authToken, string boxId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task GetBoxAsync(string boxId); Task GetBoxAsync(string authToken, string boxId); Task GetDepartmentAsync(string authToken, string orgId, string departmentId); @@ -544,33 +574,47 @@ Task GetCounteragentEventsAsync( int? limit = null); Task UploadFileToShelfAsync(string authToken, byte[] data); Task GetFileFromShelfAsync(string authToken, string nameOnShelf); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseRussianAddressAsync(string address); Task ParseRussianAddressAsync(string authToken, string address); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseInvoiceXmlAsync(byte[] invoiceXmlContent); Task ParseInvoiceXmlAsync(string authToken, byte[] invoiceXmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseTorg12SellerTitleXmlAsync(byte[] xmlContent); Task ParseTorg12SellerTitleXmlAsync(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseTorg12BuyerTitleXmlAsync(byte[] xmlContent); Task ParseTorg12BuyerTitleXmlAsync(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseTovTorg551SellerTitleXmlAsync(byte[] xmlContent); Task ParseTovTorg551SellerTitleXmlAsync(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseTovTorg551BuyerTitleXmlAsync(byte[] xmlContent); Task ParseTovTorg551BuyerTitleXmlAsync(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseAcceptanceCertificateSellerTitleXmlAsync(byte[] xmlContent); Task ParseAcceptanceCertificateSellerTitleXmlAsync(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseAcceptanceCertificateBuyerTitleXmlAsync(byte[] xmlContent); Task ParseAcceptanceCertificateBuyerTitleXmlAsync(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseAcceptanceCertificate552SellerTitleXmlAsync(byte[] xmlContent); Task ParseAcceptanceCertificate552SellerTitleXmlAsync(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseAcceptanceCertificate552BuyerTitleXmlAsync(byte[] xmlContent); Task ParseAcceptanceCertificate552BuyerTitleXmlAsync(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseUniversalTransferDocumentSellerTitleXmlAsync(byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Utd); Task ParseUniversalTransferDocumentSellerTitleXmlAsync(string authToken, byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Utd); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseUniversalTransferDocumentBuyerTitleXmlAsync(byte[] xmlContent); Task ParseUniversalTransferDocumentBuyerTitleXmlAsync(string authToken, byte[] xmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseUniversalCorrectionDocumentSellerTitleXmlAsync(byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Ucd); Task ParseUniversalCorrectionDocumentSellerTitleXmlAsync(string authToken, byte[] xmlContent, string documentVersion = DefaultDocumentVersions.Ucd); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseUniversalCorrectionDocumentBuyerTitleXmlAsync(byte[] xmlContent); Task ParseUniversalCorrectionDocumentBuyerTitleXmlAsync(string authToken, byte[] xmlContent); @@ -587,11 +631,14 @@ Task ParseTitleXmlAsync( Task GetOrganizationUsersAsync(string authToken, string orgId); Task GetOrganizationUsersV2Async(string authToken, string boxId); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task> GetOrganizationsByInnListAsync(GetOrganizationsByInnListRequest innList); Task> GetOrganizationsByInnListAsync(string authToken, GetOrganizationsByInnListRequest innList); Task> GetOrganizationsByInnListAsync(string authToken, string myOrgId, GetOrganizationsByInnListRequest innList); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseRevocationRequestXmlAsync(byte[] revocationRequestXmlContent); Task ParseRevocationRequestXmlAsync(string authToken, byte[] revocationRequestXmlContent); + [Obsolete(ObsoleteReasons.UseAuthTokenOverload)] Task ParseSignatureRejectionXmlAsync(byte[] signatureRejectionXmlContent); Task ParseSignatureRejectionXmlAsync(string authToken, byte[] signatureRejectionXmlContent); Task GenerateDocumentProtocolAsync(string authToken, string boxId, string messageId, string documentId); diff --git a/tests/AuthToken_Test.cs b/tests/AuthToken_Test.cs index e81b2dad..502722df 100644 --- a/tests/AuthToken_Test.cs +++ b/tests/AuthToken_Test.cs @@ -29,6 +29,27 @@ public void Every_api_method_has_overload_with_auth_token(Type clientType) Assert.That(counterpartWithToken, Is.Not.Null, () => $"Method doesn't have overload with authToken: {clientType}.{methodInfo.Name}"); } } + + [Test] + [TestCase(typeof(IDiadocApi))] + [TestCase(typeof(DiadocHttpApi))] + [TestCase(typeof(IDocflowApi))] + [TestCase(typeof(DiadocHttpApi.DocflowHttpApi))] + [TestCase(typeof(IComDiadocApi))] + public void Every_api_method_without_auth_token_is_marked_obsolete(Type clientType) + { + foreach (var methodInfo in ApiMethodsHelper.GetAllApiMethodsForType(clientType, ExceptMethods)) + { + var parameters = methodInfo.GetParameters(); + if (parameters.Any(x => (x.Name == "token" || x.Name == "authToken") && x.ParameterType == typeof(string))) + { + continue; + } + + var obsoleteAttribute = methodInfo.GetCustomAttributes(typeof(ObsoleteAttribute), true); + Assert.That(obsoleteAttribute, Is.Not.Null); + } + } private static readonly HashSet ExceptMethods = new HashSet {