@nmshd/runtime 1.2.0 → 1.2.4

package/lib-web/nmshd.runtime.js

@@ -330,11 +330,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.0",
-    build: "14",
-    date: "2021-11-29T12:01:12+00:00",
-    commit: "07c04e6bc76f4db765dc9ce593d09a7706ca0682",
-    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.4",
+    build: "19",
+    date: "2021-12-16T12:18:55+00:00",
+    commit: "13b03dd2843fc516dec483615cd1a10ca41d5417",
+    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.6","@nmshd/content":"1.1.2","@nmshd/crypto":"1.0.6","@nmshd/transport":"1.1.1","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,
@@ -1160,8 +1160,9 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DataEvent = void 0;
 const Event_1 = __webpack_require__(/*! ./Event */ "./dist/events/Event.js");
 class DataEvent extends Event_1.Event {
-    constructor(namespace, data) {
+    constructor(namespace, eventTargetAddress, data) {
         super(namespace);
+        this.eventTargetAddress = eventTargetAddress;
         this.data = data;
     }
 }
@@ -1202,8 +1203,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MailReceivedEvent = void 0;
 const DataEvent_1 = __webpack_require__(/*! ../DataEvent */ "./dist/events/DataEvent.js");
 class MailReceivedEvent extends DataEvent_1.DataEvent {
-    constructor(mail, data) {
-        super(MailReceivedEvent.namespace, data);
+    constructor(eventTargetAddress, mail, data) {
+        super(MailReceivedEvent.namespace, eventTargetAddress, data);
         this.mail = mail;
     }
 }
@@ -1225,8 +1226,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RelationshipEvent = void 0;
 const DataEvent_1 = __webpack_require__(/*! ../DataEvent */ "./dist/events/DataEvent.js");
 class RelationshipEvent extends DataEvent_1.DataEvent {
-    constructor(event, data) {
-        super(RelationshipEvent.namespace + data.id, data);
+    constructor(eventTargetAddress, event, data) {
+        super(RelationshipEvent.namespace + data.id, eventTargetAddress, data);
         this.event = event;
     }
 }
@@ -1248,8 +1249,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RequestMailReceivedEvent = void 0;
 const DataEvent_1 = __webpack_require__(/*! ../DataEvent */ "./dist/events/DataEvent.js");
 class RequestMailReceivedEvent extends DataEvent_1.DataEvent {
-    constructor(requestMail, data) {
-        super(RequestMailReceivedEvent.namespace, data);
+    constructor(eventTargetAddress, requestMail, data) {
+        super(RequestMailReceivedEvent.namespace, eventTargetAddress, data);
         this.requestMail = requestMail;
     }
 }
@@ -1271,8 +1272,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RequestReceivedEvent = void 0;
 const DataEvent_1 = __webpack_require__(/*! ../DataEvent */ "./dist/events/DataEvent.js");
 class RequestReceivedEvent extends DataEvent_1.DataEvent {
-    constructor(request, data) {
-        super(RequestReceivedEvent.namespace, data);
+    constructor(eventTargetAddress, request, data) {
+        super(RequestReceivedEvent.namespace, eventTargetAddress, data);
         this.request = request;
     }
 }
@@ -1439,8 +1440,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MessageReceivedEvent = void 0;
 const DataEvent_1 = __webpack_require__(/*! ../DataEvent */ "./dist/events/DataEvent.js");
 class MessageReceivedEvent extends DataEvent_1.DataEvent {
-    constructor(data) {
-        super(MessageReceivedEvent.namespace, data);
+    constructor(eventTargetAddress, data) {
+        super(MessageReceivedEvent.namespace, eventTargetAddress, data);
     }
 }
 exports.MessageReceivedEvent = MessageReceivedEvent;
@@ -1461,8 +1462,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MessageSentEvent = void 0;
 const DataEvent_1 = __webpack_require__(/*! ../DataEvent */ "./dist/events/DataEvent.js");
 class MessageSentEvent extends DataEvent_1.DataEvent {
-    constructor(data) {
-        super(MessageSentEvent.namespace, data);
+    constructor(eventTargetAddress, data) {
+        super(MessageSentEvent.namespace, eventTargetAddress, data);
     }
 }
 exports.MessageSentEvent = MessageSentEvent;
@@ -1483,8 +1484,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RelationshipChangedEvent = void 0;
 const DataEvent_1 = __webpack_require__(/*! ../DataEvent */ "./dist/events/DataEvent.js");
 class RelationshipChangedEvent extends DataEvent_1.DataEvent {
-    constructor(data) {
-        super(RelationshipChangedEvent.namespace, data);
+    constructor(eventTargetAddress, data) {
+        super(RelationshipChangedEvent.namespace, eventTargetAddress, data);
     }
 }
 exports.RelationshipChangedEvent = RelationshipChangedEvent;
@@ -2931,18 +2932,18 @@ class MessageModule extends RuntimeModule_1.RuntimeModule {
         switch (type) {
             case "Mail":
                 const mail = await content_1.Mail.from(message.content);
-                event = new MailReceivedEvent_1.MailReceivedEvent(mail, message);
+                event = new MailReceivedEvent_1.MailReceivedEvent(messageReceivedEvent.eventTargetAddress, mail, message);
                 this.runtime.eventBus.publish(event);
                 this.logger.trace(`Published MailReceivedEvent for ${message.id}`);
                 break;
             case "RequestMail":
                 const requestMail = await content_1.RequestMail.from(message.content);
-                event = new RequestMailReceivedEvent_1.RequestMailReceivedEvent(requestMail, message);
+                event = new RequestMailReceivedEvent_1.RequestMailReceivedEvent(messageReceivedEvent.eventTargetAddress, requestMail, message);
                 this.runtime.eventBus.publish(event);
                 this.logger.trace(`Published RequestMailReceivedEvent for ${message.id}`);
                 let i = 0;
                 for (const request of requestMail.requests) {
-                    this.runtime.eventBus.publish(new RequestReceivedEvent_1.RequestReceivedEvent(request, message));
+                    this.runtime.eventBus.publish(new RequestReceivedEvent_1.RequestReceivedEvent(messageReceivedEvent.eventTargetAddress, request, message));
                     this.logger.trace(`Published RequestReceivedEvent request #${i} of RequestMail ${message.id}`);
                     i++;
                 }
@@ -2957,7 +2958,7 @@ class MessageModule extends RuntimeModule_1.RuntimeModule {
             return;
         }
         const relationship = result.value;
-        this.runtime.eventBus.publish(new RelationshipEvent_1.RelationshipEvent(event, relationship));
+        this.runtime.eventBus.publish(new RelationshipEvent_1.RelationshipEvent(messageReceivedEvent.eventTargetAddress, event, relationship));
         this.logger.trace(`Published RelationshipEvent for ${message.id} to ${relationship.id}`);
     }
     stop() {
@@ -3793,21 +3794,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() {
@@ -3840,7 +3843,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;
@@ -3848,40 +3851,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 ***!
@@ -3891,8 +3860,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.GetAttributesByNameRequest = 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",
@@ -3933,6 +3902,16 @@ exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = {
         }
     }
 };
+exports.GetAttributesByNameRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/GetAttributesByNameRequest",
+    "definitions": {
+        "GetAttributesByNameRequest": {
+            "type": "object",
+            "additionalProperties": false
+        }
+    }
+};
 exports.CreateAttributeRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/CreateAttributeRequest",
@@ -4065,16 +4044,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",
@@ -4904,6 +4873,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",
@@ -5073,25 +5083,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",
@@ -5134,11 +5125,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": {
@@ -5146,13 +5191,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"
         }
     }
 };
@@ -5247,28 +5308,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",
@@ -5534,6 +5573,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",
@@ -5818,11 +5902,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
 
 /***/ }),
@@ -5959,6 +6045,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 ***!
@@ -8995,9 +9118,10 @@ const common_1 = __webpack_require__(/*! ../../common */ "./dist/useCases/common
 const MessageMapper_1 = __webpack_require__(/*! ../messages/MessageMapper */ "./dist/useCases/transport/messages/MessageMapper.js");
 const RelationshipMapper_1 = __webpack_require__(/*! ../relationships/RelationshipMapper */ "./dist/useCases/transport/relationships/RelationshipMapper.js");
 let SyncEverythingUseCase = class SyncEverythingUseCase extends common_1.UseCase {
-    constructor(accountController, eventBus, loggerFactory) {
+    constructor(accountController, identityController, eventBus, loggerFactory) {
         super();
         this.accountController = accountController;
+        this.identityController = identityController;
         this.eventBus = eventBus;
         this.logger = loggerFactory.getLogger(SyncEverythingUseCase);
     }
@@ -9017,30 +9141,31 @@ let SyncEverythingUseCase = class SyncEverythingUseCase extends common_1.UseCase
         const changedItems = await this.accountController.syncEverything();
         const messageDTOs = changedItems.messages.map((m) => MessageMapper_1.MessageMapper.toMessageDTO(m));
         const relationshipDTOs = changedItems.relationships.map((r) => RelationshipMapper_1.RelationshipMapper.toRelationshipDTO(r));
-        this.processNewMessages(messageDTOs);
-        this.processNewRelationships(relationshipDTOs);
+        const eventTargetAddress = this.identityController.identity.address.toString();
+        this.processNewMessages(messageDTOs, eventTargetAddress);
+        this.processNewRelationships(relationshipDTOs, eventTargetAddress);
         return ts_utils_1.Result.ok({
             messages: messageDTOs,
             relationships: relationshipDTOs
         });
     }
-    processNewRelationships(relationships) {
+    processNewRelationships(relationships, eventTargetAddress) {
         if (relationships.length === 0) {
             return;
         }
         this.logger.debug(`Found ${relationships.length} relationship(s) with changes. Start publishing on event bus...`);
         for (const relationship of relationships) {
-            this.eventBus.publish(new events_1.RelationshipChangedEvent(relationship));
+            this.eventBus.publish(new events_1.RelationshipChangedEvent(eventTargetAddress, relationship));
         }
         this.logger.debug("Finished publishing relationship changes on event bus.");
     }
-    processNewMessages(messages) {
+    processNewMessages(messages, eventTargetAddress) {
         if (messages.length === 0) {
             return;
         }
         this.logger.debug(`Found ${messages.length} new message(s). Start publishing on event bus...`);
         for (const message of messages) {
-            this.eventBus.publish(new events_1.MessageReceivedEvent(message));
+            this.eventBus.publish(new events_1.MessageReceivedEvent(eventTargetAddress, message));
         }
         this.logger.debug("Finished publishing message changes on event bus.");
     }
@@ -9049,7 +9174,11 @@ SyncEverythingUseCase = __decorate([
     __param(0, typescript_ioc_1.Inject),
     __param(1, typescript_ioc_1.Inject),
     __param(2, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [transport_1.AccountController, ts_utils_1.EventBus, RuntimeLoggerFactory_1.RuntimeLoggerFactory])
+    __param(3, typescript_ioc_1.Inject),
+    __metadata("design:paramtypes", [transport_1.AccountController,
+        transport_1.IdentityController,
+        ts_utils_1.EventBus,
+        RuntimeLoggerFactory_1.RuntimeLoggerFactory])
 ], SyncEverythingUseCase);
 exports.SyncEverythingUseCase = SyncEverythingUseCase;
 //# sourceMappingURL=SyncEverything.js.map
@@ -9632,17 +9761,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) {
@@ -9716,16 +9843,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) {
@@ -9791,17 +9916,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) {
@@ -9910,17 +10033,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) {
@@ -10055,45 +10176,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);
@@ -10103,11 +10223,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 {
@@ -10140,7 +10260,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
@@ -10844,11 +10964,12 @@ class SendMessageRequestValidator extends common_1.RuntimeValidator {
     }
 }
 let SendMessageUseCase = class SendMessageUseCase extends common_1.UseCase {
-    constructor(messageController, fileController, accountController, eventBus, validator) {
+    constructor(messageController, fileController, accountController, identityController, eventBus, validator) {
         super(validator);
         this.messageController = messageController;
         this.fileController = fileController;
         this.accountController = accountController;
+        this.identityController = identityController;
         this.eventBus = eventBus;
     }
     async executeInternal(request) {
@@ -10862,7 +10983,7 @@ let SendMessageUseCase = class SendMessageUseCase extends common_1.UseCase {
             attachments: transformAttachmentsResult.value
         });
         const messageDTO = MessageMapper_1.MessageMapper.toMessageDTO(result);
-        this.eventBus.publish(new events_1.MessageSentEvent(messageDTO));
+        this.eventBus.publish(new events_1.MessageSentEvent(this.identityController.identity.address.toString(), messageDTO));
         await this.accountController.syncDatawallet();
         return ts_utils_1.Result.ok(MessageMapper_1.MessageMapper.toMessageDTO(result));
     }
@@ -10887,9 +11008,11 @@ SendMessageUseCase = __decorate([
     __param(2, typescript_ioc_1.Inject),
     __param(3, typescript_ioc_1.Inject),
     __param(4, typescript_ioc_1.Inject),
+    __param(5, typescript_ioc_1.Inject),
     __metadata("design:paramtypes", [transport_1.MessageController,
         transport_1.FileController,
         transport_1.AccountController,
+        transport_1.IdentityController,
         ts_utils_1.EventBus,
         SendMessageRequestValidator])
 ], SendMessageUseCase);
@@ -11497,10 +11620,11 @@ class AcceptRelationshipChangeRequestValidator extends common_1.RuntimeValidator
     }
 }
 let AcceptRelationshipChangeUseCase = class AcceptRelationshipChangeUseCase extends common_1.UseCase {
-    constructor(relationshipsController, accountController, eventBus, validator) {
+    constructor(relationshipsController, accountController, identityController, eventBus, validator) {
         super(validator);
         this.relationshipsController = relationshipsController;
         this.accountController = accountController;
+        this.identityController = identityController;
         this.eventBus = eventBus;
     }
     async executeInternal(request) {
@@ -11517,7 +11641,7 @@ let AcceptRelationshipChangeUseCase = class AcceptRelationshipChangeUseCase exte
         }
         const updatedRelationship = await this.relationshipsController.acceptChange(change, request.content);
         const relationshipDTO = RelationshipMapper_1.RelationshipMapper.toRelationshipDTO(updatedRelationship);
-        this.eventBus.publish(new events_1.RelationshipChangedEvent(relationshipDTO));
+        this.eventBus.publish(new events_1.RelationshipChangedEvent(this.identityController.identity.address.toString(), relationshipDTO));
         await this.accountController.syncDatawallet();
         return ts_utils_1.Result.ok(relationshipDTO);
     }
@@ -11527,8 +11651,10 @@ AcceptRelationshipChangeUseCase = __decorate([
     __param(1, typescript_ioc_1.Inject),
     __param(2, typescript_ioc_1.Inject),
     __param(3, typescript_ioc_1.Inject),
+    __param(4, typescript_ioc_1.Inject),
     __metadata("design:paramtypes", [transport_1.RelationshipsController,
         transport_1.AccountController,
+        transport_1.IdentityController,
         ts_utils_1.EventBus,
         AcceptRelationshipChangeRequestValidator])
 ], AcceptRelationshipChangeUseCase);
@@ -11573,11 +11699,12 @@ class CreateRelationshipRequestValidator extends common_1.RuntimeValidator {
     }
 }
 let CreateRelationshipUseCase = class CreateRelationshipUseCase extends common_1.UseCase {
-    constructor(relationshipsController, relationshipTemplateController, accountController, eventBus, validator) {
+    constructor(relationshipsController, relationshipTemplateController, accountController, identityController, eventBus, validator) {
         super(validator);
         this.relationshipsController = relationshipsController;
         this.relationshipTemplateController = relationshipTemplateController;
         this.accountController = accountController;
+        this.identityController = identityController;
         this.eventBus = eventBus;
     }
     async executeInternal(request) {
@@ -11590,7 +11717,7 @@ let CreateRelationshipUseCase = class CreateRelationshipUseCase extends common_1
             content: request.content
         });
         const relationshipDTO = RelationshipMapper_1.RelationshipMapper.toRelationshipDTO(relationship);
-        this.eventBus.publish(new events_1.RelationshipChangedEvent(relationshipDTO));
+        this.eventBus.publish(new events_1.RelationshipChangedEvent(this.identityController.identity.address.toString(), relationshipDTO));
         await this.accountController.syncDatawallet();
         return ts_utils_1.Result.ok(relationshipDTO);
     }
@@ -11601,9 +11728,11 @@ CreateRelationshipUseCase = __decorate([
     __param(2, typescript_ioc_1.Inject),
     __param(3, typescript_ioc_1.Inject),
     __param(4, typescript_ioc_1.Inject),
+    __param(5, typescript_ioc_1.Inject),
     __metadata("design:paramtypes", [transport_1.RelationshipsController,
         transport_1.RelationshipTemplateController,
         transport_1.AccountController,
+        transport_1.IdentityController,
         ts_utils_1.EventBus,
         CreateRelationshipRequestValidator])
 ], CreateRelationshipUseCase);
@@ -11884,10 +12013,11 @@ class RejectRelationshipChangeRequestValidator extends common_1.RuntimeValidator
     }
 }
 let RejectRelationshipChangeUseCase = class RejectRelationshipChangeUseCase extends common_1.UseCase {
-    constructor(relationshipsController, accountController, eventBus, validator) {
+    constructor(relationshipsController, accountController, identityController, eventBus, validator) {
         super(validator);
         this.relationshipsController = relationshipsController;
         this.accountController = accountController;
+        this.identityController = identityController;
         this.eventBus = eventBus;
     }
     async executeInternal(request) {
@@ -11904,7 +12034,7 @@ let RejectRelationshipChangeUseCase = class RejectRelationshipChangeUseCase exte
         }
         const updatedRelationship = await this.relationshipsController.rejectChange(change, request.content);
         const relationshipDTO = RelationshipMapper_1.RelationshipMapper.toRelationshipDTO(updatedRelationship);
-        this.eventBus.publish(new events_1.RelationshipChangedEvent(relationshipDTO));
+        this.eventBus.publish(new events_1.RelationshipChangedEvent(this.identityController.identity.address.toString(), relationshipDTO));
         await this.accountController.syncDatawallet();
         return ts_utils_1.Result.ok(relationshipDTO);
     }
@@ -11914,8 +12044,10 @@ RejectRelationshipChangeUseCase = __decorate([
     __param(1, typescript_ioc_1.Inject),
     __param(2, typescript_ioc_1.Inject),
     __param(3, typescript_ioc_1.Inject),
+    __param(4, typescript_ioc_1.Inject),
     __metadata("design:paramtypes", [transport_1.RelationshipsController,
         transport_1.AccountController,
+        transport_1.IdentityController,
         ts_utils_1.EventBus,
         RejectRelationshipChangeRequestValidator])
 ], RejectRelationshipChangeUseCase);
@@ -12023,11 +12155,12 @@ class RevokeRelationshipChangeRequestValidator extends common_1.RuntimeValidator
     }
 }
 let RevokeRelationshipChangeUseCase = class RevokeRelationshipChangeUseCase extends common_1.UseCase {
-    constructor(relationshipsController, accountController, eventBus, validator) {
+    constructor(relationshipsController, accountController, eventBus, identityController, validator) {
         super(validator);
         this.relationshipsController = relationshipsController;
         this.accountController = accountController;
         this.eventBus = eventBus;
+        this.identityController = identityController;
     }
     async executeInternal(request) {
         const relationship = await this.relationshipsController.getRelationship(transport_1.CoreId.from(request.relationshipId));
@@ -12043,7 +12176,7 @@ let RevokeRelationshipChangeUseCase = class RevokeRelationshipChangeUseCase exte
         }
         const updatedRelationship = await this.relationshipsController.revokeChange(change, request.content);
         const relationshipDTO = RelationshipMapper_1.RelationshipMapper.toRelationshipDTO(updatedRelationship);
-        this.eventBus.publish(new events_1.RelationshipChangedEvent(relationshipDTO));
+        this.eventBus.publish(new events_1.RelationshipChangedEvent(this.identityController.identity.address.toString(), relationshipDTO));
         await this.accountController.syncDatawallet();
         return ts_utils_1.Result.ok(relationshipDTO);
     }
@@ -12053,9 +12186,11 @@ RevokeRelationshipChangeUseCase = __decorate([
     __param(1, typescript_ioc_1.Inject),
     __param(2, typescript_ioc_1.Inject),
     __param(3, typescript_ioc_1.Inject),
+    __param(4, typescript_ioc_1.Inject),
     __metadata("design:paramtypes", [transport_1.RelationshipsController,
         transport_1.AccountController,
         ts_utils_1.EventBus,
+        transport_1.IdentityController,
         RevokeRelationshipChangeRequestValidator])
 ], RevokeRelationshipChangeUseCase);
 exports.RevokeRelationshipChangeUseCase = RevokeRelationshipChangeUseCase;
@@ -13230,6 +13365,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 ***!
@@ -30089,8 +30509,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)) {
@@ -31851,14 +32270,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)) {
@@ -31890,7 +32314,7 @@ function dateTimeFromMatches(matches) {
 
     return r;
   }, {});
-  return [vals, zone];
+  return [vals, zone, specificOffset];
 }
 
 var dummyDateTimeCache = null;
@@ -31962,9 +32386,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");
@@ -31977,7 +32402,8 @@ function explainFromTokens(locale, input, format) {
       rawMatches: rawMatches,
       matches: matches,
       result: result,
-      zone: zone
+      zone: zone,
+      specificOffset: specificOffset
     };
   }
 }
@@ -31985,9 +32411,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],
@@ -32275,14 +32702,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 {
@@ -32827,7 +33255,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),
@@ -33031,12 +33459,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);
     }
   }
   /**
@@ -34674,7 +35103,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-var VERSION = "2.1.1";
+var VERSION = "2.2.0";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;