#87 local copy of xsd files - try 1, posibility to disable XML valida…

…tion for AuthRequest
alapierre · Nov 17, 2023 · 8204542 · 8204542
1 parent 7c960d6
commit 8204542
Show file tree

Hide file tree

Showing 6 changed files with 604 additions and 3 deletions.
diff --git a/ksef-token-facade/src/main/java/io/alapierre/ksef/token/facade/KsefTokenFacade.java b/ksef-token-facade/src/main/java/io/alapierre/ksef/token/facade/KsefTokenFacade.java
@@ -10,6 +10,7 @@
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import lombok.val;
 import org.jetbrains.annotations.NotNull;
 import pl.gov.mf.ksef.schema.gtw.svc.online.auth.request._2021._10._01._0001.InitSessionTokenRequest;
 
@@ -29,6 +30,12 @@ public class KsefTokenFacade {
 
     private final InterfejsyInteraktywneSesjaApi api;
 
+    private boolean isSchemaValidationEnabled() {
+        val res = Boolean.parseBoolean(System.getProperty("io.alapierre.ksef.validateAuthRequestXML", "true"));
+        if (!res) log.info("AuthRequest XML validation is disabled");
+        return res;
+    }
+
     public InitSignedResponse authByToken(@NonNull Environment env, @NonNull String identifier, AuthorisationChallengeRequest.IdentifierType identifierType, @NotNull String token) throws ApiException, ParseException {
         AuthorisationChallengeResponse challengeResponse = api.authorisationChallengeCall(identifier, identifierType);
         log.debug("challengeResponse = {}", challengeResponse);
@@ -39,7 +46,7 @@ public InitSignedResponse authByToken(@NonNull Environment env, @NonNull String
         log.debug("Token request {}", request);
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         AuthTokenRequestSerializer serializer = new AuthTokenRequestSerializer();
-        serializer.toStream(request, os);
+        serializer.toStream(request, os, isSchemaValidationEnabled());
         return api.initSessionTokenCall(os.toByteArray());
     }
 

diff --git a/ksef-xml-model/pom.xml b/ksef-xml-model/pom.xml
@@ -56,6 +56,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <catalog>${basedir}/src/main/resources/catalog.cat</catalog>
                 </configuration>
                 <dependencies>
                     <dependency>

diff --git a/ksef-xml-model/src/main/resources/catalog.cat b/ksef-xml-model/src/main/resources/catalog.cat
@@ -0,0 +1,14 @@
+<!DOCTYPE catalog
+    PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+           "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+    <public
+        publicId="http://ksef.mf.gov.pl/schema/gtw/svc/types/2021/10/01/0001"
+        uri="gtwTypes.xsd"/>
+
+    <public
+        publicId="http://ksef.mf.gov.pl/schema/gtw/svc/online/types/2021/10/01/0001"
+        uri="onlineTypes.xsd"/>
+
+</catalog>