@nmshd/consumption 1.0.9 → 1.0.13

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: "1.0.9",
-    build: "11",
-    date: "2021-12-21T13:20:41+00:00",
-    commit: "8c9ee503dff9ab6d92e5c9316a2e1bc94308a719",
+    version: "1.0.13",
+    build: "15",
+    date: "2022-01-25T16:43:54+00:00",
+    commit: "156f0241ed8ffd6909131950abd43936f263fa62",
     dependencies: {},
     libraries: {
         transport: transport_1.buildInformation,

package/dist/modules/relationships/RelationshipInfoController.js

@@ -18,13 +18,21 @@ class RelationshipInfoController extends consumption_1.ConsumptionBaseController
         return result ? await RelationshipInfo_1.RelationshipInfo.from(result) : undefined;
     }
     async getRelationshipInfoByRelationship(relationshipId) {
-        const result = await this.relationshipInfo.findOne({ relationshipId: relationshipId.toString() });
-        if (result) {
-            return await RelationshipInfo_1.RelationshipInfo.from(result);
-        }
         const info = await new RelationshipInfoUtil_1.RelationshipInfoUtil(this.parent).createInitialRelationshipInfo(relationshipId);
-        await this.relationshipInfo.create(info);
         return info;
+        /*
+        // So far, do not store the relationshipInfo, as they wouldn't be updated correctly
+
+        const result = await this.relationshipInfo.findOne({ relationshipId: relationshipId.toString() })
+
+        if (result) {
+            return await RelationshipInfo.from(result)
+        }
+
+        const info = await new RelationshipInfoUtil(this.parent).createInitialRelationshipInfo(relationshipId)
+        await this.relationshipInfo.create(info)
+        return info
+        */
     }
     async getRelationshipInfos(query) {
         const items = await this.relationshipInfo.find(query);

package/dist/modules/relationships/RelationshipInfoController.js.map

@@ -1 +1 @@
-{"version":3,"file":"RelationshipInfoController.js","sourceRoot":"","sources":["../../../src/modules/relationships/RelationshipInfoController.ts"],"names":[],"mappings":";;;AACA,mDAA2G;AAE3G,+DAA2D;AAC3D,iEAA6D;AAE7D,MAAa,0BAA2B,SAAQ,uCAAyB;IAGrE,YAAmB,MAA6B;QAC5C,KAAK,CAAC,uCAAyB,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAA;IACvE,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,IAAI,CAAC,gBAAgB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,CAAA;QACzG,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,EAAU;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC9D,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,mCAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACnE,CAAC;IAEM,KAAK,CAAC,iCAAiC,CAAC,cAAsB;QACjE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QAEjG,IAAI,MAAM,EAAE;YACR,OAAO,MAAM,mCAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;SAC7C;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,2CAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAA;QACtG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACxC,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,KAAW;QACzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACrD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAmB,KAAK,EAAE,mCAAgB,CAAC,CAAA;IAC3E,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,gBAAgB,CAAC,cAAc,EAAE,CAAC,CAAA;QACtG,IAAI,MAAM,EAAE;YACR,MAAM,+BAAiB,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAA;SAC9G;QAED,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QACpD,OAAO,gBAAgB,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5F,IAAI,CAAC,mBAAmB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;SAChD;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAA;IAC7E,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACxD,CAAC;CACJ;AAzDD,gEAyDC"}
+{"version":3,"file":"RelationshipInfoController.js","sourceRoot":"","sources":["../../../src/modules/relationships/RelationshipInfoController.ts"],"names":[],"mappings":";;;AACA,mDAA2G;AAE3G,+DAA2D;AAC3D,iEAA6D;AAE7D,MAAa,0BAA2B,SAAQ,uCAAyB;IAGrE,YAAmB,MAA6B;QAC5C,KAAK,CAAC,uCAAyB,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAA;IACvE,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,IAAI,CAAC,gBAAgB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,CAAA;QACzG,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,EAAU;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC9D,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,mCAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACnE,CAAC;IAEM,KAAK,CAAC,iCAAiC,CAAC,cAAsB;QACjE,MAAM,IAAI,GAAG,MAAM,IAAI,2CAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAA;QACtG,OAAO,IAAI,CAAA;QACX;;;;;;;;;;;;UAYE;IACN,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,KAAW;QACzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACrD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAmB,KAAK,EAAE,mCAAgB,CAAC,CAAA;IAC3E,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,gBAAgB,CAAC,cAAc,EAAE,CAAC,CAAA;QACtG,IAAI,MAAM,EAAE;YACR,MAAM,+BAAiB,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAA;SAC9G;QAED,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QACpD,OAAO,gBAAgB,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5F,IAAI,CAAC,mBAAmB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;SAChD;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAA;IAC7E,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACxD,CAAC;CACJ;AA/DD,gEA+DC"}

package/dist/modules/relationships/RelationshipInfoUtil.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelationshipInfoUtil = void 0;
+const ts_serval_1 = require("@js-soft/ts-serval");
 const content_1 = require("@nmshd/content");
 const transport_1 = require("@nmshd/transport");
 const consumption_1 = require("../../consumption");
@@ -20,13 +21,7 @@ class RelationshipInfoUtil {
         if (!relationship) {
             throw transport_1.TransportErrors.general.recordNotFound(transport_1.Relationship, id.toString()).logWith(this._log);
         }
-        const template = await this.parent.accountController.relationshipTemplates.getRelationshipTemplate(relationship.cache.template.id);
-        if (!template) {
-            throw transport_1.TransportErrors.general
-                .recordNotFound(transport_1.RelationshipTemplate, relationship.cache.template.id.toString())
-                .logWith(this._log);
-        }
-        await this.parseTemplateBody(relationship, template);
+        await this.parseTemplateBody(relationship);
         await this.parseCreationRequest(relationship);
         return await this.createRelationshipInfo(relationship);
     }
@@ -62,14 +57,14 @@ class RelationshipInfoUtil {
     async createRelationshipInfo(relationship) {
         const peerAddress = relationship.peer.address;
         const truncatedAddress = peerAddress.address.substring(3, 9);
-        let info = await RelationshipInfo_1.RelationshipInfo.from({
+        const info = await RelationshipInfo_1.RelationshipInfo.from({
             attributes: [],
             id: await consumption_1.ConsumptionIds.relationshipInfo.generate(),
             isPinned: false,
             relationshipId: relationship.id,
             title: truncatedAddress
         });
-        info = await this.parent.relationshipInfo.createRelationshipInfo(info);
+        // info = await this.parent.relationshipInfo.createRelationshipInfo(info)
         const items = await this.parent.sharedItems.getSharedItems({
             sharedBy: relationship.peer.address.toString()
         });
@@ -89,75 +84,135 @@ class RelationshipInfoUtil {
         info.attributes = attributes;
         const title = this.getTitle(relationship, attributeMap);
         info.title = title;
-        await this.parent.relationshipInfo.updateRelationshipInfo(info);
+        // await this.parent.relationshipInfo.updateRelationshipInfo(info)
         return info;
     }
-    async parseTemplateBody(relationship, template) {
+    async parseTemplateBody(relationship) {
+        const template = relationship.cache.template;
         if (!template.cache) {
             throw transport_1.TransportErrors.general.cacheEmpty(transport_1.RelationshipTemplate, template.id.toString()).logWith(this._log);
         }
+        const body = template.cache.content;
         const isTemplator = this.parent.accountController.identity.isMe(template.cache.createdBy);
-        if (template.cache.content instanceof content_1.RelationshipTemplateBody) {
-            const body = template.cache.content;
+        const sharedAt = template.cache.createdAt;
+        const sharedBy = isTemplator ? this.parent.accountController.identity.address : relationship.peer.address;
+        const sharedWith = isTemplator ? relationship.peer.address : this.parent.accountController.identity.address;
+        const sharedItemsWithSameReference = await this.parent.sharedItems.getSharedItems({
+            reference: template.id.toString()
+        });
+        const missingItems = [];
+        if (body instanceof content_1.RelationshipTemplateBody) {
             const attributes = body.sharedAttributes;
             if (attributes) {
-                const sharedAt = template.cache.createdAt;
-                const sharedBy = isTemplator
-                    ? this.parent.accountController.identity.address
-                    : relationship.peer.address;
-                const sharedWith = isTemplator
-                    ? relationship.peer.address
-                    : this.parent.accountController.identity.address;
-                for (const attribute of attributes) {
-                    const sharedItem = await SharedItem_1.SharedItem.from({
-                        id: await consumption_1.ConsumptionIds.sharedItem.generate(),
-                        content: attribute,
-                        sharedAt: sharedAt,
-                        sharedBy: sharedBy,
-                        sharedWith: sharedWith,
-                        reference: template.id,
-                        expiresAt: attribute.validTo
+                if (sharedItemsWithSameReference.length !== attributes.length) {
+                    attributes.forEach((attribute) => {
+                        if (!sharedItemsWithSameReference.find(function (item) {
+                            const content = item.content;
+                            return content.name === attribute.name;
+                        })) {
+                            missingItems.push(attribute);
+                        }
                     });
-                    await this.parent.sharedItems.createSharedItem(sharedItem);
                 }
             }
         }
+        else {
+            // Try to parse the old template format (without types)
+            let oldTemplateBody = body;
+            if (body instanceof ts_serval_1.JSONWrapper || body instanceof ts_serval_1.JSONWrapperAsync) {
+                oldTemplateBody = oldTemplateBody.value;
+            }
+            if ((oldTemplateBody === null || oldTemplateBody === void 0 ? void 0 : oldTemplateBody.attributes) && Array.isArray(oldTemplateBody.attributes)) {
+                if (sharedItemsWithSameReference.length !== oldTemplateBody.attributes.length) {
+                    oldTemplateBody.attributes.forEach((attribute) => {
+                        if (!sharedItemsWithSameReference.find(function (item) {
+                            const content = item.content;
+                            return content.name === attribute.name;
+                        })) {
+                            missingItems.push(content_1.Attribute.from({
+                                name: attribute.name,
+                                value: attribute.value
+                            }));
+                        }
+                    });
+                }
+            }
+        }
+        for (const attribute of missingItems) {
+            const sharedItem = await SharedItem_1.SharedItem.from({
+                id: await consumption_1.ConsumptionIds.sharedItem.generate(),
+                content: attribute,
+                sharedAt: sharedAt,
+                sharedBy: sharedBy,
+                sharedWith: sharedWith,
+                reference: template.id,
+                expiresAt: attribute.validTo
+            });
+            await this.parent.sharedItems.createSharedItem(sharedItem);
+        }
     }
     async parseCreationRequest(relationship) {
-        const request = relationship.cache.creationChange.request;
-        if (!request.content) {
-            const error = new Error("error.consumption.noRequestContent");
-            this._log.error(error);
-            throw error;
-        }
+        const change = relationship.cache.creationChange;
+        const request = change.request;
+        const body = request.content;
         const isRequestor = this.parent.accountController.identity.isMe(request.createdBy);
-        if (request.content instanceof content_1.RelationshipCreationChangeRequestBody) {
-            const body = request.content;
+        const sharedAt = request.createdAt;
+        const sharedBy = isRequestor ? this.parent.accountController.identity.address : relationship.peer.address;
+        const sharedWith = isRequestor ? relationship.peer.address : this.parent.accountController.identity.address;
+        const sharedItemsWithSameReference = await this.parent.sharedItems.getSharedItems({
+            reference: change.id.toString()
+        });
+        const missingItems = [];
+        if (body instanceof content_1.RelationshipCreationChangeRequestBody) {
             const attributes = body.sharedAttributes;
-            if (attributes) {
-                const sharedAt = request.createdAt;
-                const sharedBy = isRequestor
-                    ? this.parent.accountController.identity.address
-                    : relationship.peer.address;
-                const sharedWith = isRequestor
-                    ? relationship.peer.address
-                    : this.parent.accountController.identity.address;
-                for (const attribute of attributes) {
-                    const sharedItem = await SharedItem_1.SharedItem.from({
-                        id: await consumption_1.ConsumptionIds.sharedItem.generate(),
-                        content: attribute,
-                        sharedAt: sharedAt,
-                        sharedBy: sharedBy,
-                        sharedWith: sharedWith,
-                        reference: relationship.id,
-                        expiresAt: attribute.validTo
+            if (attributes && attributes.length > 0) {
+                if (sharedItemsWithSameReference.length !== attributes.length) {
+                    attributes.forEach((attribute) => {
+                        if (!sharedItemsWithSameReference.find(function (item) {
+                            const content = item.content;
+                            return content.name === attribute.name;
+                        })) {
+                            missingItems.push(attribute);
+                        }
                     });
-                    await this.parent.sharedItems.createSharedItem(sharedItem);
                 }
             }
         }
         else {
-            throw new Error("Request.content.content is no RelationshipCreationChangeRequestBody");
+            // Try to parse the old request format (without types)
+            let oldRequestBody = body;
+            if (body instanceof ts_serval_1.JSONWrapper || body instanceof ts_serval_1.JSONWrapperAsync) {
+                oldRequestBody = oldRequestBody.value;
+            }
+            if (oldRequestBody === null || oldRequestBody === void 0 ? void 0 : oldRequestBody.attributes) {
+                const keys = Object.keys(oldRequestBody.attributes);
+                if (sharedItemsWithSameReference.length !== keys.length) {
+                    keys.forEach((key) => {
+                        const attribute = oldRequestBody.attributes[key];
+                        if (!sharedItemsWithSameReference.find(function (item) {
+                            const content = item.content;
+                            return content.name === attribute.name;
+                        })) {
+                            missingItems.push(content_1.Attribute.from({
+                                name: attribute.name,
+                                value: attribute.value
+                            }));
+                        }
+                    });
+                }
+            }
+        }
+        for (const attribute of missingItems) {
+            const sharedItem = await SharedItem_1.SharedItem.from({
+                id: await consumption_1.ConsumptionIds.sharedItem.generate(),
+                content: attribute,
+                sharedAt: sharedAt,
+                sharedBy: sharedBy,
+                sharedWith: sharedWith,
+                reference: change.id,
+                expiresAt: attribute.validTo
+            });
+            await this.parent.sharedItems.createSharedItem(sharedItem);
         }
     }
 }

package/dist/modules/relationships/RelationshipInfoUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"RelationshipInfoUtil.js","sourceRoot":"","sources":["../../../src/modules/relationships/RelationshipInfoUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RelationshipInfoUtil.js","sourceRoot":"","sources":["../../../src/modules/relationships/RelationshipInfoUtil.ts"],"names":[],"mappings":"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"}

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: "1.0.9",
-    build: "11",
-    date: "2021-12-21T13:20:41+00:00",
-    commit: "8c9ee503dff9ab6d92e5c9316a2e1bc94308a719",
+    version: "1.0.13",
+    build: "15",
+    date: "2022-01-25T16:43:54+00:00",
+    commit: "156f0241ed8ffd6909131950abd43936f263fa62",
     dependencies: {},
     libraries: {
         transport: transport_1.buildInformation,
@@ -700,13 +700,21 @@ class RelationshipInfoController extends consumption_1.ConsumptionBaseController
         return result ? await RelationshipInfo_1.RelationshipInfo.from(result) : undefined;
     }
     async getRelationshipInfoByRelationship(relationshipId) {
-        const result = await this.relationshipInfo.findOne({ relationshipId: relationshipId.toString() });
-        if (result) {
-            return await RelationshipInfo_1.RelationshipInfo.from(result);
-        }
         const info = await new RelationshipInfoUtil_1.RelationshipInfoUtil(this.parent).createInitialRelationshipInfo(relationshipId);
-        await this.relationshipInfo.create(info);
         return info;
+        /*
+        // So far, do not store the relationshipInfo, as they wouldn't be updated correctly
+
+        const result = await this.relationshipInfo.findOne({ relationshipId: relationshipId.toString() })
+
+        if (result) {
+            return await RelationshipInfo.from(result)
+        }
+
+        const info = await new RelationshipInfoUtil(this.parent).createInitialRelationshipInfo(relationshipId)
+        await this.relationshipInfo.create(info)
+        return info
+        */
     }
     async getRelationshipInfos(query) {
         const items = await this.relationshipInfo.find(query);
@@ -745,6 +753,7 @@ exports.RelationshipInfoController = RelationshipInfoController;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RelationshipInfoUtil = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const consumption_1 = __webpack_require__(/*! ../../consumption */ "./dist/consumption/index.js");
@@ -764,13 +773,7 @@ class RelationshipInfoUtil {
         if (!relationship) {
             throw transport_1.TransportErrors.general.recordNotFound(transport_1.Relationship, id.toString()).logWith(this._log);
         }
-        const template = await this.parent.accountController.relationshipTemplates.getRelationshipTemplate(relationship.cache.template.id);
-        if (!template) {
-            throw transport_1.TransportErrors.general
-                .recordNotFound(transport_1.RelationshipTemplate, relationship.cache.template.id.toString())
-                .logWith(this._log);
-        }
-        await this.parseTemplateBody(relationship, template);
+        await this.parseTemplateBody(relationship);
         await this.parseCreationRequest(relationship);
         return await this.createRelationshipInfo(relationship);
     }
@@ -806,14 +809,14 @@ class RelationshipInfoUtil {
     async createRelationshipInfo(relationship) {
         const peerAddress = relationship.peer.address;
         const truncatedAddress = peerAddress.address.substring(3, 9);
-        let info = await RelationshipInfo_1.RelationshipInfo.from({
+        const info = await RelationshipInfo_1.RelationshipInfo.from({
             attributes: [],
             id: await consumption_1.ConsumptionIds.relationshipInfo.generate(),
             isPinned: false,
             relationshipId: relationship.id,
             title: truncatedAddress
         });
-        info = await this.parent.relationshipInfo.createRelationshipInfo(info);
+        // info = await this.parent.relationshipInfo.createRelationshipInfo(info)
         const items = await this.parent.sharedItems.getSharedItems({
             sharedBy: relationship.peer.address.toString()
         });
@@ -833,75 +836,135 @@ class RelationshipInfoUtil {
         info.attributes = attributes;
         const title = this.getTitle(relationship, attributeMap);
         info.title = title;
-        await this.parent.relationshipInfo.updateRelationshipInfo(info);
+        // await this.parent.relationshipInfo.updateRelationshipInfo(info)
         return info;
     }
-    async parseTemplateBody(relationship, template) {
+    async parseTemplateBody(relationship) {
+        const template = relationship.cache.template;
         if (!template.cache) {
             throw transport_1.TransportErrors.general.cacheEmpty(transport_1.RelationshipTemplate, template.id.toString()).logWith(this._log);
         }
+        const body = template.cache.content;
         const isTemplator = this.parent.accountController.identity.isMe(template.cache.createdBy);
-        if (template.cache.content instanceof content_1.RelationshipTemplateBody) {
-            const body = template.cache.content;
+        const sharedAt = template.cache.createdAt;
+        const sharedBy = isTemplator ? this.parent.accountController.identity.address : relationship.peer.address;
+        const sharedWith = isTemplator ? relationship.peer.address : this.parent.accountController.identity.address;
+        const sharedItemsWithSameReference = await this.parent.sharedItems.getSharedItems({
+            reference: template.id.toString()
+        });
+        const missingItems = [];
+        if (body instanceof content_1.RelationshipTemplateBody) {
             const attributes = body.sharedAttributes;
             if (attributes) {
-                const sharedAt = template.cache.createdAt;
-                const sharedBy = isTemplator
-                    ? this.parent.accountController.identity.address
-                    : relationship.peer.address;
-                const sharedWith = isTemplator
-                    ? relationship.peer.address
-                    : this.parent.accountController.identity.address;
-                for (const attribute of attributes) {
-                    const sharedItem = await SharedItem_1.SharedItem.from({
-                        id: await consumption_1.ConsumptionIds.sharedItem.generate(),
-                        content: attribute,
-                        sharedAt: sharedAt,
-                        sharedBy: sharedBy,
-                        sharedWith: sharedWith,
-                        reference: template.id,
-                        expiresAt: attribute.validTo
+                if (sharedItemsWithSameReference.length !== attributes.length) {
+                    attributes.forEach((attribute) => {
+                        if (!sharedItemsWithSameReference.find(function (item) {
+                            const content = item.content;
+                            return content.name === attribute.name;
+                        })) {
+                            missingItems.push(attribute);
+                        }
                     });
-                    await this.parent.sharedItems.createSharedItem(sharedItem);
                 }
             }
         }
+        else {
+            // Try to parse the old template format (without types)
+            let oldTemplateBody = body;
+            if (body instanceof ts_serval_1.JSONWrapper || body instanceof ts_serval_1.JSONWrapperAsync) {
+                oldTemplateBody = oldTemplateBody.value;
+            }
+            if ((oldTemplateBody === null || oldTemplateBody === void 0 ? void 0 : oldTemplateBody.attributes) && Array.isArray(oldTemplateBody.attributes)) {
+                if (sharedItemsWithSameReference.length !== oldTemplateBody.attributes.length) {
+                    oldTemplateBody.attributes.forEach((attribute) => {
+                        if (!sharedItemsWithSameReference.find(function (item) {
+                            const content = item.content;
+                            return content.name === attribute.name;
+                        })) {
+                            missingItems.push(content_1.Attribute.from({
+                                name: attribute.name,
+                                value: attribute.value
+                            }));
+                        }
+                    });
+                }
+            }
+        }
+        for (const attribute of missingItems) {
+            const sharedItem = await SharedItem_1.SharedItem.from({
+                id: await consumption_1.ConsumptionIds.sharedItem.generate(),
+                content: attribute,
+                sharedAt: sharedAt,
+                sharedBy: sharedBy,
+                sharedWith: sharedWith,
+                reference: template.id,
+                expiresAt: attribute.validTo
+            });
+            await this.parent.sharedItems.createSharedItem(sharedItem);
+        }
     }
     async parseCreationRequest(relationship) {
-        const request = relationship.cache.creationChange.request;
-        if (!request.content) {
-            const error = new Error("error.consumption.noRequestContent");
-            this._log.error(error);
-            throw error;
-        }
+        const change = relationship.cache.creationChange;
+        const request = change.request;
+        const body = request.content;
         const isRequestor = this.parent.accountController.identity.isMe(request.createdBy);
-        if (request.content instanceof content_1.RelationshipCreationChangeRequestBody) {
-            const body = request.content;
+        const sharedAt = request.createdAt;
+        const sharedBy = isRequestor ? this.parent.accountController.identity.address : relationship.peer.address;
+        const sharedWith = isRequestor ? relationship.peer.address : this.parent.accountController.identity.address;
+        const sharedItemsWithSameReference = await this.parent.sharedItems.getSharedItems({
+            reference: change.id.toString()
+        });
+        const missingItems = [];
+        if (body instanceof content_1.RelationshipCreationChangeRequestBody) {
             const attributes = body.sharedAttributes;
-            if (attributes) {
-                const sharedAt = request.createdAt;
-                const sharedBy = isRequestor
-                    ? this.parent.accountController.identity.address
-                    : relationship.peer.address;
-                const sharedWith = isRequestor
-                    ? relationship.peer.address
-                    : this.parent.accountController.identity.address;
-                for (const attribute of attributes) {
-                    const sharedItem = await SharedItem_1.SharedItem.from({
-                        id: await consumption_1.ConsumptionIds.sharedItem.generate(),
-                        content: attribute,
-                        sharedAt: sharedAt,
-                        sharedBy: sharedBy,
-                        sharedWith: sharedWith,
-                        reference: relationship.id,
-                        expiresAt: attribute.validTo
+            if (attributes && attributes.length > 0) {
+                if (sharedItemsWithSameReference.length !== attributes.length) {
+                    attributes.forEach((attribute) => {
+                        if (!sharedItemsWithSameReference.find(function (item) {
+                            const content = item.content;
+                            return content.name === attribute.name;
+                        })) {
+                            missingItems.push(attribute);
+                        }
                     });
-                    await this.parent.sharedItems.createSharedItem(sharedItem);
                 }
             }
         }
         else {
-            throw new Error("Request.content.content is no RelationshipCreationChangeRequestBody");
+            // Try to parse the old request format (without types)
+            let oldRequestBody = body;
+            if (body instanceof ts_serval_1.JSONWrapper || body instanceof ts_serval_1.JSONWrapperAsync) {
+                oldRequestBody = oldRequestBody.value;
+            }
+            if (oldRequestBody === null || oldRequestBody === void 0 ? void 0 : oldRequestBody.attributes) {
+                const keys = Object.keys(oldRequestBody.attributes);
+                if (sharedItemsWithSameReference.length !== keys.length) {
+                    keys.forEach((key) => {
+                        const attribute = oldRequestBody.attributes[key];
+                        if (!sharedItemsWithSameReference.find(function (item) {
+                            const content = item.content;
+                            return content.name === attribute.name;
+                        })) {
+                            missingItems.push(content_1.Attribute.from({
+                                name: attribute.name,
+                                value: attribute.value
+                            }));
+                        }
+                    });
+                }
+            }
+        }
+        for (const attribute of missingItems) {
+            const sharedItem = await SharedItem_1.SharedItem.from({
+                id: await consumption_1.ConsumptionIds.sharedItem.generate(),
+                content: attribute,
+                sharedAt: sharedAt,
+                sharedBy: sharedBy,
+                sharedWith: sharedWith,
+                reference: change.id,
+                expiresAt: attribute.validTo
+            });
+            await this.parent.sharedItems.createSharedItem(sharedItem);
         }
     }
 }