Merge pull request #944 from AsakyraZ/poa-for-prepare-documents-to-sign

Add PowerOfAttorney for PrepareDocumentsToSign and GenerateTitleXml methods
diadoc · Feb 10, 2022 · 13c90f8 · 13c90f8
2 parents e91c285 + ab09068
commit 13c90f8
Show file tree

Hide file tree

Showing 11 changed files with 152 additions and 40 deletions.
diff --git a/Samples/Diadoc.Console/Properties/AssemblyVersion.cs b/Samples/Diadoc.Console/Properties/AssemblyVersion.cs
@@ -6,6 +6,6 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("2.9.0.0")]
-[assembly: AssemblyFileVersion("2.9.23-dev")]
-[assembly: AssemblyInformationalVersion("2.9.23-dev")]
+[assembly: AssemblyFileVersion("2.9.25-dev")]
+[assembly: AssemblyInformationalVersion("2.9.25-dev")]
 
diff --git a/Samples/Diadoc.Samples/Properties/AssemblyVersion.cs b/Samples/Diadoc.Samples/Properties/AssemblyVersion.cs
@@ -6,6 +6,6 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("2.9.0.0")]
-[assembly: AssemblyFileVersion("2.9.23-dev")]
-[assembly: AssemblyInformationalVersion("2.9.23-dev")]
+[assembly: AssemblyFileVersion("2.9.25-dev")]
+[assembly: AssemblyInformationalVersion("2.9.25-dev")]
 
diff --git a/proto/Events/DiadocMessage-PostApi.proto b/proto/Events/DiadocMessage-PostApi.proto
@@ -14,7 +14,7 @@ import "Events/ResolutionInfo.proto";
 import "Events/ResolutionRequestInfo.proto";
 import "Invoicing/OrganizationInfo.proto";
 import "Docflow/DocumentInfo.proto";
-import "PowersOfAttorney/PowerOfAttorney.proto";
+import "Events/PowerOfAttorneyToPost.proto";
 
 package Diadoc.Api.Proto.Events;
 
@@ -586,8 +586,3 @@ message DocumentTransformation {
 	required string DocumentId = 1;
 	optional string CustomDocumentId = 2;
 }
-
-message PowerOfAttorneyToPost {
-    optional PowersOfAttorney.PowerOfAttorneyFullId FullId = 1;
-    required bool UseDefault = 2;
-}
diff --git a/proto/Events/PowerOfAttorneyToPost.proto b/proto/Events/PowerOfAttorneyToPost.proto
@@ -0,0 +1,8 @@
+import "PowersOfAttorney/PowerOfAttorney.proto";
+
+package Diadoc.Api.Proto.Events;
+
+message PowerOfAttorneyToPost {
+    optional PowersOfAttorney.PowerOfAttorneyFullId FullId = 1;
+    required bool UseDefault = 2;
+}
diff --git a/proto/Invoicing/ExtendedSigner.proto b/proto/Invoicing/ExtendedSigner.proto
@@ -1,10 +1,13 @@
+import "Events/PowerOfAttorneyToPost.proto";
+
 package Diadoc.Api.Proto.Invoicing.Signers;
 
 message ExtendedSigner {
 	optional string BoxId = 1;
 	optional bytes SignerCertificate = 2;
 	optional string SignerCertificateThumbprint = 3;
 	optional ExtendedSignerDetails SignerDetails = 4;
+	optional Events.PowerOfAttorneyToPost PowerOfAttorney = 5;
 }
 
 message ExtendedSignerDetails {

diff --git a/src/DataXml/CommonXmlNodes.cs b/src/DataXml/CommonXmlNodes.cs
@@ -678,6 +678,8 @@ public partial class SignerReference
 
 		private string certificateThumbprintField;
 
+		private PowerOfAttorney powerOfAttorneyField;
+
 		/// <remarks/>
 		[System.Xml.Serialization.XmlAttributeAttribute()]
 		public string BoxId
@@ -701,6 +703,84 @@ public string CertificateThumbprint
 			get { return this.certificateThumbprintField; }
 			set { this.certificateThumbprintField = value; }
 		}
+
+		/// <remarks/>
+		[System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+		public PowerOfAttorney PowerOfAttorney
+		{
+			get { return this.powerOfAttorneyField; }
+			set { this.powerOfAttorneyField = value; }
+		}
+	}
+
+	/// <remarks/>
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+	[System.SerializableAttribute()]
+	[System.Diagnostics.DebuggerStepThroughAttribute()]
+	[System.ComponentModel.DesignerCategoryAttribute("code")]
+	public partial class PowerOfAttorney
+	{
+		private PowerOfAttorneyFullId fullIdField;
+
+		private PowerOfAttorneyUseDefault useDefaultField;
+
+		/// <remarks/>
+		[System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+		public PowerOfAttorneyFullId FullId
+		{
+			get { return this.fullIdField; }
+			set { this.fullIdField = value; }
+		}
+
+		/// <remarks/>
+		[System.Xml.Serialization.XmlAttributeAttribute()]
+		public PowerOfAttorneyUseDefault UseDefault
+		{
+			get { return this.useDefaultField; }
+			set { this.useDefaultField = value; }
+		}
+	}
+
+	/// <remarks/>
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+	[System.SerializableAttribute()]
+	[System.Diagnostics.DebuggerStepThroughAttribute()]
+	[System.ComponentModel.DesignerCategoryAttribute("code")]
+	[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)]
+	public partial class PowerOfAttorneyFullId
+	{
+		private string registrationNumberField;
+
+		private string issuerInnField;
+
+		/// <remarks/>
+		[System.Xml.Serialization.XmlAttributeAttribute()]
+		public string RegistrationNumber
+		{
+			get { return this.registrationNumberField; }
+			set { this.registrationNumberField = value; }
+		}
+
+		/// <remarks/>
+		[System.Xml.Serialization.XmlAttributeAttribute()]
+		public string IssuerInn
+		{
+			get { return this.issuerInnField; }
+			set { this.issuerInnField = value; }
+		}
+	}
+
+	/// <remarks/>
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+	[System.SerializableAttribute()]
+	[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)]
+	public enum PowerOfAttorneyUseDefault
+	{
+		/// <remarks/>
+		@true,
+
+		/// <remarks/>
+		@false,
 	}
 
 	/// <remarks/>

diff --git a/src/Properties/AssemblyVersion.cs b/src/Properties/AssemblyVersion.cs
@@ -6,6 +6,6 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("2.9.0.0")]
-[assembly: AssemblyFileVersion("2.9.23-dev")]
-[assembly: AssemblyInformationalVersion("2.9.23-dev")]
+[assembly: AssemblyFileVersion("2.9.25-dev")]
+[assembly: AssemblyInformationalVersion("2.9.25-dev")]
 
diff --git a/src/Proto/Events/DiadocMessage-PostApi.proto.cs b/src/Proto/Events/DiadocMessage-PostApi.proto.cs
@@ -19,7 +19,7 @@
 // Note: requires additional types generated from: Events/ResolutionRequestInfo.proto
 // Note: requires additional types generated from: Invoicing/OrganizationInfo.proto
 // Note: requires additional types generated from: Docflow/DocumentInfo.proto
-// Note: requires additional types generated from: PowersOfAttorney/PowerOfAttorney.proto
+// Note: requires additional types generated from: Events/PowerOfAttorneyToPost.proto
 namespace Diadoc.Api.Proto.Events
 {
   [global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"MessageToPost")]
@@ -3534,32 +3534,6 @@ public string CustomDocumentId
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
   }
 
-  [global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"PowerOfAttorneyToPost")]
-  public partial class PowerOfAttorneyToPost : global::ProtoBuf.IExtensible
-  {
-    public PowerOfAttorneyToPost() {}
-
-
-    private Diadoc.Api.Proto.PowersOfAttorney.PowerOfAttorneyFullId _FullId = null;
-    [global::ProtoBuf.ProtoMember(1, IsRequired = false, Name=@"FullId", DataFormat = global::ProtoBuf.DataFormat.Default)]
-    [global::System.ComponentModel.DefaultValue(null)]
-    public Diadoc.Api.Proto.PowersOfAttorney.PowerOfAttorneyFullId FullId
-    {
-      get { return _FullId; }
-      set { _FullId = value; }
-    }
-    private bool _UseDefault;
-    [global::ProtoBuf.ProtoMember(2, IsRequired = true, Name=@"UseDefault", DataFormat = global::ProtoBuf.DataFormat.Default)]
-    public bool UseDefault
-    {
-      get { return _UseDefault; }
-      set { _UseDefault = value; }
-    }
-    private global::ProtoBuf.IExtension extensionObject;
-    global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
-      { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
-  }
-
     [global::ProtoBuf.ProtoContract(Name=@"CustomDataPatchOperation")]
     public enum CustomDataPatchOperation
     {

diff --git a/src/Proto/Events/PowerOfAttorneyToPost.proto.cs b/src/Proto/Events/PowerOfAttorneyToPost.proto.cs
@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+// Generated from: Events/PowerOfAttorneyToPost.proto
+// Note: requires additional types generated from: PowersOfAttorney/PowerOfAttorney.proto
+namespace Diadoc.Api.Proto.Events
+{
+  [global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"PowerOfAttorneyToPost")]
+  public partial class PowerOfAttorneyToPost : global::ProtoBuf.IExtensible
+  {
+    public PowerOfAttorneyToPost() {}
+
+
+    private Diadoc.Api.Proto.PowersOfAttorney.PowerOfAttorneyFullId _FullId = null;
+    [global::ProtoBuf.ProtoMember(1, IsRequired = false, Name=@"FullId", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    [global::System.ComponentModel.DefaultValue(null)]
+    public Diadoc.Api.Proto.PowersOfAttorney.PowerOfAttorneyFullId FullId
+    {
+      get { return _FullId; }
+      set { _FullId = value; }
+    }
+    private bool _UseDefault;
+    [global::ProtoBuf.ProtoMember(2, IsRequired = true, Name=@"UseDefault", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    public bool UseDefault
+    {
+      get { return _UseDefault; }
+      set { _UseDefault = value; }
+    }
+    private global::ProtoBuf.IExtension extensionObject;
+    global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
+      { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
+  }
+
+}
diff --git a/src/Proto/Invoicing/ExtendedSigner.cs b/src/Proto/Invoicing/ExtendedSigner.cs
@@ -1,4 +1,5 @@
 using System.Runtime.InteropServices;
+using Diadoc.Api.Proto.Events;
 
 namespace Diadoc.Api.Proto.Invoicing.Signers
 {
@@ -10,6 +11,7 @@ public interface IExtendedSigner
 		byte[] SignerCertificate { get; set; }
 		string SignerCertificateThumbprint { get; set; }
 		ExtendedSignerDetails SignerDetails { get; set; }
+		PowerOfAttorneyToPost PowerOfAttorney { get; set; }
 	}
 
 	[ComVisible(true)]

diff --git a/src/Proto/Invoicing/ExtendedSigner.proto.cs b/src/Proto/Invoicing/ExtendedSigner.proto.cs
@@ -8,6 +8,7 @@
 //------------------------------------------------------------------------------
 
 // Generated from: Invoicing/ExtendedSigner.proto
+// Note: requires additional types generated from: Events/PowerOfAttorneyToPost.proto
 namespace Diadoc.Api.Proto.Invoicing.Signers
 {
   [global::System.Serializable, global::ProtoBuf.ProtoContract(Name=@"ExtendedSigner")]
@@ -51,6 +52,15 @@ public Diadoc.Api.Proto.Invoicing.Signers.ExtendedSignerDetails SignerDetails
       get { return _SignerDetails; }
       set { _SignerDetails = value; }
     }
+
+    private Diadoc.Api.Proto.Events.PowerOfAttorneyToPost _PowerOfAttorney = null;
+    [global::ProtoBuf.ProtoMember(5, IsRequired = false, Name=@"PowerOfAttorney", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    [global::System.ComponentModel.DefaultValue(null)]
+    public Diadoc.Api.Proto.Events.PowerOfAttorneyToPost PowerOfAttorney
+    {
+      get { return _PowerOfAttorney; }
+      set { _PowerOfAttorney = value; }
+    }
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -374,4 +384,4 @@ public enum DocumentTitleType
       Ucd736Buyer = 11
     }
 
-}
+}