fixes error handling

Author: tainguyenbui

src/dataverseClient.ts

@@ -8,7 +8,7 @@ import { DatasetUtil } from './utils/datasetUtil'
 import request from 'request-promise'
 import { DatasetVersionUpgradeType } from './@types/datasetVersionUpgradeType'
 import { DatasetVersionType } from './@types/datasetVersionType'
-import { ResponseUtil } from './utils/ResponseUtil'
+import { ResponseUtil } from "./utils/ResponseUtil"
 
 export class DataverseClient {
   private readonly host: string
@@ -121,7 +121,7 @@ export class DataverseClient {
     }
 
     return request.post(options).catch(error => {
-      throw new DataverseException(error.response.statusCode, ResponseUtil.getErrorMessage(error.response.body))
+      throw new DataverseException(error.response.statusCode, ResponseUtil.getErrorBody(error.response.body))
     })
   }
 
@@ -164,7 +164,7 @@ export class DataverseClient {
     }
 
     return request.post(options).catch(error => {
-      throw new DataverseException(error.response.statusCode, ResponseUtil.getErrorMessage(error.response.body))
+      throw new DataverseException(error.response.statusCode, ResponseUtil.getErrorBody(error.response.body))
     })
   }
 

src/utils/ResponseUtil.ts

@@ -1,13 +1,5 @@
 export class ResponseUtil {
-  public static getErrorMessage(body: string): string {
-    let message: string
-    try {
-      message = JSON.parse(body).message
-    }
-    catch {
-      message = ''
-    }
-
-    return message
+  public static getErrorBody(errorBody: string): string {
+    return errorBody ? errorBody : ''
   }
 }

test/dataverseClient.spec.ts

@@ -30,7 +30,7 @@ describe('DataverseClient', () => {
   let requestPostStub: SinonStub
 
   let mapBasicDatasetInformationStub: SinonStub
-  let getErrorMessageStub: SinonStub
+  let getErrorBodyStub: SinonStub
 
   beforeEach(() => {
     apiToken = random.uuid()
@@ -65,7 +65,7 @@ describe('DataverseClient', () => {
     requestPostStub = sandbox.stub(request, 'post').resolves(mockResponse)
 
     mapBasicDatasetInformationStub = sandbox.stub(DatasetUtil, 'mapBasicDatasetInformation').returns(mockDatasetInformation)
-    getErrorMessageStub = sandbox.stub(ResponseUtil, 'getErrorMessage').returns(mockErrorMessage)
+    getErrorBodyStub = sandbox.stub(ResponseUtil, 'getErrorBody').returns(mockErrorMessage)
   })
 
   afterEach(() => {
@@ -981,14 +981,14 @@ describe('DataverseClient', () => {
         })
       })
 
-      it('should call getErrorMessage', async () => {
+      it('should call getErrorBody', async () => {
         let error: DataverseException = undefined
 
         await client.uploadDatasetThumbnail(datasetId, imageBuffer).catch(e => error = e)
 
         expect(error).to.be.instanceOf(Error)
-        assert.calledOnce(getErrorMessageStub)
-        assert.calledWithExactly(getErrorMessageStub, mockBody)
+        assert.calledOnce(getErrorBodyStub)
+        assert.calledWithExactly(getErrorBodyStub, mockBody)
       })
 
       it('should throw expected error', async () => {
@@ -1282,14 +1282,14 @@ describe('DataverseClient', () => {
         })
       })
 
-      it('should call getErrorMessage', async () => {
+      it('should call getErrorBody', async () => {
         let error: DataverseException = undefined
 
         await client.replaceFile(mockFileId, mockFilename, fileBuffer).catch(e => error = e)
 
         expect(error).to.be.instanceOf(Error)
-        assert.calledOnce(getErrorMessageStub)
-        assert.calledWithExactly(getErrorMessageStub, mockBody)
+        assert.calledOnce(getErrorBodyStub)
+        assert.calledWithExactly(getErrorBodyStub, mockBody)
       })
 
       it('should throw expected error', async () => {

test/utils/ResponseUtil.spec.ts

@@ -2,17 +2,17 @@ import { ResponseUtil } from '../../src/utils/ResponseUtil'
 import { random } from 'faker'
 
 describe('ResponseUtil', () => {
-  describe('getErrorMessage', () => {
+  describe('getErrorBody', () => {
     let mockMessage: string
 
     beforeEach(() => {
       mockMessage = random.words()
     })
 
     it('should return expected message', () => {
-      const expectedResult: string = mockMessage
+      const expectedResult: string = JSON.stringify({ message: mockMessage })
 
-      const result: string = ResponseUtil.getErrorMessage(JSON.stringify({ message: mockMessage }))
+      const result: string = ResponseUtil.getErrorBody(JSON.stringify({ message: mockMessage }))
 
       expect(result).toEqual(expectedResult)
     })