fix: add restrictions client tests

loopbackio · Apr 17, 2020 · 56067ba · 56067ba
1 parent 2c34d19
commit 56067ba
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 86 deletions.
diff --git a/src/parser/xmlHandler.js b/src/parser/xmlHandler.js
@@ -123,7 +123,10 @@ class XMLHandler {
         if (this.options.enforceRestrictions && descriptor.type) {
           const schema = this.schemas[descriptor.type.nsURI];
           if (schema) {
-            const type = schema.simpleTypes[descriptor.type.name];
+            let type = schema.simpleTypes[descriptor.type.name];
+            if (!type && descriptor.type.anonymous) {
+              type = descriptor.type.anonymous;
+            }
             if (type) {
               const restriction = type.restriction;
               if (restriction) {

diff --git a/src/parser/xsd/element.js b/src/parser/xsd/element.js
@@ -82,9 +82,18 @@ class Element extends XSDElement {
           }
           break;
         } else if (child instanceof SimpleType) {
+          child.$name = this.$name;
+          let typeQName = child.getQName();
+          var descriptor = this.descriptor =
+            new XSDElement.ElementDescriptor(qname, typeQName, form, isMany);
           descriptor.isSimple = true;
-          descriptor.jsType = child.jsType;
-          descriptor.type = child.type;
+          if (child.type && child.type.jsType) {
+            descriptor.jsType = child.type.jsType;
+          } else if (child.jsType) {
+            descriptor.jsType = child.jsType;
+          }
+          descriptor.type = typeQName;
+          descriptor.type.anonymous = child;
         }
       }
     }

diff --git a/test/client-restrictions-test.js b/test/client-restrictions-test.js
@@ -374,6 +374,24 @@ describe('SOAP Client', function() {
       }, 'http://' + hostname + ":" + server.address().port);
     });
 
+    it('should throw if the maxLength doesn\'t match its restriction in a private simple type', function (done) {
+      soap.createClient(__dirname + '/wsdl/restriction_anonymous_types.wsdl', { enforceRestrictions: true }, function (err, client) {
+        assert.equal(err, null);
+        try {
+          client.TestRestrictions({
+            RestrictionRequest: {
+              elementWithAnonymousType: 'abcdef'
+            }
+          }, function () {
+            done('It should have thrown error');
+          });
+        } catch (err) {
+          assert.equal(err.message, 'The field elementWithAnonymousType cannot have value abcdef due to the violations: ["length is bigger than maxLength (6 > 3)"]');
+          done();
+        }
+
+      }, 'http://' + hostname + ":" + server.address().port);
+    });
   });
 
 });
diff --git a/test/wsdl-test.js b/test/wsdl-test.js
diff --git a/test/wsdl/restriction_anonymous_types.wsdl b/test/wsdl/restriction_anonymous_types.wsdl
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  xmlns:tns="http://www.Restrictions.com"
+                  xmlns:n="http://www.Restriction.com/Types"
+                  xmlns:ns="http://schemas.xmlsoap.org/soap/encoding/"
+                  targetNamespace="http://www.Restrictions.com">
+    <wsdl:types>
+      <xsd:schema xmlns:tns="http://www.Restriction.com/Types"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.Restriction.com/Types"
+           elementFormDefault="qualified" attributeFormDefault="unqualified">
+        <xsd:complexType name="RestrictionRequestType">
+          <xsd:all>
+            <xsd:element type="xsd:string" name="stringElement"/>
+            <xsd:element name="elementWithAnonymousType">
+              <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                  <xsd:maxLength value="3"/>
+                </xsd:restriction>
+              </xsd:simpleType>
+            </xsd:element>
+          </xsd:all>
+        </xsd:complexType>
+        <xs:element name="RestrictionRequest" type="RestrictionRequestType"/>
+        <xs:element name="RestrictionResponse" type="RestrictionRequestType"/>
+      </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="RestrictionsRequest">
+        <wsdl:part name="RestrictionsRequest" element="n:RestrictionRequest"/>
+    </wsdl:message>
+    <wsdl:message name="RestrictionsResponse">
+        <wsdl:part name="RestrictionsResponse" element="n:RestrictionResponse"/>
+    </wsdl:message>
+    <wsdl:portType name="RestrictionsPortType">
+        <wsdl:operation name="TestRestrictions">
+            <wsdl:input message="tns:RestrictionsRequest"/>
+            <wsdl:output message="tns:RestrictionsResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="RestrictionsBinding" type="tns:RestrictionsPortType">
+        <soap:binding style="document"
+                      transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="TestRestrictions">
+            <soap:operation soapAction="http://www.Restrictions.com#Restrictions"
+                            style="document"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="RestrictionsService">
+        <wsdl:port name="RestrictionsPortType" binding="tns:RestrictionsBinding">
+            <soap:address location="http://www.Restrictions.com/"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/test/wsdl/restriction_types.xsd b/test/wsdl/restriction_types.xsd
@@ -94,9 +94,15 @@
             <xs:element name="enumeration1" type="EnumerationType"/>
             <xs:element name="enumeration2" type="EnumerationType"/>
             <xs:element name="enumeration3" type="EnumerationType"/>
+            <xs:element name="elementWithAnonymousType">
+              <xs:simpleType>
+                <xs:restriction base="xs:string">
+                  <xs:maxLength value="3"/>
+                </xs:restriction>
+              </xs:simpleType>
+            </xs:element>
         </xs:sequence>
     </xs:complexType>
     <xs:element name="RestrictionRequest" type="RestrictionRequestType"/>
     <xs:element name="RestrictionResponse" type="RestrictionRequestType"/>
 </xs:schema>
-
diff --git a/test/wsdl/simpleTypeTest.wsdl b/test/wsdl/simpleTypeTest.wsdl