@nmshd/runtime 1.2.1 → 1.2.5

package/lib-web/nmshd.runtime.js

@@ -158,9 +158,6 @@ class Runtime {
         typescript_ioc_1.Container.bind(consumption_1.RelationshipInfoController)
             .factory(() => this.getConsumptionController().relationshipInfo)
             .scope(typescript_ioc_1.Scope.Request);
-        typescript_ioc_1.Container.bind(consumption_1.SingleRelationshipController)
-            .factory(() => new consumption_1.SingleRelationshipController(this.getConsumptionController()))
-            .scope(typescript_ioc_1.Scope.Request);
         typescript_ioc_1.Container.bind(consumption_1.RequestsController)
             .factory(() => this.getConsumptionController().requests)
             .scope(typescript_ioc_1.Scope.Request);
@@ -330,11 +327,11 @@ 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.2.1",
-    build: "15",
-    date: "2021-12-02T12:17:23+00:00",
-    commit: "b119218b9a3b99f73d87b734d7ab14de51619681",
-    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"1.0.2","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"1.0.5","@nmshd/content":"1.0.4","@nmshd/crypto":"1.0.5","@nmshd/transport":"1.1.0","ajv":"^8.8.2","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.2","luxon":"^2.1.1","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
+    version: "1.2.5",
+    build: "20",
+    date: "2021-12-27T15:29:57+00:00",
+    commit: "84f19a6c72e68971bc33076e81721e241afb1cb6",
+    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"1.0.2","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"1.0.10","@nmshd/content":"1.1.2","@nmshd/crypto":"1.0.6","@nmshd/transport":"1.1.2","ajv":"^8.8.2","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.2","luxon":"^2.2.0","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         consumption: consumption_1.buildInformation,
@@ -377,8 +374,8 @@ const useCases_1 = __webpack_require__(/*! ../useCases */ "./dist/useCases/index
 const DataViewTranslateable_1 = __webpack_require__(/*! ./DataViewTranslateable */ "./dist/dataViews/DataViewTranslateable.js");
 const MessageDVO_1 = __webpack_require__(/*! ./transport/MessageDVO */ "./dist/dataViews/transport/MessageDVO.js");
 let DataViewExpander = class DataViewExpander {
-    constructor(tranport, consumption, identityController) {
-        this.tranport = tranport;
+    constructor(transport, consumption, identityController) {
+        this.transport = transport;
         this.consumption = consumption;
         this.identityController = identityController;
     }
@@ -405,9 +402,9 @@ let DataViewExpander = class DataViewExpander {
                 return await this.expandMessageDTO(content);
             case "Request":
                 if (content instanceof Array) {
-                    return await this.expandRequests(content);
+                    return await this.expandUnknownRequests(content);
                 }
-                return this.expandRequest(content);
+                return await this.expandUnknownRequest(content);
             case "AttributesShareRequest":
                 if (content instanceof Array) {
                     return await this.expandAttributesShareRequests(content);
@@ -452,7 +449,7 @@ let DataViewExpander = class DataViewExpander {
                 if (content instanceof Array) {
                     return await this.expandRelationshipDTOs(content);
                 }
-                return this.expandRelationshipDTO(content);
+                return await this.expandRelationshipDTO(content);
             case "ConsumptionAttribute":
                 if (content instanceof Array) {
                     return await this.expandConsumptionAttributes(content);
@@ -465,71 +462,127 @@ let DataViewExpander = class DataViewExpander {
     async expandMessageDTO(message) {
         const recipientRelationships = await this.expandRecipients(message.recipients);
         const createdByRelationship = await this.expandAddress(message.createdBy);
-        const files = await this.expandFileIds(message.attachments);
+        const fileIds = [];
+        const filePromises = [];
+        for (const attachment of message.attachments) {
+            if (typeof attachment === "string") {
+                filePromises.push(this.expandFileId(attachment));
+                fileIds.push(attachment);
+            }
+            else {
+                filePromises.push(this.expandFileDTO(attachment));
+                fileIds.push(attachment.id);
+            }
+        }
+        const files = await Promise.all(filePromises);
         const isOwn = this.identityController.isMe(transport_1.CoreAddress.from(message.createdBy));
-        let peerRelationships = [createdByRelationship];
+        let status = MessageDVO_1.MessageStatus.Received;
         if (isOwn) {
-            peerRelationships = recipientRelationships;
+            const receivedByEveryone = message.recipients.every((r) => !!r.receivedAt);
+            status = receivedByEveryone ? MessageDVO_1.MessageStatus.Delivered : MessageDVO_1.MessageStatus.Delivering;
         }
-        const status = MessageDVO_1.MessageStatus.Delivering; // TODO: JSSNMSHDD-2462 (Map message status once receivedAt is updated)
-        return {
+        const name = DataViewTranslateable_1.DataViewTranslateable.transport.messageName;
+        const value = {
             id: message.id,
-            name: DataViewTranslateable_1.DataViewTranslateable.transport.messageName,
+            name: name,
             date: message.createdAt,
             type: "MessageDVO",
-            message: {
-                ...message,
-                isOwn: isOwn,
-                attachmentCount: message.attachments.length,
-                attachmentObjects: files,
-                createdByObject: createdByRelationship,
-                peerObjects: peerRelationships,
-                recipientCount: message.recipients.length,
-                recipientObjects: recipientRelationships,
-                status: status
-            },
+            createdByDevice: message.createdByDevice,
+            createdAt: message.createdAt,
+            createdBy: createdByRelationship,
+            recipients: recipientRelationships,
+            attachments: files,
+            isOwn,
+            recipientCount: message.recipients.length,
+            attachmentCount: message.attachments.length,
+            status,
             image: ""
         };
+        if (message.content["@type"] === "Mail" || message.content["@type"] === "RequestMail") {
+            value.name = DataViewTranslateable_1.DataViewTranslateable.consumption.mails.mailSubjectFallback;
+            value.type = "MailDVO";
+            const mailContent = message.content;
+            if (mailContent.subject) {
+                value.name = mailContent.subject;
+            }
+            value.to = await this.expandAddresses(mailContent.to);
+            value.toCount = mailContent.to.length;
+            value.ccCount = 0;
+            if (mailContent.cc) {
+                value.cc = await this.expandAddresses(mailContent.cc);
+                value.ccCount = mailContent.cc.length;
+            }
+            value.subject = mailContent.subject;
+            value.body = mailContent.body;
+            if (mailContent["@type"] === "RequestMail") {
+                const requestMailContent = message.content;
+                value.name = DataViewTranslateable_1.DataViewTranslateable.consumption.mails.requestMailSubjectFallback;
+                if (requestMailContent.subject) {
+                    value.name = requestMailContent.subject;
+                }
+                value.type = "RequestMailDVO";
+                value.requests = await this.expandUnknownRequests(requestMailContent.requests);
+                value.requestCount = requestMailContent.requests.length;
+                return value;
+            }
+            return value;
+        }
+        return value;
     }
     async expandMessageDTOs(messages) {
         const messagePromises = messages.map((message) => this.expandMessageDTO(message));
         return await Promise.all(messagePromises);
     }
+    async expandUnknownRequest(request) {
+        switch (request["@type"]) {
+            case "AttributesRequest":
+                return await this.expandAttributesRequest(request);
+            case "AttributesShareRequest":
+                return await this.expandAttributesShareRequest(request);
+            case "AttributesChangeRequest":
+                return await this.expandAttributesChangeRequest(request);
+        }
+        return {
+            id: request.id ? request.id : "",
+            name: `${request["@type"]} ${request.key}`,
+            description: "i18n://dvo.request.unknownType",
+            type: "RequestDVO",
+            date: request.expiresAt,
+            ...request
+        };
+    }
     expandRequest(request) {
         return {
-            id: "requestid",
-            name: "Request",
-            type: request["@type"],
-            request: {
-                ...request
-            }
+            id: request.id ? request.id : "",
+            name: `${request["@type"]} ${request.key}`,
+            type: "RequestDVO",
+            date: request.expiresAt,
+            ...request
         };
     }
-    async expandRequests(requests) {
-        const requestsPromise = requests.map((request) => this.expandRequest(request));
+    async expandUnknownRequests(requests) {
+        const requestsPromise = requests.map((request) => this.expandUnknownRequest(request));
         return await Promise.all(requestsPromise);
     }
     async expandAttributesShareRequest(attributesShareRequest) {
         var _a, _b;
         const request = this.expandRequest(attributesShareRequest);
         const recipientObjects = [];
-        let relationshipCount = 0;
+        let possibleRecipientCount = 0;
         for (const recipient of attributesShareRequest.recipients) {
             if (this.identityController.isMe(transport_1.CoreAddress.from(recipient))) {
                 continue;
             }
-            const result = await this.tranport.relationships.getRelationshipByAddress({
-                address: recipient.toString()
-            });
-            if (result.isSuccess) {
-                recipientObjects.push(this.expandRelationshipDTO(result.value));
-                relationshipCount++;
+            const identity = await this.expandIdentityForAddress(recipient);
+            if (identity.hasRelationship) {
+                recipientObjects.push(identity);
+                possibleRecipientCount++;
             }
         }
         if (recipientObjects.length === 0) {
             request.errorCount = ((_a = request.errorCount) !== null && _a !== void 0 ? _a : 0) + 1;
             const error = {
-                code: "error.consumption.request.AttributeShareRequest.noRelationship",
+                code: "error.dvo.request.AttributeShareRequest.noRelationship",
                 message: "There are no relationships to any of the recipients of this request."
             };
             if (!request.errors) {
@@ -537,11 +590,11 @@ let DataViewExpander = class DataViewExpander {
             }
             request.errors.push(error);
         }
-        else if (recipientObjects.length !== relationshipCount) {
+        else if (recipientObjects.length !== possibleRecipientCount) {
             request.warningCount = ((_b = request.warningCount) !== null && _b !== void 0 ? _b : 0) + 1;
             const warning = {
-                code: "warning.consumption.request.AttributeShareRequest.onlyRelationships",
-                message: "Not to every recipients of this request exist a relationship."
+                code: "warning.dvo.request.AttributeShareRequest.onlyRelationships",
+                message: "Not to every recipient of this request exist a relationship."
             };
             if (!request.warnings) {
                 request.warnings = [];
@@ -562,27 +615,24 @@ let DataViewExpander = class DataViewExpander {
         }
         return {
             ...request,
-            name: name,
-            request: {
-                ...request.request,
-                attributeObjects: attributesObjects,
-                attributes: attributesShareRequest.attributes,
-                recipientObjects: recipientObjects,
-                recipients: attributesShareRequest.recipients,
-                relationshipCount: relationshipCount
-            }
+            name,
+            type: "AttributesShareRequestDVO",
+            attributes: attributesObjects,
+            attributeCount: attributesObjects.length,
+            recipients: recipientObjects,
+            recipientCount: recipientObjects.length,
+            possibleRecipientCount
         };
     }
     expandConsumptionAttribute(attribute) {
         return {
+            type: "StoredAttributeDVO",
             id: attribute.id,
-            name: `${attribute.content.name}: ${attribute.content.value}`,
-            type: "Attribute",
-            attribute: {
-                ...attribute,
-                isAvailable: true
-            },
-            date: attribute.createdAt
+            name: attribute.content.name,
+            value: attribute.content.value,
+            date: attribute.createdAt,
+            isOwn: true,
+            sharedItems: []
         };
     }
     async expandConsumptionAttributes(attributes) {
@@ -591,38 +641,33 @@ let DataViewExpander = class DataViewExpander {
     }
     async expandAttributeName(name) {
         const consumptionAttribute = await this.consumption.attributes.getAttributeByName({ name: name });
+        let matchedAttributes = [];
         if (consumptionAttribute.isSuccess) {
-            return this.expandConsumptionAttribute(consumptionAttribute.value);
+            matchedAttributes = [this.expandConsumptionAttribute(consumptionAttribute.value)];
+        }
+        let bestMatch;
+        if (matchedAttributes.length > 0) {
+            bestMatch = matchedAttributes[0];
         }
-        return this.getUnknownAttribute(name);
+        return {
+            type: "MatchedAttributesDVO",
+            id: name,
+            name: name,
+            matches: matchedAttributes,
+            bestMatch: bestMatch
+        };
     }
     async expandAttributeNames(names) {
         const namesPromise = names.map((name) => this.expandAttributeName(name));
         return await Promise.all(namesPromise);
     }
-    getUnknownAttribute(name) {
-        return {
-            id: name,
-            type: "Attribute",
-            name: DataViewTranslateable_1.DataViewTranslateable.consumption.attributes.unknownAttributeName,
-            attribute: {
-                content: {
-                    "@type": "Attribute",
-                    name: name
-                },
-                isAvailable: false
-            }
-        };
-    }
     expandAttribute(attribute) {
         return {
+            type: "AttributeDVO",
             id: attribute.name,
-            type: "Attribute",
-            name: attribute.value,
-            attribute: {
-                ...attribute,
-                isAvailable: false
-            }
+            name: attribute.name,
+            value: attribute.value,
+            isOwn: false
         };
     }
     async expandAttributes(attributes) {
@@ -633,14 +678,10 @@ let DataViewExpander = class DataViewExpander {
         const request = this.expandRequest(attributesChangeRequest);
         let applyToObject;
         if (attributesChangeRequest.applyTo) {
-            if (!this.identityController.isMe(transport_1.CoreAddress.from(attributesChangeRequest.applyTo))) {
-                const result = await this.tranport.relationships.getRelationshipByAddress({
-                    address: attributesChangeRequest.applyTo
-                });
-                if (result.isSuccess) {
-                    applyToObject = this.expandRelationshipDTO(result.value);
-                }
-            }
+            applyToObject = await this.expandIdentityForAddress(attributesChangeRequest.applyTo);
+        }
+        else {
+            applyToObject = this.expandSelf();
         }
         let name;
         const attributesObjects = [];
@@ -648,6 +689,7 @@ let DataViewExpander = class DataViewExpander {
             const attributeDVO = this.expandAttribute(attribute);
             attributesObjects.push(attributeDVO);
         }
+        const oldAttributesObjects = await this.expandAttributeNames(attributesObjects.map((item) => item.id));
         if (attributesObjects.length > 1) {
             name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesChangeRequestNamePlural;
         }
@@ -656,47 +698,59 @@ let DataViewExpander = class DataViewExpander {
         }
         return {
             ...request,
+            type: "AttributesChangeRequestDVO",
             name: name,
-            request: {
-                ...request.request,
-                attributes: attributesChangeRequest.attributes,
-                applyTo: attributesChangeRequest.applyTo,
-                attributeObjects: attributesObjects,
-                applyToObject: applyToObject
-            }
+            newAttributes: attributesObjects,
+            oldAttributes: oldAttributesObjects,
+            applyTo: applyToObject
         };
     }
-    expandSelf() {
-        var _a;
-        let identityProperties;
-        const name = "";
-        const initials = ((_a = name.match(/\b\w/g)) !== null && _a !== void 0 ? _a : []).join("");
-        const isPerson = true;
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (isPerson) {
-            identityProperties = {
-                initials: initials,
-                statusText: "",
-                isPerson: true,
-                familyName: "",
-                givenName: "",
-                salutation: ""
-            };
+    async expandAttributesRequest(attributesRequest) {
+        const request = this.expandRequest(attributesRequest);
+        let name;
+        const attributesObjects = await this.expandAttributeNames(attributesRequest.names);
+        if (attributesObjects.length > 1) {
+            name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesChangeRequestNamePlural;
         }
         else {
-            identityProperties = {
-                initials: initials,
-                statusText: "",
-                isOrganization: true,
-                legalName: ""
-            };
+            name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesChangeRequestName;
         }
+        return {
+            ...request,
+            type: "AttributesRequestDVO",
+            names: attributesRequest.names,
+            name: name,
+            attributes: attributesObjects,
+            required: attributesRequest.required
+        };
+    }
+    expandSelf() {
+        const name = "i18n://dvo.identity.self.name";
+        const initials = "i18n://dvo.identity.self.initials";
+        return {
+            id: this.identityController.address.toString(),
+            type: "IdentityDVO",
+            name: name,
+            initials: initials,
+            realm: transport_1.Realm.Prod,
+            description: "i18n://dvo.identity.self.description",
+            isSelf: true,
+            hasRelationship: false
+        };
+    }
+    expandUnknown(address) {
+        var _a;
+        const name = address.substring(3, 9);
+        const initials = ((_a = name.match(/\b\w/g)) !== null && _a !== void 0 ? _a : []).join("");
         return {
             id: this.identityController.address.toString(),
-            name: DataViewTranslateable_1.DataViewTranslateable.consumption.identities.self,
-            type: "SelfDVO",
-            identity: identityProperties,
-            isSelf: true
+            type: "IdentityDVO",
+            name: name,
+            initials: initials,
+            realm: transport_1.Realm.Prod,
+            description: "i18n://dvo.identity.unknown.description",
+            isSelf: false,
+            hasRelationship: false
         };
     }
     async expandAttributesShareRequests(requests) {
@@ -711,11 +765,11 @@ let DataViewExpander = class DataViewExpander {
         if (this.identityController.isMe(transport_1.CoreAddress.from(address))) {
             return this.expandSelf();
         }
-        const result = await this.tranport.relationships.getRelationshipByAddress({ address: address });
+        const result = await this.transport.relationships.getRelationshipByAddress({ address: address });
         if (result.isError) {
-            throw result.error;
+            return this.expandUnknown(address);
         }
-        return this.expandRelationshipDTO(result.value);
+        return await this.expandRelationshipDTO(result.value);
     }
     async expandAddresses(addresses) {
         const relationshipPromises = addresses.map((address) => this.expandAddress(address));
@@ -725,9 +779,12 @@ let DataViewExpander = class DataViewExpander {
         const relationshipPromises = recipients.map((recipient) => this.expandAddress(recipient.address));
         return await Promise.all(relationshipPromises);
     }
-    expandRelationshipDTO(relationship) {
-        var _a;
-        const name = "";
+    async createRelationshipDVO(relationship, relationshipInfo) {
+        var _a, _b, _c, _d;
+        if (!relationshipInfo) {
+            const relationshipInfoResult = await this.consumption.relationshipInfo.getRelationshipInfoByRelationship({ relationshipId: relationship.id });
+            relationshipInfo = relationshipInfoResult.value;
+        }
         let statusText = "";
         if (relationship.status === transport_1.RelationshipStatus.Pending && this.identityController.isMe(transport_1.CoreAddress.from(relationship.changes[0].request.createdBy))) {
             statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipOutgoing;
@@ -744,34 +801,85 @@ let DataViewExpander = class DataViewExpander {
         else if (relationship.status === transport_1.RelationshipStatus.Active) {
             statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipActive;
         }
-        const initials = ((_a = name.match(/\b\w/g)) !== null && _a !== void 0 ? _a : []).join("");
-        const identityProperties = {
-            initials: initials,
-            statusText: statusText,
-            isPerson: true,
-            familyName: "",
-            givenName: "",
-            salutation: ""
-        };
         return {
             id: relationship.id,
-            name: name,
-            description: statusText,
+            name: relationshipInfo.userTitle ? relationshipInfo.userTitle : relationshipInfo.title,
+            description: relationshipInfo.userDescription ? relationshipInfo.userDescription : relationshipInfo.title,
             date: relationship.changes[0].request.createdAt,
             image: "",
-            type: "IdentityDVO",
-            identity: identityProperties,
-            relationship: {
-                ...relationship
+            type: "RelationshipDVO",
+            status: statusText,
+            isPinned: relationshipInfo.isPinned,
+            theme: {
+                image: (_a = relationshipInfo.theme) === null || _a === void 0 ? void 0 : _a.image,
+                headerImage: (_b = relationshipInfo.theme) === null || _b === void 0 ? void 0 : _b.imageBar,
+                backgroundColor: (_c = relationshipInfo.theme) === null || _c === void 0 ? void 0 : _c.backgroundColor,
+                foregroundColor: (_d = relationshipInfo.theme) === null || _d === void 0 ? void 0 : _d.foregroundColor
             }
         };
     }
+    async expandRelationshipDTO(relationship) {
+        var _a;
+        const relationshipInfoResult = await this.consumption.relationshipInfo.getRelationshipInfoByRelationship({ relationshipId: relationship.id });
+        const relationshipInfo = relationshipInfoResult.value;
+        const name = relationshipInfo.userTitle ? relationshipInfo.userTitle : relationshipInfo.title;
+        let description = relationshipInfo.userDescription ? relationshipInfo.userDescription : relationshipInfo.description;
+        const initials = ((_a = name.match(/\b\w/g)) !== null && _a !== void 0 ? _a : []).join("");
+        const relationshipDVO = await this.createRelationshipDVO(relationship, relationshipInfo);
+        if (!description) {
+            description = relationshipDVO.status;
+        }
+        return {
+            type: "IdentityDVO",
+            id: relationship.peer,
+            name: name,
+            date: relationshipDVO.date,
+            description: description,
+            publicKey: relationship.peerIdentity.publicKey,
+            realm: relationship.peerIdentity.realm,
+            initials,
+            isSelf: false,
+            hasRelationship: true,
+            relationship: relationshipDVO
+        };
+    }
+    async expandIdentityForAddress(address) {
+        var _a;
+        if (address === this.identityController.address.toString()) {
+            return this.expandSelf();
+        }
+        const relationshipResult = await this.transport.relationships.getRelationshipByAddress({
+            address: address
+        });
+        if (relationshipResult.isSuccess) {
+            return await this.expandRelationshipDTO(relationshipResult.value);
+        }
+        if (relationshipResult.error.code !== useCases_1.RuntimeErrors.general.recordNotFound(transport_1.Relationship).code) {
+            throw relationshipResult.error;
+        }
+        const name = address.substring(3, 9);
+        const initials = ((_a = name.match(/\b\w/g)) !== null && _a !== void 0 ? _a : []).join("");
+        return {
+            id: address,
+            type: "IdentityDVO",
+            name: name,
+            initials: initials,
+            publicKey: "i18n://dvo.identity.publicKey.unknown",
+            realm: this.identityController.realm.toString(),
+            description: "i18n://dvo.identity.unknown",
+            isSelf: false,
+            hasRelationship: false
+        };
+    }
+    async expandIdentity(identity) {
+        return await this.expandIdentityForAddress(identity.address);
+    }
     async expandRelationshipDTOs(relationships) {
         const relationshipPromises = relationships.map((relationship) => this.expandRelationshipDTO(relationship));
         return await Promise.all(relationshipPromises);
     }
     async expandFileId(id) {
-        const result = await this.tranport.files.getFile({ id: id });
+        const result = await this.transport.files.getFile({ id: id });
         if (result.isError) {
             throw result.error;
         }
@@ -783,15 +891,16 @@ let DataViewExpander = class DataViewExpander {
     }
     async expandFileDTO(file) {
         return {
+            ...file,
+            type: "FileDVO",
             id: file.id,
             name: file.title ? file.title : file.filename,
-            type: "FileDVO",
             date: file.createdAt,
             image: "",
-            file: {
-                ...file,
-                createdByObject: await this.expandAddress(file.createdBy)
-            }
+            filename: file.filename,
+            filesize: file.filesize,
+            createdBy: await this.expandAddress(file.createdBy),
+            deletedBy: file.deletedBy ? await this.expandAddress(file.deletedBy) : undefined
         };
     }
     async expandFileDTOs(files) {
@@ -838,7 +947,7 @@ exports.DataViewTranslateable = void 0;
 class DataViewTranslateable {
 }
 exports.DataViewTranslateable = DataViewTranslateable;
-DataViewTranslateable.prefix = "i18n://";
+DataViewTranslateable.prefix = "i18n://dvo.";
 DataViewTranslateable.transport = {
     messageName: `${DataViewTranslateable.prefix}message.name`,
     relationshipOutgoing: `${DataViewTranslateable.prefix}relationship.name`,
@@ -849,6 +958,10 @@ DataViewTranslateable.transport = {
     fileName: `${DataViewTranslateable.prefix}file.name`
 };
 DataViewTranslateable.consumption = {
+    mails: {
+        mailSubjectFallback: `${DataViewTranslateable.prefix}mails.mailSubjectFallback`,
+        requestMailSubjectFallback: `${DataViewTranslateable.prefix}mails.requestMailSubjectFallback`
+    },
     attributes: {
         unknownAttributeName: `${DataViewTranslateable.prefix}attributes.UnknownAttributeName`
     },
@@ -925,75 +1038,86 @@ __exportStar(__webpack_require__(/*! ./Warning */ "./dist/dataViews/common/Warni
 
 /***/ }),
 
-/***/ "./dist/dataViews/consumption/AttributeDVO.js":
-/*!****************************************************!*\
-  !*** ./dist/dataViews/consumption/AttributeDVO.js ***!
-  \****************************************************/
+/***/ "./dist/dataViews/consumption/MatchedAttributesDVO.js":
+/*!************************************************************!*\
+  !*** ./dist/dataViews/consumption/MatchedAttributesDVO.js ***!
+  \************************************************************/
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-//# sourceMappingURL=AttributeDVO.js.map
+//# sourceMappingURL=MatchedAttributesDVO.js.map
 
 /***/ }),
 
-/***/ "./dist/dataViews/consumption/AttributesChangeRequestDVO.js":
-/*!******************************************************************!*\
-  !*** ./dist/dataViews/consumption/AttributesChangeRequestDVO.js ***!
-  \******************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ "./dist/dataViews/consumption/index.js":
+/*!*********************************************!*\
+  !*** ./dist/dataViews/consumption/index.js ***!
+  \*********************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-//# sourceMappingURL=AttributesChangeRequestDVO.js.map
+__exportStar(__webpack_require__(/*! ./MatchedAttributesDVO */ "./dist/dataViews/consumption/MatchedAttributesDVO.js"), exports);
+//# sourceMappingURL=index.js.map
 
 /***/ }),
 
-/***/ "./dist/dataViews/consumption/AttributesShareRequestDVO.js":
-/*!*****************************************************************!*\
-  !*** ./dist/dataViews/consumption/AttributesShareRequestDVO.js ***!
-  \*****************************************************************/
+/***/ "./dist/dataViews/content/AttributeDVO.js":
+/*!************************************************!*\
+  !*** ./dist/dataViews/content/AttributeDVO.js ***!
+  \************************************************/
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-//# sourceMappingURL=AttributesShareRequestDVO.js.map
+//# sourceMappingURL=AttributeDVO.js.map
 
 /***/ }),
 
-/***/ "./dist/dataViews/consumption/MailDVO.js":
-/*!***********************************************!*\
-  !*** ./dist/dataViews/consumption/MailDVO.js ***!
-  \***********************************************/
+/***/ "./dist/dataViews/content/MailDVOs.js":
+/*!********************************************!*\
+  !*** ./dist/dataViews/content/MailDVOs.js ***!
+  \********************************************/
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-//# sourceMappingURL=MailDVO.js.map
+//# sourceMappingURL=MailDVOs.js.map
 
 /***/ }),
 
-/***/ "./dist/dataViews/consumption/RequestDVO.js":
-/*!**************************************************!*\
-  !*** ./dist/dataViews/consumption/RequestDVO.js ***!
-  \**************************************************/
+/***/ "./dist/dataViews/content/RequestDVOs.js":
+/*!***********************************************!*\
+  !*** ./dist/dataViews/content/RequestDVOs.js ***!
+  \***********************************************/
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-//# sourceMappingURL=RequestDVO.js.map
+//# sourceMappingURL=RequestDVOs.js.map
 
 /***/ }),
 
-/***/ "./dist/dataViews/consumption/index.js":
-/*!*********************************************!*\
-  !*** ./dist/dataViews/consumption/index.js ***!
-  \*********************************************/
+/***/ "./dist/dataViews/content/index.js":
+/*!*****************************************!*\
+  !*** ./dist/dataViews/content/index.js ***!
+  \*****************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -1009,11 +1133,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-__exportStar(__webpack_require__(/*! ./AttributeDVO */ "./dist/dataViews/consumption/AttributeDVO.js"), exports);
-__exportStar(__webpack_require__(/*! ./AttributesChangeRequestDVO */ "./dist/dataViews/consumption/AttributesChangeRequestDVO.js"), exports);
-__exportStar(__webpack_require__(/*! ./AttributesShareRequestDVO */ "./dist/dataViews/consumption/AttributesShareRequestDVO.js"), exports);
-__exportStar(__webpack_require__(/*! ./MailDVO */ "./dist/dataViews/consumption/MailDVO.js"), exports);
-__exportStar(__webpack_require__(/*! ./RequestDVO */ "./dist/dataViews/consumption/RequestDVO.js"), exports);
+__exportStar(__webpack_require__(/*! ./AttributeDVO */ "./dist/dataViews/content/AttributeDVO.js"), exports);
+__exportStar(__webpack_require__(/*! ./MailDVOs */ "./dist/dataViews/content/MailDVOs.js"), exports);
+__exportStar(__webpack_require__(/*! ./RequestDVOs */ "./dist/dataViews/content/RequestDVOs.js"), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -1039,6 +1161,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./common */ "./dist/dataViews/common/index.js"), exports);
 __exportStar(__webpack_require__(/*! ./consumption */ "./dist/dataViews/consumption/index.js"), exports);
+__exportStar(__webpack_require__(/*! ./content */ "./dist/dataViews/content/index.js"), exports);
 __exportStar(__webpack_require__(/*! ./DataViewExpander */ "./dist/dataViews/DataViewExpander.js"), exports);
 __exportStar(__webpack_require__(/*! ./DataViewObject */ "./dist/dataViews/DataViewObject.js"), exports);
 __exportStar(__webpack_require__(/*! ./DataViewTranslateable */ "./dist/dataViews/DataViewTranslateable.js"), exports);
@@ -1085,7 +1208,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MessageStatus = void 0;
 var MessageStatus;
 (function (MessageStatus) {
-    MessageStatus["Sent"] = "sent";
+    MessageStatus["Received"] = "received";
     MessageStatus["Delivering"] = "delivering";
     MessageStatus["Delivered"] = "delivered";
     MessageStatus["Errorneous"] = "errorneous";
@@ -1778,7 +1901,7 @@ exports.AttributesFacade = void 0;
 const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
 const useCases_1 = __webpack_require__(/*! ../../../useCases */ "./dist/useCases/index.js");
 let AttributesFacade = class AttributesFacade {
-    constructor(createAttributeUseCase, deleteAttributeUseCase, deleteAttributeByNameUseCase, getAllValidUseCase, getAttributeUseCase, getAttributeByNameUseCase, getAttributesUseCase, getAttributesByNameUseCase, getHistoryByNameUseCase, succeedAttributeUseCase, updateAttributeUseCase) {
+    constructor(createAttributeUseCase, deleteAttributeUseCase, deleteAttributeByNameUseCase, getAllValidUseCase, getAttributeUseCase, getAttributeByNameUseCase, getAttributesUseCase, getAttributesByNamesUseCase, getHistoryByNameUseCase, succeedAttributeUseCase, updateAttributeUseCase) {
         this.createAttributeUseCase = createAttributeUseCase;
         this.deleteAttributeUseCase = deleteAttributeUseCase;
         this.deleteAttributeByNameUseCase = deleteAttributeByNameUseCase;
@@ -1786,7 +1909,7 @@ let AttributesFacade = class AttributesFacade {
         this.getAttributeUseCase = getAttributeUseCase;
         this.getAttributeByNameUseCase = getAttributeByNameUseCase;
         this.getAttributesUseCase = getAttributesUseCase;
-        this.getAttributesByNameUseCase = getAttributesByNameUseCase;
+        this.getAttributesByNamesUseCase = getAttributesByNamesUseCase;
         this.getHistoryByNameUseCase = getHistoryByNameUseCase;
         this.succeedAttributeUseCase = succeedAttributeUseCase;
         this.updateAttributeUseCase = updateAttributeUseCase;
@@ -1812,8 +1935,8 @@ let AttributesFacade = class AttributesFacade {
     async getAttributes(request) {
         return await this.getAttributesUseCase.execute(request);
     }
-    async getAttributesByName(request) {
-        return await this.getAttributesByNameUseCase.execute(request);
+    async getAttributesByNames(request) {
+        return await this.getAttributesByNamesUseCase.execute(request);
     }
     async getHistoryByName(request) {
         return await this.getHistoryByNameUseCase.execute(request);
@@ -1844,7 +1967,7 @@ AttributesFacade = __decorate([
         useCases_1.GetAttributeUseCase,
         useCases_1.GetAttributeByNameUseCase,
         useCases_1.GetAttributesUseCase,
-        useCases_1.GetAttributesByNameUseCase,
+        useCases_1.GetAttributesByNamesUseCase,
         useCases_1.GetHistoryByNameUseCase,
         useCases_1.SucceedAttributeUseCase,
         useCases_1.UpdateAttributeUseCase])
@@ -3794,21 +3917,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.JsonSchema = exports.SchemaRepository = void 0;
 const ajv_1 = __importDefault(__webpack_require__(/*! ajv */ "./node_modules/ajv/dist/ajv.js"));
+const ajv_errors_1 = __importDefault(__webpack_require__(/*! ajv-errors */ "./node_modules/ajv-errors/dist/index.js"));
 const ajv_formats_1 = __importDefault(__webpack_require__(/*! ajv-formats */ "./node_modules/ajv-formats/dist/index.js"));
 const customFormats = {
-    fileId: "FIL[A-Za-z0-9]{17}",
-    relationshipId: "REL[A-Za-z0-9]{17}",
-    messageId: "MSG[A-Za-z0-9]{17}",
-    relationshipTemplateId: "RLT[A-Za-z0-9]{17}",
-    tokenId: "TOK[A-Za-z0-9]{17}",
-    relationshipChangeId: "RCH[A-Za-z0-9]{17}",
-    deviceId: "DVC[A-Za-z0-9]{17}"
+    fileId: "FIL[A-z0-9]{17}",
+    relationshipId: "REL[A-z0-9]{17}",
+    messageId: "MSG[A-z0-9]{17}",
+    relationshipTemplateId: "RLT[A-z0-9]{17}",
+    tokenId: "TOK[A-z0-9]{17}",
+    relationshipChangeId: "RCH[A-z0-9]{17}",
+    deviceId: "DVC[A-z0-9]{17}"
 };
 class SchemaRepository {
     constructor() {
         this.jsonSchemas = new Map();
-        this.compiler = new ajv_1.default();
+        this.compiler = new ajv_1.default({ allErrors: true });
         (0, ajv_formats_1.default)(this.compiler);
+        (0, ajv_errors_1.default)(this.compiler);
         this.addCustomFormats();
     }
     addCustomFormats() {
@@ -3841,7 +3966,7 @@ class JsonSchema {
         this.validateSchema = validateSchema;
     }
     validate(obj) {
-        return { isValid: this.validateSchema(obj), errors: this.validateSchema.errors };
+        return { isValid: this.validateSchema(obj), errors: this.validateSchema.errors ? [...this.validateSchema.errors] : undefined };
     }
 }
 exports.JsonSchema = JsonSchema;
@@ -3849,40 +3974,6 @@ exports.JsonSchema = JsonSchema;
 
 /***/ }),
 
-/***/ "./dist/useCases/common/SchemaValidator.js":
-/*!*************************************************!*\
-  !*** ./dist/useCases/common/SchemaValidator.js ***!
-  \*************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.SchemaValidator = void 0;
-const fluent_ts_validator_1 = __webpack_require__(/*! fluent-ts-validator */ "./node_modules/fluent-ts-validator/index.js");
-class SchemaValidator {
-    constructor(schema) {
-        this.schema = schema;
-    }
-    validate(input) {
-        const validationResult = this.schema.validate(input);
-        const result = new fluent_ts_validator_1.ValidationResult();
-        if (validationResult.isValid) {
-            return result;
-        }
-        result.addFailures(validationResult.errors.map(this.schemaErrorToValidationFailure));
-        return result;
-    }
-    schemaErrorToValidationFailure(err, target) {
-        const errorMessage = `${err.instancePath} ${err.message}`.replace(/^\//, "").replace(/"/g, "");
-        return new fluent_ts_validator_1.ValidationFailure(target, err.instancePath, undefined, undefined, errorMessage);
-    }
-}
-exports.SchemaValidator = SchemaValidator;
-//# sourceMappingURL=SchemaValidator.js.map
-
-/***/ }),
-
 /***/ "./dist/useCases/common/Schemas.js":
 /*!*****************************************!*\
   !*** ./dist/useCases/common/Schemas.js ***!
@@ -3892,8 +3983,8 @@ exports.SchemaValidator = SchemaValidator;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.LoadPeerFileRequest = exports.GetFilesRequest = exports.GetFileRequest = exports.DownloadFileRequest = exports.CreateTokenQrCodeForFileRequest = exports.CreateTokenForFileRequest = exports.UpdateDeviceRequest = exports.GetDeviceOnboardingInfoRequest = exports.GetDeviceRequest = exports.DeleteDeviceRequest = exports.CreateDeviceOnboardingTokenRequest = exports.CreateDeviceRequest = exports.RegisterPushNotificationTokenRequest = exports.UpdateSharedItemRequest = exports.GetSharedItemsSharedWithAddressRequest = exports.GetSharedItemsSharedByAddressRequest = exports.GetSharedItemsByReferenceRequest = exports.GetSharedItemsByAddressRequest = exports.GetSharedItemsRequest = exports.GetSharedItemRequest = exports.DeleteSharedItemRequest = exports.CreateSharedItemRequest = exports.UpdateSettingRequest = exports.GetSettingsRequest = exports.GetSettingRequest = exports.DeleteSettingRequest = exports.CreateSettingRequest = exports.UpdateRelationshipInfoRequest = exports.GetRelationshipInfoByRelationshipRequest = exports.GetRelationshipInfoRequest = exports.DeleteRelationshipInfoByRelationshipRequest = exports.DeleteRelationshipInfoRequest = exports.CreateRelationshipInfoRequest = exports.UpdateDraftRequest = exports.GetDraftsRequest = exports.GetDraftRequest = exports.DeleteDraftRequest = exports.CreateDraftRequest = exports.UpdateAttributeRequest = exports.SucceedAttributeRequest = exports.GetHistoryByNameRequest = exports.GetAttributesByNameRequest = exports.GetAttributesRequest = exports.GetAttributeByNameRequest = exports.GetAttributeRequest = exports.DeleteAttributeByNameRequest = exports.DeleteAttributeRequest = exports.CreateAttributeRequest = exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = exports.LoadPeerTokenAnonymousByIdAndKeyRequest = void 0;
-exports.LoadPeerTokenRequest = exports.GetTokensRequest = exports.GetTokenRequest = exports.GetQRCodeForTokenRequest = exports.CreateOwnTokenRequest = exports.LoadPeerRelationshipTemplateRequest = exports.GetRelationshipTemplatesRequest = exports.GetRelationshipTemplateRequest = exports.CreateOwnRelationshipTemplateRequest = exports.RevokeRelationshipChangeRequest = exports.RejectRelationshipChangeRequest = exports.GetRelationshipsRequest = exports.GetRelationshipByAddressRequest = exports.GetRelationshipRequest = exports.CreateRelationshipChangeRequest = exports.CreateRelationshipRequest = exports.AcceptRelationshipChangeRequest = exports.SendMessageRequest = exports.GetMessagesRequest = exports.GetMessageRequest = exports.GetAttachmentMetadataRequest = exports.DownloadAttachmentRequest = exports.CheckIdentityRequest = exports.UploadOwnFileRequest = void 0;
+exports.GetFilesRequest = exports.GetFileRequest = exports.CreateTokenQrCodeForFileRequest = exports.CreateTokenForFileRequest = exports.UpdateDeviceRequest = exports.GetDeviceOnboardingInfoRequest = exports.GetDeviceRequest = exports.DeleteDeviceRequest = exports.CreateDeviceOnboardingTokenRequest = exports.CreateDeviceRequest = exports.DownloadAttachmentRequest = exports.DownloadFileRequest = exports.RegisterPushNotificationTokenRequest = exports.UpdateSharedItemRequest = exports.GetSharedItemsSharedWithAddressRequest = exports.GetSharedItemsSharedByAddressRequest = exports.GetSharedItemsByReferenceRequest = exports.GetSharedItemsByAddressRequest = exports.GetSharedItemsRequest = exports.GetSharedItemRequest = exports.DeleteSharedItemRequest = exports.CreateSharedItemRequest = exports.UpdateSettingRequest = exports.GetSettingsRequest = exports.GetSettingRequest = exports.DeleteSettingRequest = exports.CreateSettingRequest = exports.UpdateRelationshipInfoRequest = exports.GetRelationshipInfoByRelationshipRequest = exports.GetRelationshipInfoRequest = exports.DeleteRelationshipInfoByRelationshipRequest = exports.DeleteRelationshipInfoRequest = exports.CreateRelationshipInfoRequest = exports.UpdateDraftRequest = exports.GetDraftsRequest = exports.GetDraftRequest = exports.DeleteDraftRequest = exports.CreateDraftRequest = exports.UpdateAttributeRequest = exports.SucceedAttributeRequest = exports.GetHistoryByNameRequest = exports.GetAttributesRequest = exports.GetAttributeByNameRequest = exports.GetAttributeRequest = exports.DeleteAttributeByNameRequest = exports.DeleteAttributeRequest = exports.CreateAttributeRequest = exports.GetAttributesByNamesRequest = exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = exports.LoadPeerTokenAnonymousByIdAndKeyRequest = void 0;
+exports.LoadPeerTokenRequest = exports.GetTokensRequest = exports.GetTokenRequest = exports.GetQRCodeForTokenRequest = exports.CreateOwnTokenRequest = exports.LoadPeerRelationshipTemplateRequest = exports.GetRelationshipTemplatesRequest = exports.GetRelationshipTemplateRequest = exports.CreateTokenQrCodeForOwnTemplateRequest = exports.CreateTokenForOwnTemplateRequest = exports.CreateOwnRelationshipTemplateRequest = exports.RevokeRelationshipChangeRequest = exports.RejectRelationshipChangeRequest = exports.GetRelationshipsRequest = exports.GetRelationshipByAddressRequest = exports.GetRelationshipRequest = exports.CreateRelationshipChangeRequest = exports.CreateRelationshipRequest = exports.AcceptRelationshipChangeRequest = exports.SendMessageRequest = exports.GetMessagesRequest = exports.GetMessageRequest = exports.GetAttachmentMetadataRequest = exports.CheckIdentityRequest = exports.UploadOwnFileRequest = exports.LoadPeerFileRequest = exports.LoadPeerFileViaReferenceRequest = exports.LoadPeerFileViaSecretRequest = void 0;
 exports.LoadPeerTokenAnonymousByIdAndKeyRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/LoadPeerTokenAnonymousByIdAndKeyRequest",
@@ -3934,6 +4025,16 @@ exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = {
         }
     }
 };
+exports.GetAttributesByNamesRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/GetAttributesByNamesRequest",
+    "definitions": {
+        "GetAttributesByNamesRequest": {
+            "type": "object",
+            "additionalProperties": false
+        }
+    }
+};
 exports.CreateAttributeRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/CreateAttributeRequest",
@@ -4066,16 +4167,6 @@ exports.GetAttributesRequest = {
         }
     }
 };
-exports.GetAttributesByNameRequest = {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "$ref": "#/definitions/GetAttributesByNameRequest",
-    "definitions": {
-        "GetAttributesByNameRequest": {
-            "type": "object",
-            "additionalProperties": false
-        }
-    }
-};
 exports.GetHistoryByNameRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/GetHistoryByNameRequest",
@@ -4905,6 +4996,47 @@ exports.RegisterPushNotificationTokenRequest = {
         }
     }
 };
+exports.DownloadFileRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/DownloadFileRequest",
+    "definitions": {
+        "DownloadFileRequest": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string",
+                    "format": "fileId"
+                }
+            },
+            "required": [
+                "id"
+            ],
+            "additionalProperties": false
+        }
+    }
+};
+exports.DownloadAttachmentRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/DownloadAttachmentRequest",
+    "definitions": {
+        "DownloadAttachmentRequest": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "attachmentId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "attachmentId"
+            ],
+            "additionalProperties": false
+        }
+    }
+};
 exports.CreateDeviceRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/CreateDeviceRequest",
@@ -5074,25 +5206,6 @@ exports.CreateTokenQrCodeForFileRequest = {
         }
     }
 };
-exports.DownloadFileRequest = {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "$ref": "#/definitions/DownloadFileRequest",
-    "definitions": {
-        "DownloadFileRequest": {
-            "type": "object",
-            "properties": {
-                "id": {
-                    "type": "string",
-                    "format": "fileId"
-                }
-            },
-            "required": [
-                "id"
-            ],
-            "additionalProperties": false
-        }
-    }
-};
 exports.GetFileRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/GetFileRequest",
@@ -5135,11 +5248,65 @@ exports.GetFilesRequest = {
         }
     }
 };
+exports.LoadPeerFileViaSecretRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/LoadPeerFileViaSecretRequest",
+    "definitions": {
+        "LoadPeerFileViaSecretRequest": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string",
+                    "format": "fileId"
+                },
+                "secretKey": {
+                    "type": "string",
+                    "minLength": 100
+                }
+            },
+            "required": [
+                "id",
+                "secretKey"
+            ],
+            "additionalProperties": false
+        }
+    }
+};
+exports.LoadPeerFileViaReferenceRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/LoadPeerFileViaReferenceRequest",
+    "definitions": {
+        "LoadPeerFileViaReferenceRequest": {
+            "type": "object",
+            "properties": {
+                "reference": {
+                    "type": "string",
+                    "pattern": "VE9L.{84}"
+                }
+            },
+            "required": [
+                "reference"
+            ],
+            "additionalProperties": false,
+            "errorMessage": "token reference invalid"
+        }
+    }
+};
 exports.LoadPeerFileRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/LoadPeerFileRequest",
     "definitions": {
         "LoadPeerFileRequest": {
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/LoadPeerFileViaSecretRequest"
+                },
+                {
+                    "$ref": "#/definitions/LoadPeerFileViaReferenceRequest"
+                }
+            ]
+        },
+        "LoadPeerFileViaSecretRequest": {
             "type": "object",
             "properties": {
                 "id": {
@@ -5147,13 +5314,29 @@ exports.LoadPeerFileRequest = {
                     "format": "fileId"
                 },
                 "secretKey": {
-                    "type": "string"
-                },
-                "reference": {
-                    "type": "string"
+                    "type": "string",
+                    "minLength": 100
                 }
             },
+            "required": [
+                "id",
+                "secretKey"
+            ],
             "additionalProperties": false
+        },
+        "LoadPeerFileViaReferenceRequest": {
+            "type": "object",
+            "properties": {
+                "reference": {
+                    "type": "string",
+                    "pattern": "VE9L.{84}"
+                }
+            },
+            "required": [
+                "reference"
+            ],
+            "additionalProperties": false,
+            "errorMessage": "token reference invalid"
         }
     }
 };
@@ -5248,28 +5431,6 @@ exports.CheckIdentityRequest = {
         }
     }
 };
-exports.DownloadAttachmentRequest = {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "$ref": "#/definitions/DownloadAttachmentRequest",
-    "definitions": {
-        "DownloadAttachmentRequest": {
-            "type": "object",
-            "properties": {
-                "id": {
-                    "type": "string"
-                },
-                "attachmentId": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "id",
-                "attachmentId"
-            ],
-            "additionalProperties": false
-        }
-    }
-};
 exports.GetAttachmentMetadataRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/GetAttachmentMetadataRequest",
@@ -5535,6 +5696,51 @@ exports.CreateOwnRelationshipTemplateRequest = {
         }
     }
 };
+exports.CreateTokenForOwnTemplateRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/CreateTokenForOwnTemplateRequest",
+    "definitions": {
+        "CreateTokenForOwnTemplateRequest": {
+            "type": "object",
+            "properties": {
+                "templateId": {
+                    "type": "string"
+                },
+                "expiresAt": {
+                    "type": "string"
+                },
+                "ephemeral": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "templateId"
+            ],
+            "additionalProperties": false
+        }
+    }
+};
+exports.CreateTokenQrCodeForOwnTemplateRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/CreateTokenQrCodeForOwnTemplateRequest",
+    "definitions": {
+        "CreateTokenQrCodeForOwnTemplateRequest": {
+            "type": "object",
+            "properties": {
+                "templateId": {
+                    "type": "string"
+                },
+                "expiresAt": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "templateId"
+            ],
+            "additionalProperties": false
+        }
+    }
+};
 exports.GetRelationshipTemplateRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/GetRelationshipTemplateRequest",
@@ -5819,11 +6025,13 @@ __exportStar(__webpack_require__(/*! ./OwnerRestriction */ "./dist/useCases/comm
 __exportStar(__webpack_require__(/*! ./QRCode */ "./dist/useCases/common/QRCode.js"), exports);
 __exportStar(__webpack_require__(/*! ./RuntimeErrors */ "./dist/useCases/common/RuntimeErrors.js"), exports);
 __exportStar(__webpack_require__(/*! ./RuntimeValidator */ "./dist/useCases/common/RuntimeValidator.js"), exports);
+__exportStar(__webpack_require__(/*! ./SchemaRepository */ "./dist/useCases/common/SchemaRepository.js"), exports);
 __exportStar(__webpack_require__(/*! ./UseCase */ "./dist/useCases/common/UseCase.js"), exports);
 __exportStar(__webpack_require__(/*! ./validation/AddressValidator */ "./dist/useCases/common/validation/AddressValidator.js"), exports);
 __exportStar(__webpack_require__(/*! ./validation/DateValidator */ "./dist/useCases/common/validation/DateValidator.js"), exports);
 __exportStar(__webpack_require__(/*! ./validation/IdValidator */ "./dist/useCases/common/validation/IdValidator.js"), exports);
 __exportStar(__webpack_require__(/*! ./validation/RelationshipAttributeDTOValidator */ "./dist/useCases/common/validation/RelationshipAttributeDTOValidator.js"), exports);
+__exportStar(__webpack_require__(/*! ./validation/SchemaValidator */ "./dist/useCases/common/validation/SchemaValidator.js"), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -5960,6 +6168,43 @@ exports.RelationshipAttributeDTOValidator = RelationshipAttributeDTOValidator;
 
 /***/ }),
 
+/***/ "./dist/useCases/common/validation/SchemaValidator.js":
+/*!************************************************************!*\
+  !*** ./dist/useCases/common/validation/SchemaValidator.js ***!
+  \************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SchemaValidator = void 0;
+const fluent_ts_validator_1 = __webpack_require__(/*! fluent-ts-validator */ "./node_modules/fluent-ts-validator/index.js");
+class SchemaValidator {
+    constructor(schema) {
+        this.schema = schema;
+    }
+    validate(input) {
+        const validationResult = this.schema.validate(input);
+        return this.convertValidationResult(validationResult);
+    }
+    convertValidationResult(validationResult) {
+        const result = new fluent_ts_validator_1.ValidationResult();
+        if (validationResult.isValid) {
+            return result;
+        }
+        result.addFailures(validationResult.errors.map(this.schemaErrorToValidationFailure));
+        return result;
+    }
+    schemaErrorToValidationFailure(err) {
+        const errorMessage = `${err.instancePath} ${err.message}`.replace(/^\//, "").replace(/"/g, "").trim();
+        return new fluent_ts_validator_1.ValidationFailure(undefined, err.instancePath, undefined, undefined, errorMessage);
+    }
+}
+exports.SchemaValidator = SchemaValidator;
+//# sourceMappingURL=SchemaValidator.js.map
+
+/***/ }),
+
 /***/ "./dist/useCases/consumption/attributes/AttributeMapper.js":
 /*!*****************************************************************!*\
   !*** ./dist/useCases/consumption/attributes/AttributeMapper.js ***!
@@ -5981,10 +6226,10 @@ class AttributeMapper {
     static toAttributeDTOList(attributes) {
         return attributes.map((attribute) => this.toAttributeDTO(attribute));
     }
-    static toGetAttributesByNameResponse(attributesByName) {
+    static toGetAttributesByNamesResponse(attributesByNames) {
         const response = {};
-        for (const name in attributesByName) {
-            response[name] = AttributeMapper.toAttributeDTO(attributesByName[name]);
+        for (const name in attributesByNames) {
+            response[name] = AttributeMapper.toAttributeDTO(attributesByNames[name]);
         }
         return response;
     }
@@ -6393,10 +6638,10 @@ exports.GetAttributesUseCase = GetAttributesUseCase;
 
 /***/ }),
 
-/***/ "./dist/useCases/consumption/attributes/GetAttributesByName.js":
-/*!*********************************************************************!*\
-  !*** ./dist/useCases/consumption/attributes/GetAttributesByName.js ***!
-  \*********************************************************************/
+/***/ "./dist/useCases/consumption/attributes/GetAttributesByNames.js":
+/*!**********************************************************************!*\
+  !*** ./dist/useCases/consumption/attributes/GetAttributesByNames.js ***!
+  \**********************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -6414,34 +6659,34 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.GetAttributesByNameUseCase = void 0;
+exports.GetAttributesByNamesUseCase = void 0;
 const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const consumption_1 = __webpack_require__(/*! @nmshd/consumption */ "@nmshd/consumption");
 const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
 const common_1 = __webpack_require__(/*! ../../common */ "./dist/useCases/common/index.js");
 const AttributeMapper_1 = __webpack_require__(/*! ./AttributeMapper */ "./dist/useCases/consumption/attributes/AttributeMapper.js");
-class GetAttributesByNameRequestValidator extends common_1.RuntimeValidator {
+class GetAttributesByNamesRequestValidator extends common_1.RuntimeValidator {
     constructor() {
         super();
     }
 }
-let GetAttributesByNameUseCase = class GetAttributesByNameUseCase extends common_1.UseCase {
+let GetAttributesByNamesUseCase = class GetAttributesByNamesUseCase extends common_1.UseCase {
     constructor(attributeController, validator) {
         super(validator);
         this.attributeController = attributeController;
     }
     async executeInternal(_request) {
         const attributes = await this.attributeController.getAttributesByName();
-        return ts_utils_1.Result.ok(AttributeMapper_1.AttributeMapper.toGetAttributesByNameResponse(attributes));
+        return ts_utils_1.Result.ok(AttributeMapper_1.AttributeMapper.toGetAttributesByNamesResponse(attributes));
     }
 };
-GetAttributesByNameUseCase = __decorate([
+GetAttributesByNamesUseCase = __decorate([
     __param(0, typescript_ioc_1.Inject),
     __param(1, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [consumption_1.ConsumptionAttributesController, GetAttributesByNameRequestValidator])
-], GetAttributesByNameUseCase);
-exports.GetAttributesByNameUseCase = GetAttributesByNameUseCase;
-//# sourceMappingURL=GetAttributesByName.js.map
+    __metadata("design:paramtypes", [consumption_1.ConsumptionAttributesController, GetAttributesByNamesRequestValidator])
+], GetAttributesByNamesUseCase);
+exports.GetAttributesByNamesUseCase = GetAttributesByNamesUseCase;
+//# sourceMappingURL=GetAttributesByNames.js.map
 
 /***/ }),
 
@@ -6658,7 +6903,7 @@ __exportStar(__webpack_require__(/*! ./GetAllValid */ "./dist/useCases/consumpti
 __exportStar(__webpack_require__(/*! ./GetAttribute */ "./dist/useCases/consumption/attributes/GetAttribute.js"), exports);
 __exportStar(__webpack_require__(/*! ./GetAttributeByName */ "./dist/useCases/consumption/attributes/GetAttributeByName.js"), exports);
 __exportStar(__webpack_require__(/*! ./GetAttributes */ "./dist/useCases/consumption/attributes/GetAttributes.js"), exports);
-__exportStar(__webpack_require__(/*! ./GetAttributesByName */ "./dist/useCases/consumption/attributes/GetAttributesByName.js"), exports);
+__exportStar(__webpack_require__(/*! ./GetAttributesByNames */ "./dist/useCases/consumption/attributes/GetAttributesByNames.js"), exports);
 __exportStar(__webpack_require__(/*! ./GetHistoryByName */ "./dist/useCases/consumption/attributes/GetHistoryByName.js"), exports);
 __exportStar(__webpack_require__(/*! ./SucceedAttribute */ "./dist/useCases/consumption/attributes/SucceedAttribute.js"), exports);
 __exportStar(__webpack_require__(/*! ./UpdateAttribute */ "./dist/useCases/consumption/attributes/UpdateAttribute.js"), exports);
@@ -9324,12 +9569,8 @@ class DeviceMapper {
             identityPrivateKey: deviceSharedSecret.identityPrivateKey ? deviceSharedSecret.identityPrivateKey.toString() : undefined,
             identity: {
                 address: deviceSharedSecret.identity.address.toString(),
-                createdAt: deviceSharedSecret.identity.createdAt.toString(),
-                description: deviceSharedSecret.identity.description,
-                name: deviceSharedSecret.identity.name,
                 publicKey: deviceSharedSecret.identity.publicKey.toString(),
-                realm: deviceSharedSecret.identity.realm.toString(),
-                type: deviceSharedSecret.identity.type.toString()
+                realm: deviceSharedSecret.identity.realm.toString()
             },
             password: deviceSharedSecret.password,
             username: deviceSharedSecret.username
@@ -9348,12 +9589,8 @@ class DeviceMapper {
             identityPrivateKey: deviceOnboardingDTO.identityPrivateKey ? await crypto_1.CryptoSignaturePrivateKey.deserialize(deviceOnboardingDTO.identityPrivateKey) : undefined,
             identity: {
                 address: transport_1.CoreAddress.from(deviceOnboardingDTO.identity.address),
-                createdAt: transport_1.CoreDate.from(deviceOnboardingDTO.identity.createdAt),
-                name: deviceOnboardingDTO.identity.name,
-                description: deviceOnboardingDTO.identity.description,
                 publicKey: await crypto_1.CryptoSignaturePublicKey.deserialize(deviceOnboardingDTO.identity.publicKey),
-                realm: deviceOnboardingDTO.identity.realm,
-                type: deviceOnboardingDTO.identity.type
+                realm: deviceOnboardingDTO.identity.realm
             },
             password: deviceOnboardingDTO.password,
             username: deviceOnboardingDTO.username
@@ -9639,17 +9876,15 @@ const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
 const common_1 = __webpack_require__(/*! ../../common */ "./dist/useCases/common/index.js");
-const SchemaRepository_1 = __webpack_require__(/*! ../../common/SchemaRepository */ "./dist/useCases/common/SchemaRepository.js");
-const SchemaValidator_1 = __webpack_require__(/*! ../../common/SchemaValidator */ "./dist/useCases/common/SchemaValidator.js");
 const TokenMapper_1 = __webpack_require__(/*! ../tokens/TokenMapper */ "./dist/useCases/transport/tokens/TokenMapper.js");
-let Validator = class Validator extends SchemaValidator_1.SchemaValidator {
+let Validator = class Validator extends common_1.SchemaValidator {
     constructor(schemaRepository) {
         super(schemaRepository.getSchema("CreateTokenForFileRequest"));
     }
 };
 Validator = __decorate([
     __param(0, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [SchemaRepository_1.SchemaRepository])
+    __metadata("design:paramtypes", [common_1.SchemaRepository])
 ], Validator);
 let CreateTokenForFileUseCase = class CreateTokenForFileUseCase extends common_1.UseCase {
     constructor(fileController, tokenController, accountController, validator) {
@@ -9723,16 +9958,14 @@ const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
 const common_1 = __webpack_require__(/*! ../../common */ "./dist/useCases/common/index.js");
-const SchemaRepository_1 = __webpack_require__(/*! ../../common/SchemaRepository */ "./dist/useCases/common/SchemaRepository.js");
-const SchemaValidator_1 = __webpack_require__(/*! ../../common/SchemaValidator */ "./dist/useCases/common/SchemaValidator.js");
-let Validator = class Validator extends SchemaValidator_1.SchemaValidator {
+let Validator = class Validator extends common_1.SchemaValidator {
     constructor(schemaRepository) {
         super(schemaRepository.getSchema("CreateTokenQrCodeForFileRequest"));
     }
 };
 Validator = __decorate([
     __param(0, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [SchemaRepository_1.SchemaRepository])
+    __metadata("design:paramtypes", [common_1.SchemaRepository])
 ], Validator);
 let CreateTokenQrCodeForFileUseCase = class CreateTokenQrCodeForFileUseCase extends common_1.UseCase {
     constructor(fileController, tokenController, validator) {
@@ -9798,17 +10031,15 @@ const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
 const common_1 = __webpack_require__(/*! ../../common */ "./dist/useCases/common/index.js");
-const SchemaRepository_1 = __webpack_require__(/*! ../../common/SchemaRepository */ "./dist/useCases/common/SchemaRepository.js");
-const SchemaValidator_1 = __webpack_require__(/*! ../../common/SchemaValidator */ "./dist/useCases/common/SchemaValidator.js");
 const FileMapper_1 = __webpack_require__(/*! ./FileMapper */ "./dist/useCases/transport/files/FileMapper.js");
-let Validator = class Validator extends SchemaValidator_1.SchemaValidator {
+let Validator = class Validator extends common_1.SchemaValidator {
     constructor(schemaRepository) {
         super(schemaRepository.getSchema("DownloadFileRequest"));
     }
 };
 Validator = __decorate([
     __param(0, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [SchemaRepository_1.SchemaRepository])
+    __metadata("design:paramtypes", [common_1.SchemaRepository])
 ], Validator);
 let DownloadFileUseCase = class DownloadFileUseCase extends common_1.UseCase {
     constructor(fileController, validator) {
@@ -9917,17 +10148,15 @@ const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
 const common_1 = __webpack_require__(/*! ../../common */ "./dist/useCases/common/index.js");
-const SchemaRepository_1 = __webpack_require__(/*! ../../common/SchemaRepository */ "./dist/useCases/common/SchemaRepository.js");
-const SchemaValidator_1 = __webpack_require__(/*! ../../common/SchemaValidator */ "./dist/useCases/common/SchemaValidator.js");
 const FileMapper_1 = __webpack_require__(/*! ./FileMapper */ "./dist/useCases/transport/files/FileMapper.js");
-let Validator = class Validator extends SchemaValidator_1.SchemaValidator {
+let Validator = class Validator extends common_1.SchemaValidator {
     constructor(schemaRepository) {
         super(schemaRepository.getSchema("GetFileRequest"));
     }
 };
 Validator = __decorate([
     __param(0, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [SchemaRepository_1.SchemaRepository])
+    __metadata("design:paramtypes", [common_1.SchemaRepository])
 ], Validator);
 let GetFileUseCase = class GetFileUseCase extends common_1.UseCase {
     constructor(fileController, validator) {
@@ -10062,45 +10291,44 @@ exports.LoadPeerFileUseCase = void 0;
 const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const fluent_ts_validator_1 = __webpack_require__(/*! fluent-ts-validator */ "./node_modules/fluent-ts-validator/index.js");
 const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
 const common_1 = __webpack_require__(/*! ../../common */ "./dist/useCases/common/index.js");
 const FileMapper_1 = __webpack_require__(/*! ./FileMapper */ "./dist/useCases/transport/files/FileMapper.js");
-class LoadPeerFileRequestValidator extends common_1.RuntimeValidator {
-    constructor() {
-        super();
-        this.validateIf((x) => x)
-            .fulfills((x) => this.isCreatePeerFileFromIdAndKeyRequest(x) || this.isCreatePeerFileFromTokenReferenceRequest(x))
-            .withFailureCode(common_1.RuntimeErrors.general.invalidPayload().code)
-            .withFailureMessage(common_1.RuntimeErrors.general.invalidPayload().message);
-        this.setupRulesForCreateFileFromIdAndKeyRequest();
-        this.setupRulesForCreateFileFromTokenReferenceRequest();
-    }
-    setupRulesForCreateFileFromIdAndKeyRequest() {
-        this.validateIfString((x) => x.id)
-            .fulfills(common_1.IdValidator.required(transport_1.BackboneIds.file))
-            .when(this.isCreatePeerFileFromIdAndKeyRequest);
-        this.validateIfString((x) => x.secretKey)
-            .isNotNull()
-            .when(this.isCreatePeerFileFromIdAndKeyRequest);
-    }
-    setupRulesForCreateFileFromTokenReferenceRequest() {
-        this.validateIfString((x) => x.reference)
-            .isNotNull()
-            .fulfills(this.isTokenReference)
-            .when(this.isCreatePeerFileFromTokenReferenceRequest);
-    }
-    isTokenReference(tokenReference) {
-        // "TOK" as Base64
-        const tokInBase64 = "VE9L";
-        return tokenReference.startsWith(tokInBase64);
-    }
-    isCreatePeerFileFromIdAndKeyRequest(x) {
-        return !!x.id && !!x.secretKey;
+function isLoadPeerFileViaSecret(request) {
+    return "id" in request && "secretKey" in request;
+}
+function isLoadPeerFileViaReference(request) {
+    return "reference" in request;
+}
+let Validator = class Validator extends common_1.SchemaValidator {
+    constructor(schemaRepository) {
+        super(schemaRepository.getSchema("LoadPeerFileRequest"));
+        this.loadViaSecretSchema = schemaRepository.getSchema("LoadPeerFileViaSecretRequest");
+        this.loadViaReferenceSchema = schemaRepository.getSchema("LoadPeerFileViaReferenceRequest");
     }
-    isCreatePeerFileFromTokenReferenceRequest(x) {
-        return !!x.reference;
+    validate(input) {
+        if (this.schema.validate(input).isValid)
+            return new fluent_ts_validator_1.ValidationResult();
+        // any-of in combination with missing properties is a bit weird
+        // when { reference: null | undefined } is passed, it ignores reference
+        // and treats it like a LoadPeerFileViaSecret.
+        // That's why we validate with the specific schema afterwards
+        if (isLoadPeerFileViaReference(input)) {
+            return this.convertValidationResult(this.loadViaReferenceSchema.validate(input));
+        }
+        else if (isLoadPeerFileViaSecret(input)) {
+            return this.convertValidationResult(this.loadViaSecretSchema.validate(input));
+        }
+        const result = new fluent_ts_validator_1.ValidationResult();
+        result.addFailures([new fluent_ts_validator_1.ValidationFailure(undefined, "", undefined, common_1.RuntimeErrors.general.invalidPayload().code, common_1.RuntimeErrors.general.invalidPayload().message)]);
+        return result;
     }
-}
+};
+Validator = __decorate([
+    __param(0, typescript_ioc_1.Inject),
+    __metadata("design:paramtypes", [common_1.SchemaRepository])
+], Validator);
 let LoadPeerFileUseCase = class LoadPeerFileUseCase extends common_1.UseCase {
     constructor(fileController, tokenController, accountController, validator) {
         super(validator);
@@ -10110,11 +10338,11 @@ let LoadPeerFileUseCase = class LoadPeerFileUseCase extends common_1.UseCase {
     }
     async executeInternal(request) {
         let createdFile;
-        if (request.id && request.secretKey) {
+        if (isLoadPeerFileViaSecret(request)) {
             const key = await crypto_1.CryptoSecretKey.fromBase64(request.secretKey);
             createdFile = await this.loadFile(transport_1.CoreId.from(request.id), key);
         }
-        else if (request.reference) {
+        else if (isLoadPeerFileViaReference(request)) {
             createdFile = await this.createFileFromTokenReferenceRequest(request.reference);
         }
         else {
@@ -10147,7 +10375,7 @@ LoadPeerFileUseCase = __decorate([
     __metadata("design:paramtypes", [transport_1.FileController,
         transport_1.TokenController,
         transport_1.AccountController,
-        LoadPeerFileRequestValidator])
+        Validator])
 ], LoadPeerFileUseCase);
 exports.LoadPeerFileUseCase = LoadPeerFileUseCase;
 //# sourceMappingURL=LoadPeerFile.js.map
@@ -10775,7 +11003,7 @@ class MessageMapper {
         }
         return {
             id: message.id.toString(),
-            content: message.cache.content,
+            content: message.cache.content.toJSON(),
             createdBy: message.cache.createdBy.toString(),
             createdByDevice: message.cache.createdByDevice.toString(),
             recipients: message.cache.recipients.map((r) => this.toRecipient(r)),
@@ -10803,8 +11031,11 @@ class MessageMapper {
         return messages.map((message) => this.toMessageDTO(message));
     }
     static toRecipient(recipient) {
+        var _a, _b;
         return {
-            address: recipient.address.toString()
+            address: recipient.address.toString(),
+            receivedAt: (_a = recipient.receivedAt) === null || _a === void 0 ? void 0 : _a.toString(),
+            receivedByDevice: (_b = recipient.receivedByDevice) === null || _b === void 0 ? void 0 : _b.toString()
         };
     }
 }
@@ -11967,6 +12198,11 @@ class RelationshipMapper {
             template: RelationshipTemplateMapper_1.RelationshipTemplateMapper.toRelationshipTemplateDTO(relationship.cache.template),
             status: relationship.status,
             peer: relationship.peer.address.toString(),
+            peerIdentity: {
+                address: relationship.peer.address.toString(),
+                publicKey: relationship.peer.publicKey.toString(),
+                realm: relationship.peer.realm
+            },
             changes: relationship.cache.changes.map((c) => this.toRelationshipChangeDTO(c)),
             lastMessageSentAt: (_a = relationship.cache.lastMessageSentAt) === null || _a === void 0 ? void 0 : _a.toString(),
             lastMessageReceivedAt: (_b = relationship.cache.lastMessageReceivedAt) === null || _b === void 0 ? void 0 : _b.toString()
@@ -13252,6 +13488,291 @@ exports.sleep = sleep;
 
 /***/ }),
 
+/***/ "./node_modules/ajv-errors/dist/index.js":
+/*!***********************************************!*\
+  !*** ./node_modules/ajv-errors/dist/index.js ***!
+  \***********************************************/
+/***/ ((module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const ajv_1 = __webpack_require__(/*! ajv */ "./node_modules/ajv/dist/ajv.js");
+const codegen_1 = __webpack_require__(/*! ajv/dist/compile/codegen */ "./node_modules/ajv/dist/compile/codegen/index.js");
+const code_1 = __webpack_require__(/*! ajv/dist/compile/codegen/code */ "./node_modules/ajv/dist/compile/codegen/code.js");
+const validate_1 = __webpack_require__(/*! ajv/dist/compile/validate */ "./node_modules/ajv/dist/compile/validate/index.js");
+const errors_1 = __webpack_require__(/*! ajv/dist/compile/errors */ "./node_modules/ajv/dist/compile/errors.js");
+const names_1 = __webpack_require__(/*! ajv/dist/compile/names */ "./node_modules/ajv/dist/compile/names.js");
+const keyword = "errorMessage";
+const used = new ajv_1.Name("emUsed");
+const KEYWORD_PROPERTY_PARAMS = {
+    required: "missingProperty",
+    dependencies: "property",
+    dependentRequired: "property",
+};
+const INTERPOLATION = /\$\{[^}]+\}/;
+const INTERPOLATION_REPLACE = /\$\{([^}]+)\}/g;
+const EMPTY_STR = /^""\s*\+\s*|\s*\+\s*""$/g;
+function errorMessage(options) {
+    return {
+        keyword,
+        schemaType: ["string", "object"],
+        post: true,
+        code(cxt) {
+            const { gen, data, schema, schemaValue, it } = cxt;
+            if (it.createErrors === false)
+                return;
+            const sch = schema;
+            const instancePath = codegen_1.strConcat(names_1.default.instancePath, it.errorPath);
+            gen.if(ajv_1._ `${names_1.default.errors} > 0`, () => {
+                if (typeof sch == "object") {
+                    const [kwdPropErrors, kwdErrors] = keywordErrorsConfig(sch);
+                    if (kwdErrors)
+                        processKeywordErrors(kwdErrors);
+                    if (kwdPropErrors)
+                        processKeywordPropErrors(kwdPropErrors);
+                    processChildErrors(childErrorsConfig(sch));
+                }
+                const schMessage = typeof sch == "string" ? sch : sch._;
+                if (schMessage)
+                    processAllErrors(schMessage);
+                if (!options.keepErrors)
+                    removeUsedErrors();
+            });
+            function childErrorsConfig({ properties, items }) {
+                const errors = {};
+                if (properties) {
+                    errors.props = {};
+                    for (const p in properties)
+                        errors.props[p] = [];
+                }
+                if (items) {
+                    errors.items = {};
+                    for (let i = 0; i < items.length; i++)
+                        errors.items[i] = [];
+                }
+                return errors;
+            }
+            function keywordErrorsConfig(emSchema) {
+                let propErrors;
+                let errors;
+                for (const k in emSchema) {
+                    if (k === "properties" || k === "items")
+                        continue;
+                    const kwdSch = emSchema[k];
+                    if (typeof kwdSch == "object") {
+                        propErrors || (propErrors = {});
+                        const errMap = (propErrors[k] = {});
+                        for (const p in kwdSch)
+                            errMap[p] = [];
+                    }
+                    else {
+                        errors || (errors = {});
+                        errors[k] = [];
+                    }
+                }
+                return [propErrors, errors];
+            }
+            function processKeywordErrors(kwdErrors) {
+                const kwdErrs = gen.const("emErrors", ajv_1.stringify(kwdErrors));
+                const templates = gen.const("templates", getTemplatesCode(kwdErrors, schema));
+                gen.forOf("err", names_1.default.vErrors, (err) => gen.if(matchKeywordError(err, kwdErrs), () => gen.code(ajv_1._ `${kwdErrs}[${err}.keyword].push(${err})`).assign(ajv_1._ `${err}.${used}`, true)));
+                const { singleError } = options;
+                if (singleError) {
+                    const message = gen.let("message", ajv_1._ `""`);
+                    const paramsErrors = gen.let("paramsErrors", ajv_1._ `[]`);
+                    loopErrors((key) => {
+                        gen.if(message, () => gen.code(ajv_1._ `${message} += ${typeof singleError == "string" ? singleError : ";"}`));
+                        gen.code(ajv_1._ `${message} += ${errMessage(key)}`);
+                        gen.assign(paramsErrors, ajv_1._ `${paramsErrors}.concat(${kwdErrs}[${key}])`);
+                    });
+                    errors_1.reportError(cxt, { message, params: ajv_1._ `{errors: ${paramsErrors}}` });
+                }
+                else {
+                    loopErrors((key) => errors_1.reportError(cxt, {
+                        message: errMessage(key),
+                        params: ajv_1._ `{errors: ${kwdErrs}[${key}]}`,
+                    }));
+                }
+                function loopErrors(body) {
+                    gen.forIn("key", kwdErrs, (key) => gen.if(ajv_1._ `${kwdErrs}[${key}].length`, () => body(key)));
+                }
+                function errMessage(key) {
+                    return ajv_1._ `${key} in ${templates} ? ${templates}[${key}]() : ${schemaValue}[${key}]`;
+                }
+            }
+            function processKeywordPropErrors(kwdPropErrors) {
+                const kwdErrs = gen.const("emErrors", ajv_1.stringify(kwdPropErrors));
+                const templatesCode = [];
+                for (const k in kwdPropErrors) {
+                    templatesCode.push([
+                        k,
+                        getTemplatesCode(kwdPropErrors[k], schema[k]),
+                    ]);
+                }
+                const templates = gen.const("templates", gen.object(...templatesCode));
+                const kwdPropParams = gen.scopeValue("obj", {
+                    ref: KEYWORD_PROPERTY_PARAMS,
+                    code: ajv_1.stringify(KEYWORD_PROPERTY_PARAMS),
+                });
+                const propParam = gen.let("emPropParams");
+                const paramsErrors = gen.let("emParamsErrors");
+                gen.forOf("err", names_1.default.vErrors, (err) => gen.if(matchKeywordError(err, kwdErrs), () => {
+                    gen.assign(propParam, ajv_1._ `${kwdPropParams}[${err}.keyword]`);
+                    gen.assign(paramsErrors, ajv_1._ `${kwdErrs}[${err}.keyword][${err}.params[${propParam}]]`);
+                    gen.if(paramsErrors, () => gen.code(ajv_1._ `${paramsErrors}.push(${err})`).assign(ajv_1._ `${err}.${used}`, true));
+                }));
+                gen.forIn("key", kwdErrs, (key) => gen.forIn("keyProp", ajv_1._ `${kwdErrs}[${key}]`, (keyProp) => {
+                    gen.assign(paramsErrors, ajv_1._ `${kwdErrs}[${key}][${keyProp}]`);
+                    gen.if(ajv_1._ `${paramsErrors}.length`, () => {
+                        const tmpl = gen.const("tmpl", ajv_1._ `${templates}[${key}] && ${templates}[${key}][${keyProp}]`);
+                        errors_1.reportError(cxt, {
+                            message: ajv_1._ `${tmpl} ? ${tmpl}() : ${schemaValue}[${key}][${keyProp}]`,
+                            params: ajv_1._ `{errors: ${paramsErrors}}`,
+                        });
+                    });
+                }));
+            }
+            function processChildErrors(childErrors) {
+                const { props, items } = childErrors;
+                if (!props && !items)
+                    return;
+                const isObj = ajv_1._ `typeof ${data} == "object"`;
+                const isArr = ajv_1._ `Array.isArray(${data})`;
+                const childErrs = gen.let("emErrors");
+                let childKwd;
+                let childProp;
+                const templates = gen.let("templates");
+                if (props && items) {
+                    childKwd = gen.let("emChildKwd");
+                    gen.if(isObj);
+                    gen.if(isArr, () => {
+                        init(items, schema.items);
+                        gen.assign(childKwd, ajv_1.str `items`);
+                    }, () => {
+                        init(props, schema.properties);
+                        gen.assign(childKwd, ajv_1.str `properties`);
+                    });
+                    childProp = ajv_1._ `[${childKwd}]`;
+                }
+                else if (items) {
+                    gen.if(isArr);
+                    init(items, schema.items);
+                    childProp = ajv_1._ `.items`;
+                }
+                else if (props) {
+                    gen.if(codegen_1.and(isObj, codegen_1.not(isArr)));
+                    init(props, schema.properties);
+                    childProp = ajv_1._ `.properties`;
+                }
+                gen.forOf("err", names_1.default.vErrors, (err) => ifMatchesChildError(err, childErrs, (child) => gen.code(ajv_1._ `${childErrs}[${child}].push(${err})`).assign(ajv_1._ `${err}.${used}`, true)));
+                gen.forIn("key", childErrs, (key) => gen.if(ajv_1._ `${childErrs}[${key}].length`, () => {
+                    errors_1.reportError(cxt, {
+                        message: ajv_1._ `${key} in ${templates} ? ${templates}[${key}]() : ${schemaValue}${childProp}[${key}]`,
+                        params: ajv_1._ `{errors: ${childErrs}[${key}]}`,
+                    });
+                    gen.assign(ajv_1._ `${names_1.default.vErrors}[${names_1.default.errors}-1].instancePath`, ajv_1._ `${instancePath} + "/" + ${key}.replace(/~/g, "~0").replace(/\\//g, "~1")`);
+                }));
+                gen.endIf();
+                function init(children, msgs) {
+                    gen.assign(childErrs, ajv_1.stringify(children));
+                    gen.assign(templates, getTemplatesCode(children, msgs));
+                }
+            }
+            function processAllErrors(schMessage) {
+                const errs = gen.const("emErrs", ajv_1._ `[]`);
+                gen.forOf("err", names_1.default.vErrors, (err) => gen.if(matchAnyError(err), () => gen.code(ajv_1._ `${errs}.push(${err})`).assign(ajv_1._ `${err}.${used}`, true)));
+                gen.if(ajv_1._ `${errs}.length`, () => errors_1.reportError(cxt, {
+                    message: templateExpr(schMessage),
+                    params: ajv_1._ `{errors: ${errs}}`,
+                }));
+            }
+            function removeUsedErrors() {
+                const errs = gen.const("emErrs", ajv_1._ `[]`);
+                gen.forOf("err", names_1.default.vErrors, (err) => gen.if(ajv_1._ `!${err}.${used}`, () => gen.code(ajv_1._ `${errs}.push(${err})`)));
+                gen.assign(names_1.default.vErrors, errs).assign(names_1.default.errors, ajv_1._ `${errs}.length`);
+            }
+            function matchKeywordError(err, kwdErrs) {
+                return codegen_1.and(ajv_1._ `${err}.keyword !== ${keyword}`, ajv_1._ `!${err}.${used}`, ajv_1._ `${err}.instancePath === ${instancePath}`, ajv_1._ `${err}.keyword in ${kwdErrs}`, 
+                // TODO match the end of the string?
+                ajv_1._ `${err}.schemaPath.indexOf(${it.errSchemaPath}) === 0`, ajv_1._ `/^\\/[^\\/]*$/.test(${err}.schemaPath.slice(${it.errSchemaPath.length}))`);
+            }
+            function ifMatchesChildError(err, childErrs, thenBody) {
+                gen.if(codegen_1.and(ajv_1._ `${err}.keyword !== ${keyword}`, ajv_1._ `!${err}.${used}`, ajv_1._ `${err}.instancePath.indexOf(${instancePath}) === 0`), () => {
+                    const childRegex = gen.scopeValue("pattern", {
+                        ref: /^\/([^/]*)(?:\/|$)/,
+                        code: ajv_1._ `new RegExp("^\\\/([^/]*)(?:\\\/|$)")`,
+                    });
+                    const matches = gen.const("emMatches", ajv_1._ `${childRegex}.exec(${err}.instancePath.slice(${instancePath}.length))`);
+                    const child = gen.const("emChild", ajv_1._ `${matches} && ${matches}[1].replace(/~1/g, "/").replace(/~0/g, "~")`);
+                    gen.if(ajv_1._ `${child} !== undefined && ${child} in ${childErrs}`, () => thenBody(child));
+                });
+            }
+            function matchAnyError(err) {
+                return codegen_1.and(ajv_1._ `${err}.keyword !== ${keyword}`, ajv_1._ `!${err}.${used}`, codegen_1.or(ajv_1._ `${err}.instancePath === ${instancePath}`, codegen_1.and(ajv_1._ `${err}.instancePath.indexOf(${instancePath}) === 0`, ajv_1._ `${err}.instancePath[${instancePath}.length] === "/"`)), ajv_1._ `${err}.schemaPath.indexOf(${it.errSchemaPath}) === 0`, ajv_1._ `${err}.schemaPath[${it.errSchemaPath}.length] === "/"`);
+            }
+            function getTemplatesCode(keys, msgs) {
+                const templatesCode = [];
+                for (const k in keys) {
+                    const msg = msgs[k];
+                    if (INTERPOLATION.test(msg))
+                        templatesCode.push([k, templateFunc(msg)]);
+                }
+                return gen.object(...templatesCode);
+            }
+            function templateExpr(msg) {
+                if (!INTERPOLATION.test(msg))
+                    return ajv_1.stringify(msg);
+                return new code_1._Code(code_1.safeStringify(msg)
+                    .replace(INTERPOLATION_REPLACE, (_s, ptr) => `" + JSON.stringify(${validate_1.getData(ptr, it)}) + "`)
+                    .replace(EMPTY_STR, ""));
+            }
+            function templateFunc(msg) {
+                return ajv_1._ `function(){return ${templateExpr(msg)}}`;
+            }
+        },
+        metaSchema: {
+            anyOf: [
+                { type: "string" },
+                {
+                    type: "object",
+                    properties: {
+                        properties: { $ref: "#/$defs/stringMap" },
+                        items: { $ref: "#/$defs/stringList" },
+                        required: { $ref: "#/$defs/stringOrMap" },
+                        dependencies: { $ref: "#/$defs/stringOrMap" },
+                    },
+                    additionalProperties: { type: "string" },
+                },
+            ],
+            $defs: {
+                stringMap: {
+                    type: "object",
+                    additionalProperties: { type: "string" },
+                },
+                stringOrMap: {
+                    anyOf: [{ type: "string" }, { $ref: "#/$defs/stringMap" }],
+                },
+                stringList: { type: "array", items: { type: "string" } },
+            },
+        },
+    };
+}
+const ajvErrors = (ajv, options = {}) => {
+    if (!ajv.opts.allErrors)
+        throw new Error("ajv-errors: Ajv option allErrors must be true");
+    if (ajv.opts.jsPropertySyntax) {
+        throw new Error("ajv-errors: ajv option jsPropertySyntax is not supported");
+    }
+    return ajv.addKeyword(errorMessage(options));
+};
+exports["default"] = ajvErrors;
+module.exports = ajvErrors;
+module.exports["default"] = ajvErrors;
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
 /***/ "./node_modules/ajv-formats/dist/formats.js":
 /*!**************************************************!*\
   !*** ./node_modules/ajv-formats/dist/formats.js ***!
@@ -30111,8 +30632,7 @@ var Duration = /*#__PURE__*/function () {
 
         var i = Math.trunc(own);
         built[k] = i;
-        accumulated[k] = own - i; // we'd like to absorb these fractions in another unit
-        // plus anything further down the chain that should be rolled up in to this
+        accumulated[k] = (own * 1000 - i * 1000) / 1000; // plus anything further down the chain that should be rolled up in to this
 
         for (var down in vals) {
           if (orderedUnits$1.indexOf(down) > orderedUnits$1.indexOf(k)) {
@@ -31873,14 +32393,19 @@ function dateTimeFromMatches(matches) {
     }
   };
 
-  var zone;
+  var zone = null;
+  var specificOffset;
 
-  if (!isUndefined(matches.Z)) {
-    zone = new FixedOffsetZone(matches.Z);
-  } else if (!isUndefined(matches.z)) {
+  if (!isUndefined(matches.z)) {
     zone = IANAZone.create(matches.z);
-  } else {
-    zone = null;
+  }
+
+  if (!isUndefined(matches.Z)) {
+    if (!zone) {
+      zone = new FixedOffsetZone(matches.Z);
+    }
+
+    specificOffset = matches.Z;
   }
 
   if (!isUndefined(matches.q)) {
@@ -31912,7 +32437,7 @@ function dateTimeFromMatches(matches) {
 
     return r;
   }, {});
-  return [vals, zone];
+  return [vals, zone, specificOffset];
 }
 
 var dummyDateTimeCache = null;
@@ -31984,9 +32509,10 @@ function explainFromTokens(locale, input, format) {
         _match = match(input, regex, handlers),
         rawMatches = _match[0],
         matches = _match[1],
-        _ref6 = matches ? dateTimeFromMatches(matches) : [null, null],
+        _ref6 = matches ? dateTimeFromMatches(matches) : [null, null, undefined],
         result = _ref6[0],
-        zone = _ref6[1];
+        zone = _ref6[1],
+        specificOffset = _ref6[2];
 
     if (hasOwnProperty(matches, "a") && hasOwnProperty(matches, "H")) {
       throw new ConflictingSpecificationError("Can't include meridiem when specifying 24-hour format");
@@ -31999,7 +32525,8 @@ function explainFromTokens(locale, input, format) {
       rawMatches: rawMatches,
       matches: matches,
       result: result,
-      zone: zone
+      zone: zone,
+      specificOffset: specificOffset
     };
   }
 }
@@ -32007,9 +32534,10 @@ function parseFromTokens(locale, input, format) {
   var _explainFromTokens = explainFromTokens(locale, input, format),
       result = _explainFromTokens.result,
       zone = _explainFromTokens.zone,
+      specificOffset = _explainFromTokens.specificOffset,
       invalidReason = _explainFromTokens.invalidReason;
 
-  return [result, zone, invalidReason];
+  return [result, zone, specificOffset, invalidReason];
 }
 
 var nonLeapLadder = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334],
@@ -32297,14 +32825,15 @@ function adjustTime(inst, dur) {
 // by handling the zone options
 
 
-function parseDataToDateTime(parsed, parsedZone, opts, format, text) {
+function parseDataToDateTime(parsed, parsedZone, opts, format, text, specificOffset) {
   var setZone = opts.setZone,
       zone = opts.zone;
 
   if (parsed && Object.keys(parsed).length !== 0) {
     var interpretationZone = parsedZone || zone,
         inst = DateTime.fromObject(parsed, _extends({}, opts, {
-      zone: interpretationZone
+      zone: interpretationZone,
+      specificOffset: specificOffset
     }));
     return setZone ? inst : inst.setZone(zone);
   } else {
@@ -32849,7 +33378,7 @@ var DateTime = /*#__PURE__*/function () {
     }
 
     var tsNow = Settings.now(),
-        offsetProvis = zoneToUse.offset(tsNow),
+        offsetProvis = !isUndefined(opts.specificOffset) ? opts.specificOffset : zoneToUse.offset(tsNow),
         normalized = normalizeObject(obj, normalizeUnit),
         containsOrdinal = !isUndefined(normalized.ordinal),
         containsGregorYear = !isUndefined(normalized.year),
@@ -33053,12 +33582,13 @@ var DateTime = /*#__PURE__*/function () {
         _parseFromTokens = parseFromTokens(localeToUse, text, fmt),
         vals = _parseFromTokens[0],
         parsedZone = _parseFromTokens[1],
-        invalid = _parseFromTokens[2];
+        specificOffset = _parseFromTokens[2],
+        invalid = _parseFromTokens[3];
 
     if (invalid) {
       return DateTime.invalid(invalid);
     } else {
-      return parseDataToDateTime(vals, parsedZone, opts, "format " + fmt, text);
+      return parseDataToDateTime(vals, parsedZone, opts, "format " + fmt, text, specificOffset);
     }
   }
   /**
@@ -34696,7 +35226,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-var VERSION = "2.1.1";
+var VERSION = "2.2.0";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;