@nmshd/consumption 2.0.0 → 2.1.0

package/dist/buildInformation.js

@@ -6,10 +6,10 @@ const content_1 = require("@nmshd/content");
 const crypto_1 = require("@nmshd/crypto");
 const transport_1 = require("@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0",
-    build: "86",
-    date: "2022-10-24T08:29:10+00:00",
-    commit: "dcae87f31a2e5eafa046793eb2e8a0d5d09d9269",
+    version: "2.1.0",
+    build: "87",
+    date: "2022-11-15T15:01:11+00:00",
+    commit: "b00aba473f91b38ea2fca12ca29792af59ec0b95",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,

package/dist/modules/requests/itemProcessors/utility/validateQuery.js

@@ -5,11 +5,10 @@ const consumption_1 = require("../../../../consumption");
 const ValidationResult_1 = require("../ValidationResult");
 function validateQuery(query, sender, recipient) {
     if (query instanceof content_1.ThirdPartyRelationshipAttributeQuery) {
-        if (query.thirdParty.equals(sender)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the own address as third party."));
-        }
-        if (query.thirdParty.equals(recipient)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the recipient's address as third party."));
+        for (const thirdParty of query.thirdParty) {
+            const result = validateThirdParty(thirdParty, sender, recipient);
+            if (result.isError())
+                return result;
         }
         if (query.owner.equals(sender)) {
             return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query own Attributes from a third party."));
@@ -18,4 +17,13 @@ function validateQuery(query, sender, recipient) {
     return ValidationResult_1.ValidationResult.success();
 }
 exports.default = validateQuery;
+function validateThirdParty(thirdParty, sender, recipient) {
+    if (thirdParty.equals(sender)) {
+        return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the own address as third party."));
+    }
+    if (thirdParty.equals(recipient)) {
+        return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the recipient's address as third party."));
+    }
+    return ValidationResult_1.ValidationResult.success();
+}
 //# sourceMappingURL=validateQuery.js.map

package/dist/modules/requests/itemProcessors/utility/validateQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateQuery.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/utility/validateQuery.ts"],"names":[],"mappings":";;AAAA,4CAIuB;AAEvB,yDAAoD;AACpD,0DAAsD;AAEtD,SAAwB,aAAa,CACjC,KAAiG,EACjG,MAAmB,EACnB,SAAuB;IAEvB,IAAI,KAAK,YAAY,8CAAoC,EAAE;QACvD,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACjC,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,gEAAgE,CAAC,CAC3G,CAAA;SACJ;QAED,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YACpC,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAClC,wEAAwE,CAC3E,CACJ,CAAA;SACJ;QAED,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAC5B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,iDAAiD,CAAC,CAC5F,CAAA;SACJ;KACJ;IAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;AACrC,CAAC;AA5BD,gCA4BC"}
+{"version":3,"file":"validateQuery.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/utility/validateQuery.ts"],"names":[],"mappings":";;AAAA,4CAIuB;AAEvB,yDAAoD;AACpD,0DAAsD;AAEtD,SAAwB,aAAa,CACjC,KAAiG,EACjG,MAAmB,EACnB,SAAuB;IAEvB,IAAI,KAAK,YAAY,8CAAoC,EAAE;QACvD,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,UAAU,EAAE;YACvC,MAAM,MAAM,GAAG,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;YAChE,IAAI,MAAM,CAAC,OAAO,EAAE;gBAAE,OAAO,MAAM,CAAA;SACtC;QAED,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAC5B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,iDAAiD,CAAC,CAC5F,CAAA;SACJ;KACJ;IAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;AACrC,CAAC;AAnBD,gCAmBC;AAED,SAAS,kBAAkB,CAAC,UAAuB,EAAE,MAAmB,EAAE,SAAuB;IAC7F,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC3B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,gEAAgE,CAAC,CAC3G,CAAA;KACJ;IAED,IAAI,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC9B,OAAO,mCAAgB,CAAC,KAAK,CACzB,wBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAClC,wEAAwE,CAC3E,CACJ,CAAA;KACJ;IAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAA;AACrC,CAAC"}

package/lib-web/nmshd.consumption.js

@@ -17,10 +17,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0",
-    build: "86",
-    date: "2022-10-24T08:29:10+00:00",
-    commit: "dcae87f31a2e5eafa046793eb2e8a0d5d09d9269",
+    version: "2.1.0",
+    build: "87",
+    date: "2022-11-15T15:01:11+00:00",
+    commit: "b00aba473f91b38ea2fca12ca29792af59ec0b95",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -3361,11 +3361,10 @@ const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 function validateQuery(query, sender, recipient) {
     if (query instanceof content_1.ThirdPartyRelationshipAttributeQuery) {
-        if (query.thirdParty.equals(sender)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the own address as third party."));
-        }
-        if (query.thirdParty.equals(recipient)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the recipient's address as third party."));
+        for (const thirdParty of query.thirdParty) {
+            const result = validateThirdParty(thirdParty, sender, recipient);
+            if (result.isError())
+                return result;
         }
         if (query.owner.equals(sender)) {
             return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query own Attributes from a third party."));
@@ -3374,6 +3373,15 @@ function validateQuery(query, sender, recipient) {
     return ValidationResult_1.ValidationResult.success();
 }
 exports["default"] = validateQuery;
+function validateThirdParty(thirdParty, sender, recipient) {
+    if (thirdParty.equals(sender)) {
+        return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the own address as third party."));
+    }
+    if (thirdParty.equals(recipient)) {
+        return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the recipient's address as third party."));
+    }
+    return ValidationResult_1.ValidationResult.success();
+}
 //# sourceMappingURL=validateQuery.js.map
 
 /***/ }),