Provide signed messageId when removing message by Id (#286)

* chore: updated delete by Id request format with signature authorization * fix: messageId existence check
KILTprotocol · Sep 23, 2020 · 95d3b66 · 95d3b66
1 parent 18ae521
commit 95d3b66
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 29 deletions.
diff --git a/src/containers/MessageView/MessageView.tsx b/src/containers/MessageView/MessageView.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import React from 'react'
 import { connect, MapStateToProps } from 'react-redux'
 import ContactPresentation from '../../components/ContactPresentation/ContactPresentation'
@@ -54,42 +55,43 @@ class MessageView extends React.Component<Props, State> {
 
   private onDeleteMessage(message: IMessageOutput): void {
     const { currentMessage } = this.state
-
-    if (!message.messageId) {
-      return
-    }
+    const { selectedIdentity } = this.props
 
     if (currentMessage) {
       this.onCloseMessage()
       setTimeout(() => {
         this.fetchMessages()
       })
     }
-
-    safeDelete(
-      <span>
-        the message &apos;
-        <MessageSubject message={message} />
-        &apos; from{' '}
-        <ContactPresentation address={message.senderAddress} inline />
-      </span>,
-      (notification: IBlockingNotification) => {
-        MessageRepository.deleteByMessageId(message.messageId as string)
-          .then(() => {
-            this.fetchMessages()
-            notification.remove()
-          })
-          .catch(error => {
-            errorService.log({
-              error,
-              message: `Could not delete message ${message.messageId}`,
-              origin: 'MessageView.onDeleteMessage()',
-              type: 'ERROR.FETCH.DELETE',
+    if (selectedIdentity && message.messageId) {
+      safeDelete(
+        <span>
+          the message &apos;
+          <MessageSubject message={message} />
+          &apos; from{' '}
+          <ContactPresentation address={message.senderAddress} inline />
+        </span>,
+        (notification: IBlockingNotification) => {
+          MessageRepository.deleteByMessageId(
+            message.messageId!,
+            selectedIdentity.identity.signStr(message.messageId!)
+          )
+            .then(() => {
+              this.fetchMessages()
+              notification.remove()
             })
-          })
-      },
-      false
-    )
+            .catch(error => {
+              errorService.log({
+                error,
+                message: `Could not delete message ${message.messageId}`,
+                origin: 'MessageView.onDeleteMessage()',
+                type: 'ERROR.FETCH.DELETE',
+              })
+            })
+        },
+        false
+      )
+    }
   }
 
   private onOpenMessage(message: IMessageOutput): void {

diff --git a/src/services/MessageRepository.tsx b/src/services/MessageRepository.tsx
@@ -122,9 +122,13 @@ class MessageRepository {
       .then(() => undefined)
   }
 
-  public static async deleteByMessageId(messageId: string): Promise<Response> {
+  public static async deleteByMessageId(
+    messageId: string,
+    signature: string
+  ): Promise<Response> {
     return fetch(`${MessageRepository.URL}/${messageId}`, {
       ...BaseDeleteParams,
+      headers: { ...BaseDeleteParams.headers, signature },
     })
   }