From 5ca7002cced88968d4e283a7dabe1aa91b195585 Mon Sep 17 00:00:00 2001 From: LeonfLK Date: Thu, 6 Aug 2020 23:18:08 +0200 Subject: [PATCH 1/2] fix: destructuring of message before responding --- src/ctypes/ctypes.controller.ts | 2 +- src/messaging/mongodb-messaging.service.ts | 34 ++++++++++++++++++++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/ctypes/ctypes.controller.ts b/src/ctypes/ctypes.controller.ts index d4f4a49..69001ad 100644 --- a/src/ctypes/ctypes.controller.ts +++ b/src/ctypes/ctypes.controller.ts @@ -41,7 +41,7 @@ export class CTypesController { @Delete() public async removeAll() { console.log('Remove all CTypes') - await this.cTypesService.removeAll() + this.cTypesService.removeAll() } @Post() diff --git a/src/messaging/mongodb-messaging.service.ts b/src/messaging/mongodb-messaging.service.ts index 68befd1..414ac57 100644 --- a/src/messaging/mongodb-messaging.service.ts +++ b/src/messaging/mongodb-messaging.service.ts @@ -20,13 +20,43 @@ export class MongoDbMessagingService implements MessagingService { public async findBySenderAddress( senderAddress: IEncryptedMessage['senderAddress'] ): Promise { - return await this.messageModel.find({ senderAddress }).exec() + return (await this.messageModel.find({ senderAddress }).exec()).map( + (singleDBMessage: MessageDB) => { + return { + message: singleDBMessage.message, + nonce: singleDBMessage.nonce, + createdAt: singleDBMessage.createdAt, + hash: singleDBMessage.hash, + signature: singleDBMessage.signature, + receiverAddress: singleDBMessage.receiverAddress, + senderAddress: singleDBMessage.senderAddress, + senderBoxPublicKey: singleDBMessage.senderBoxPublicKey, + messageId: singleDBMessage.messageId, + receivedAt: singleDBMessage.receivedAt, + } as IEncryptedMessage + } + ) as IEncryptedMessage[] } public async findByReceiverAddress( receiverAddress: IEncryptedMessage['receiverAddress'] ): Promise { - return await this.messageModel.find({ receiverAddress }).exec() + return (await this.messageModel.find({ receiverAddress }).exec()).map( + (singleDBMessage: MessageDB) => { + return { + message: singleDBMessage.message, + nonce: singleDBMessage.nonce, + createdAt: singleDBMessage.createdAt, + hash: singleDBMessage.hash, + signature: singleDBMessage.signature, + receiverAddress: singleDBMessage.receiverAddress, + senderAddress: singleDBMessage.senderAddress, + senderBoxPublicKey: singleDBMessage.senderBoxPublicKey, + messageId: singleDBMessage.messageId, + receivedAt: singleDBMessage.receivedAt, + } as IEncryptedMessage + } + ) as IEncryptedMessage[] } public async remove( From 6036013067c6906bd8e6adb2ae3cd12cbdfa480f Mon Sep 17 00:00:00 2001 From: LeonfLK Date: Fri, 7 Aug 2020 12:02:20 +0200 Subject: [PATCH 2/2] fix: revert removal of await, interface has to be updated --- src/ctypes/ctypes.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ctypes/ctypes.controller.ts b/src/ctypes/ctypes.controller.ts index 69001ad..d4f4a49 100644 --- a/src/ctypes/ctypes.controller.ts +++ b/src/ctypes/ctypes.controller.ts @@ -41,7 +41,7 @@ export class CTypesController { @Delete() public async removeAll() { console.log('Remove all CTypes') - this.cTypesService.removeAll() + await this.cTypesService.removeAll() } @Post()