From 372a383f8a56c6c1565e9d14d4423948cf391dfc Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Wed, 29 Apr 2026 08:38:36 +0100
Subject: [PATCH] Adding approver identity

---
 .../form1_additional_fields_request.xml       | 268 ++++++++++++++++++
 .../xsd/ts_104144_EPOCAdditionalInfo.xsd      |  14 +-
 2 files changed, 280 insertions(+), 2 deletions(-)
 create mode 100644 104144/examples/form1_additional_fields_request.xml

diff --git a/104144/examples/form1_additional_fields_request.xml b/104144/examples/form1_additional_fields_request.xml
new file mode 100644
index 0000000..d83263e
--- /dev/null
+++ b/104144/examples/form1_additional_fields_request.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation" xmlns:doc="http://uri.etsi.org/03120/common/2020/09/Document" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:notify="http://uri.etsi.org/03120/common/2016/02/Notification"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:epoc="http://uri.etsi.org/03120/common/2025/06/EPOCAdditionalInfo">
+    <Header>
+        <SenderIdentifier>
+            <CountryCode>DE</CountryCode>
+            <UniqueIdentifier>issuing-authority-1</UniqueIdentifier>
+        </SenderIdentifier>
+        <ReceiverIdentifier>
+            <CountryCode>IE</CountryCode>
+            <UniqueIdentifier>service-provider-1</UniqueIdentifier>
+        </ReceiverIdentifier>
+        <TransactionIdentifier>1a16df73-553f-46fb-8763-d7fc92d9a464</TransactionIdentifier>
+        <Timestamp>2026-04-28T14:53:46.000000+01:00</Timestamp>
+        <Version>
+            <ETSIVersion>V1.23.1</ETSIVersion>
+            <NationalProfileOwner>EU</NationalProfileOwner>
+            <NationalProfileVersion>v1.1.1</NationalProfileVersion>
+        </Version>
+    </Header>
+    <Payload>
+        <RequestPayload>
+            <ActionRequests>
+                <ActionRequest>
+                    <ActionIdentifier>0</ActionIdentifier>
+                    <CREATE>
+                        <HI1Object xsi:type="auth:AuthorisationObject">
+                            <ObjectIdentifier>34108ada-156a-46b9-ad79-6debd03a47ec</ObjectIdentifier>
+                            <!-- Country code of the Issuing Authority -->
+                            <CountryCode>DE</CountryCode>
+                            <!-- Unique identifier of the Issuing Authority in the DIS -->
+                            <OwnerIdentifier>issuing-authority-1</OwnerIdentifier>
+                            <auth:AuthorisationReference>EPOC-DE-IE-2025-05-20-0002-1</auth:AuthorisationReference>
+                            <auth:AuthorisationLegalType>
+                                <common:Owner>ETSI</common:Owner>
+                                <common:Name>EPOCLegalType</common:Name>
+                                <common:Value>EPOC</common:Value>
+                            </auth:AuthorisationLegalType>
+                            <auth:AuthorisationPriority>
+                                <common:Owner>ETSI</common:Owner>
+                                <common:Name>EPOCPriority</common:Name>
+                                <common:Value>TenDaysASAP</common:Value>
+                            </auth:AuthorisationPriority>
+                            <auth:AuthorisationDesiredStatus>
+                                <common:Owner>ETSI</common:Owner>
+                                <common:Name>AuthorisationDesiredSatus</common:Name>
+                                <common:Value>SubmittedToCSP</common:Value>
+                            </auth:AuthorisationDesiredStatus>
+                            <auth:AuthorisationCSPID>
+                                <auth:CSPID>
+                                    <CountryCode>IE</CountryCode>
+                                    <UniqueIdentifier>service-provider-1</UniqueIdentifier>
+                                </auth:CSPID>
+                            </auth:AuthorisationCSPID>
+                            <!-- Details of the Issuing Authority -->
+                            <auth:AuthorisationApprovalDetails>
+                                <common:ApprovalType>IssuingAuthority</common:ApprovalType>
+                                <common:ApprovalReference>IA Approval Reference</common:ApprovalReference>
+                                <common:ApproverDetails>
+                                    <common:ApproverName>Issuing Authority</common:ApproverName>
+                                    <common:ApproverRole>PublicProsecutor</common:ApproverRole>
+                                    <common:ApproverIdentity>
+                                        <common:NationalApproverIdentity xsi:type="epoc:EPOCApproverIdentity">
+                                            <common:CountryCode>EU</common:CountryCode>
+                                            <epoc:ApproverEndpointID>
+                                                <CountryCode>DE</CountryCode>
+                                                <UniqueIdentifier>issuing-authority-1</UniqueIdentifier>
+                                            </epoc:ApproverEndpointID>
+                                        </common:NationalApproverIdentity>
+                                    </common:ApproverIdentity>
+                                    <common:ApproverContactDetails>
+                                        <common:Name>Name of IA official</common:Name>
+                                        <common:Role>Role of IA official</common:Role>
+                                        <common:EmailAddress>issuing_authority@example.org</common:EmailAddress>
+                                        <common:PhoneNumber>33199000000</common:PhoneNumber>
+                                        <common:FaxNumber>33199000001</common:FaxNumber>
+                                        <common:Address>Address of IA</common:Address>
+                                        <common:Languages>
+                                            <common:ISO639Set1LanguageIdentifier>de</common:ISO639Set1LanguageIdentifier>
+                                        </common:Languages>
+                                        <common:Languages>
+                                            <common:ISO639Set1LanguageIdentifier>en</common:ISO639Set1LanguageIdentifier>
+                                        </common:Languages>
+                                    </common:ApproverContactDetails>
+                                    <common:ApproverContactDetails>
+                                        <common:Name>Issuing Authority Point of Contact</common:Name>
+                                        <common:Role>Point of Contact</common:Role>
+                                        <common:EmailAddress>issuing_authority_poc@example.org</common:EmailAddress>
+                                        <common:PhoneNumber>33199000002</common:PhoneNumber>
+                                        <common:FaxNumber>33199000003</common:FaxNumber>
+                                        <common:Address>Point of contact address</common:Address>
+                                    </common:ApproverContactDetails>
+                                </common:ApproverDetails>
+                                <common:ApprovalTimestamp>2025-05-30T00:00:00+01:00</common:ApprovalTimestamp>
+                                <common:ApprovalIsEmergency>false</common:ApprovalIsEmergency>
+                            </auth:AuthorisationApprovalDetails>
+                            <!-- Details of the Validating Authority -->
+                            <auth:AuthorisationApprovalDetails>
+                                <common:ApprovalType>ValidatingAuthority</common:ApprovalType>
+                                <common:ApprovalReference>Validating Authority Reference</common:ApprovalReference>
+                                <common:ApproverDetails>
+                                    <common:ApproverName>Validating Authority</common:ApproverName>
+                                    <common:ApproverRole>PublicProsecutor</common:ApproverRole>
+                                    <common:ApproverContactDetails>
+                                        <common:Name>Name of Validating Authority</common:Name>
+                                        <common:Role>Role of VA official</common:Role>
+                                        <common:EmailAddress>validating_authority@example.org</common:EmailAddress>
+                                        <common:PhoneNumber>33199000004</common:PhoneNumber>
+                                        <common:FaxNumber>33199000005</common:FaxNumber>
+                                        <common:Address>Address of Validating Authority</common:Address>
+                                        <common:Languages>
+                                            <common:ISO639Set1LanguageIdentifier>de</common:ISO639Set1LanguageIdentifier>
+                                        </common:Languages>
+                                        <common:Languages>
+                                            <common:ISO639Set1LanguageIdentifier>nl</common:ISO639Set1LanguageIdentifier>
+                                        </common:Languages>
+                                    </common:ApproverContactDetails>
+                                </common:ApproverDetails>
+                                <common:ApprovalTimestamp>2025-08-30T00:00:00+01:00</common:ApprovalTimestamp>
+                            </auth:AuthorisationApprovalDetails>
+                            <auth:AuthorisationFlags>
+                                <auth:AuthorisationFlag>
+                                    <common:Owner>ETSI</common:Owner>
+                                    <common:Name>EPOCAuthorisationFlag</common:Name>
+                                    <common:Value>DelayInformingUser</common:Value>
+                                </auth:AuthorisationFlag>
+                                <auth:AuthorisationFlag>
+                                    <common:Owner>ETSI</common:Owner>
+                                    <common:Name>EPOCAuthorisationFlag</common:Name>
+                                    <common:Value>EnforcingAuthorityNotified</common:Value>
+                                </auth:AuthorisationFlag>
+                            </auth:AuthorisationFlags>
+                            <auth:NationalAuthorisationParameters xsi:type="epoc:EPOCAuthorisationParameters">
+                                <auth:CountryCode>EU</auth:CountryCode>
+                                <epoc:UnderlyingConditions>
+                                    <epoc:UnderlyingConditions>
+                                        <epoc:UnderlyingCondition>
+                                            <common:Owner>ETSI</common:Owner>
+                                            <common:Name>EPOCUnderlyingCondition</common:Name>
+                                            <common:Value>CriminalProceedingsOffense</common:Value>
+                                        </epoc:UnderlyingCondition>
+                                    </epoc:UnderlyingConditions>
+                                    <epoc:OffenseClassification></epoc:OffenseClassification>
+                                    <epoc:AdditionalUnderlyingConditionsInformation>Additional free text about underlying conditions</epoc:AdditionalUnderlyingConditionsInformation>
+                                </epoc:UnderlyingConditions>
+                            </auth:NationalAuthorisationParameters>
+                            <auth:AuthorisationLegalEntity>Service Provider 1</auth:AuthorisationLegalEntity>
+                        </HI1Object>
+                    </CREATE>
+                </ActionRequest>
+                <ActionRequest>
+                    <ActionIdentifier>1</ActionIdentifier>
+                    <CREATE>
+                        <HI1Object xsi:type="task:LDTaskObject">
+                            <ObjectIdentifier>0728fe0c-05c6-4457-980f-6115dbf767d4</ObjectIdentifier>
+                            <CountryCode>IE</CountryCode>
+                            <OwnerIdentifier>issuing-authority-1</OwnerIdentifier>
+                            <AssociatedObjects>
+                                <AssociatedObject>34108ada-156a-46b9-ad79-6debd03a47ec</AssociatedObject>
+                            </AssociatedObjects>
+                            <task:Reference>IE-service-provider-1-34108ada-156a-46b9-ad79-6debd03a47ec-1</task:Reference>
+                            <task:DesiredStatus>
+                                <common:Owner>ETSI</common:Owner>
+                                <common:Name>LDTaskDesiredStatus</common:Name>
+                                <common:Value>AwaitingDisclosure</common:Value>
+                            </task:DesiredStatus>
+                            <task:RequestDetails>
+                                <task:Type>
+                                    <common:Owner>ETSI</common:Owner>
+                                    <common:Name>RequestType</common:Name>
+                                    <common:Value>SubscriberData</common:Value>
+                                </task:Type>
+                                <task:StartTime>2026-01-26T23:03:00+01:00</task:StartTime>
+                                <task:EndTime>2026-02-27T23:03:00+01:00</task:EndTime>
+                                <task:RequestValues>
+                                    <task:RequestValue>
+                                        <task:FormatType>
+                                            <task:FormatOwner>ETSI</task:FormatOwner>
+                                            <task:FormatName>InternationalE164</task:FormatName>
+                                        </task:FormatType>
+                                        <task:Value>9995550123</task:Value>
+                                    </task:RequestValue>
+                                </task:RequestValues>
+                                <task:Subtype>
+                                    <task:RequestSubtype>
+                                        <common:Owner>ETSI</common:Owner>
+                                        <common:Name>EPOCRequestSubtype</common:Name>
+                                        <common:Value>UserInformation</common:Value>
+                                    </task:RequestSubtype>
+                                    <task:RequestSubtype>
+                                        <common:Owner>ETSI</common:Owner>
+                                        <common:Name>EPOCRequestSubtype</common:Name>
+                                        <common:Value>RegistrationInformation</common:Value>
+                                    </task:RequestSubtype>
+                                </task:Subtype>
+                            </task:RequestDetails>
+                            <task:DeliveryDetails>
+                                <task:LDDeliveryDestination>
+                                    <task:DeliveryAddress>
+                                        <task:EndpointID>
+                                            <CountryCode>DE</CountryCode>
+                                            <UniqueIdentifier>issuing-authority-1</UniqueIdentifier>
+                                        </task:EndpointID>
+                                    </task:DeliveryAddress>
+                                    <task:LDDeliveryProfile>
+                                        <common:Owner>ETSI</common:Owner>
+                                        <common:Name>EPOCDeliveryProfile</common:Name>
+                                        <common:Value>IssuingAuthority</common:Value>
+                                    </task:LDDeliveryProfile>
+                                </task:LDDeliveryDestination>
+                                <task:LDDeliveryDestination>
+                                    <task:DeliveryAddress>
+                                        <task:EndpointID>
+                                            <CountryCode>FR</CountryCode>
+                                            <UniqueIdentifier>epoc-authority-1</UniqueIdentifier>
+                                        </task:EndpointID>
+                                    </task:DeliveryAddress>
+                                    <task:LDDeliveryProfile>
+                                        <common:Owner>ETSI</common:Owner>
+                                        <common:Name>EPOCDeliveryProfile</common:Name>
+                                        <common:Value>ValidatingAuthority</common:Value>
+                                    </task:LDDeliveryProfile>
+                                </task:LDDeliveryDestination>
+                            </task:DeliveryDetails>
+                            <task:Deadlines>
+                                <task:LDDeadline>
+                                    <task:DateTime>2026-01-01T00:00:00Z</task:DateTime>
+                                    <task:NatureOfDeadline>
+                                        <common:Owner>ETSI</common:Owner>
+                                        <common:Name>LDNatureOfDeadline</common:Name>
+                                        <common:Value>OtherDeadline</common:Value>
+                                    </task:NatureOfDeadline>
+                                    <task:OtherInformation>
+                                        An example of an additional deadline from Form 1 Section C,
+                                        distinct from the delivery deadline which is encoded using
+                                        the Authorisation priority.
+                                    </task:OtherInformation>
+                                </task:LDDeadline>
+                            </task:Deadlines>
+                        </HI1Object>
+                    </CREATE>
+                </ActionRequest>
+                <ActionRequest>
+                    <ActionIdentifier>3</ActionIdentifier>
+                    <CREATE>
+                        <HI1Object xsi:type="doc:DocumentObject">
+                            <ObjectIdentifier>f193c116-5aca-441c-8949-8c58074365f9</ObjectIdentifier>
+                            <CountryCode>IE</CountryCode>
+                            <OwnerIdentifier>service-provider-1</OwnerIdentifier>
+                            <AssociatedObjects>
+                                <AssociatedObject>34108ada-156a-46b9-ad79-6debd03a47ec</AssociatedObject>
+                            </AssociatedObjects>
+                            <doc:DocumentName>EPOC/EPOC-PR Form</doc:DocumentName>
+                            <doc:DocumentType>
+                                <common:Owner>ETSI</common:Owner>
+                                <common:Name>EPOCDocumentType</common:Name>
+                                <common:Value>Form1</common:Value>
+                            </doc:DocumentType>
+                            <doc:DocumentBody>
+                                <doc:Contents>RVBPQy9FUE9DLVBSIEZvcm0=</doc:Contents>
+                                <doc:ContentType>text/plain</doc:ContentType>
+                            </doc:DocumentBody>
+                        </HI1Object>
+                    </CREATE>
+                </ActionRequest>
+            </ActionRequests>
+        </RequestPayload>
+    </Payload>
+</HI1Message>
\ No newline at end of file
diff --git a/104144/schema/xsd/ts_104144_EPOCAdditionalInfo.xsd b/104144/schema/xsd/ts_104144_EPOCAdditionalInfo.xsd
index 3c80744..22d6dbd 100644
--- a/104144/schema/xsd/ts_104144_EPOCAdditionalInfo.xsd
+++ b/104144/schema/xsd/ts_104144_EPOCAdditionalInfo.xsd
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" xmlns="http://uri.etsi.org/03120/common/2025/06/EPOCAdditionalInfo" targetNamespace="http://uri.etsi.org/03120/common/2025/06/EPOCAdditionalInfo" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation" xmlns="http://uri.etsi.org/03120/common/2025/06/EPOCAdditionalInfo" targetNamespace="http://uri.etsi.org/03120/common/2025/06/EPOCAdditionalInfo" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core"/>
     <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>
     <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+    <xs:import namespace="http://uri.etsi.org/03120/common/2020/09/Authorisation"/>
     <xs:complexType name="EPOCAdditionalInfo">
         <xs:complexContent>
             <xs:extension base="core:HI1Object">
@@ -19,7 +20,7 @@
     </xs:complexType>
     <xs:complexType name="EPOCAuthorisationParameters">
         <xs:complexContent>
-            <xs:extension base="core:HI1Object">
+            <xs:extension base="auth:NationalAuthorisationParameters">
                 <xs:sequence>
                     <xs:element name="UnderlyingConditions" type="UnderlyingConditions" minOccurs="0"/>
                     <xs:element name="RelatedRequestDetails" type="RelatedRequestDetails" minOccurs="0"/>
@@ -69,4 +70,13 @@
             <xs:element name="FileNumber" type="etsi:LongString" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
+    <xs:complexType name="EPOCApproverIdentity">
+        <xs:complexContent>
+            <xs:extension base="common:NationalApproverIdentity">
+                <xs:sequence>
+                    <xs:element name="ApproverEndpointID" type="core:EndpointID" minOccurs="0"/>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>
\ No newline at end of file
-- 
GitLab