Merge branch 'master' into dependabot/npm_and_yarn/lodash-4.17.21

kafkajs · Jan 28, 2022 · 751b71b · 751b71b
2 parents 8ff33b8 + 8bac919
commit 751b71b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/api/middleware/errorMiddleware.spec.ts b/src/api/middleware/errorMiddleware.spec.ts
@@ -44,6 +44,18 @@ describe('ErrorMiddleware', () => {
       ).rejects.toHaveProperty('message', `${middlewareParams.clientId} - ${message}`)
     })
 
+    it('raises an error with a message in case of client-side errors', async () => {
+      const message = 'error message'
+      const response = createResponse(message)
+
+      await expect(
+        executedMiddleware.response(() => Promise.reject(response), undefined),
+      ).rejects.toHaveProperty(
+        'message',
+        `${middlewareParams.clientId} - Error, status 500: ${message}`,
+      )
+    })
+
     it('raise an error with a default message if the error payload is empty', async () => {
       const response = createResponse('')
 

diff --git a/src/api/middleware/errorMiddleware.ts b/src/api/middleware/errorMiddleware.ts
@@ -12,7 +12,10 @@ class ResponseError extends Error {
   url: string
 
   constructor(clientName: string, response: ConfluenceResponse) {
-    super(`${clientName} - ${response.data().message || `Error, status ${response.status()}`}`)
+    super(
+      `${clientName} - ${response.data().message ||
+        `Error, status ${response.status()}${response.data() ? `: ${response.data()}` : ''}`}`,
+    )
 
     const request = response.request()
     this.name = this.constructor.name