feat: remove default withCredentials false as it is the default

IQSS · Dec 3, 2024 · 5f50318 · 5f50318
1 parent a5634ad
commit 5f50318
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 73 deletions.
diff --git a/src/core/infra/repositories/apiConfigBuilders.ts b/src/core/infra/repositories/apiConfigBuilders.ts
@@ -13,7 +13,6 @@ export const buildRequestConfig = (
     headers: {
       'Content-Type': contentType
     },
-    withCredentials: false,
     ...(abortSignal && { signal: abortSignal })
   }
 
@@ -48,7 +47,6 @@ export const buildRequestConfig = (
       if (token) {
         requestConfig.headers.Authorization = `Bearer ${token}`
       }
-      requestConfig.withCredentials = false
       break
     }
   }

diff --git a/test/testHelpers/TestConstants.ts b/test/testHelpers/TestConstants.ts
@@ -17,23 +17,21 @@ export class TestConstants {
     headers: {
       'Content-Type': 'application/json',
       'X-Dataverse-Key': TestConstants.TEST_DUMMY_API_KEY
-    },
-    withCredentials: false
+    }
   }
   static readonly TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY_INCLUDE_DEACCESSIONED = {
     params: { includeDeaccessioned: true },
     headers: {
       'Content-Type': 'application/json',
       'X-Dataverse-Key': TestConstants.TEST_DUMMY_API_KEY
-    },
-    withCredentials: false
+    }
   }
   static readonly TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_SESSION_COOKIE = {
-    withCredentials: true,
     params: {},
     headers: {
       'Content-Type': 'application/json'
-    }
+    },
+    withCredentials: true
   }
   static readonly TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_SESSION_COOKIE_INCLUDE_DEACCESSIONED =
     {
@@ -47,16 +45,14 @@ export class TestConstants {
     params: {},
     headers: {
       'Content-Type': 'application/json'
-    },
-    withCredentials: false
+    }
   }
   static readonly TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_BEARER_TOKEN = {
     params: {},
     headers: {
       Authorization: `Bearer ${TestConstants.TEST_DUMMY_BEARER_TOKEN}`,
       'Content-Type': 'application/json'
-    },
-    withCredentials: false
+    }
   }
 
   static readonly TEST_DUMMY_COLLECTION_ID = 10001

diff --git a/test/unit/auth/BearerTokenMechanism.test.ts b/test/unit/auth/BearerTokenMechanism.test.ts
@@ -47,9 +47,7 @@ describe('BearerTokenMechanism', () => {
       headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_BEARER_TOKEN.headers,
       params: {
         returnOwners: true
-      },
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_BEARER_TOKEN.withCredentials
+      }
     }
 
     jest.spyOn(axios, 'get').mockResolvedValue(testCollectionSuccessfulResponse)

diff --git a/test/unit/collections/CollectionsRepository.test.ts b/test/unit/collections/CollectionsRepository.test.ts
@@ -57,9 +57,7 @@ describe('CollectionsRepository', () => {
       params: {
         returnOwners: true
       },
-      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
     }
 
     describe('by numeric id', () => {
@@ -264,9 +262,7 @@ describe('CollectionsRepository', () => {
         params: {
           returnDetails: true
         },
-        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-        withCredentials:
-          TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
       }
 
       test('should return facets when providing a valid id', async () => {
@@ -399,9 +395,7 @@ describe('CollectionsRepository', () => {
 
       const expectedRequestConfigApiKey = {
         params: expectedRequestParams,
-        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-        withCredentials:
-          TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
       }
 
       expect(axios.get).toHaveBeenCalledWith(expectedApiEndpoint, expectedRequestConfigApiKey)
@@ -444,9 +438,7 @@ describe('CollectionsRepository', () => {
 
       const expectedRequestConfigApiKeyWithPagination = {
         params: expectedRequestParamsWithPagination,
-        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-        withCredentials:
-          TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
       }
 
       expect(axios.get).toHaveBeenCalledWith(
@@ -489,9 +481,7 @@ describe('CollectionsRepository', () => {
 
       const expectedRequestConfigApiKeyWithCollectionId = {
         params: expectedRequestParamsWithCollectionId,
-        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-        withCredentials:
-          TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
       }
 
       expect(axios.get).toHaveBeenCalledWith(
@@ -531,9 +521,7 @@ describe('CollectionsRepository', () => {
 
       const expectedRequestConfigApiKey = {
         params: expectedRequestParams,
-        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-        withCredentials:
-          TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
       }
 
       expect(axios.get).toHaveBeenCalledWith(expectedApiEndpoint, expectedRequestConfigApiKey)

diff --git a/test/unit/datasets/DatasetsRepository.test.ts b/test/unit/datasets/DatasetsRepository.test.ts
@@ -103,9 +103,7 @@ describe('DatasetsRepository', () => {
         excludeFiles: true,
         returnOwners: true
       },
-      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
     }
     const expectedRequestConfigSessionCookie = {
       params: {
@@ -292,8 +290,7 @@ describe('DatasetsRepository', () => {
   describe('getPrivateUrlDataset', () => {
     const expectedRequestConfig = {
       params: { returnOwners: true },
-      headers: TestConstants.TEST_EXPECTED_UNAUTHENTICATED_REQUEST_CONFIG.headers,
-      withCredentials: TestConstants.TEST_EXPECTED_UNAUTHENTICATED_REQUEST_CONFIG.withCredentials
+      headers: TestConstants.TEST_EXPECTED_UNAUTHENTICATED_REQUEST_CONFIG.headers
     }
     test('should return Dataset when response is successful', async () => {
       jest.spyOn(axios, 'get').mockResolvedValue(testDatasetVersionSuccessfulResponse)
@@ -644,9 +641,7 @@ describe('DatasetsRepository', () => {
 
       const expectedRequestConfigApiKeyWithPagination = {
         params: expectedRequestParamsWithPagination,
-        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-        withCredentials:
-          TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
       }
 
       expect(axios.get).toHaveBeenCalledWith(
@@ -688,9 +683,7 @@ describe('DatasetsRepository', () => {
 
       const expectedRequestConfigApiKeyWithCollectionId = {
         params: expectedRequestParamsWithCollectionId,
-        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-        withCredentials:
-          TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+        headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
       }
 
       expect(axios.get).toHaveBeenCalledWith(

diff --git a/test/unit/files/DirectUploadClient.test.ts b/test/unit/files/DirectUploadClient.test.ts
@@ -126,8 +126,7 @@ describe('uploadFile', () => {
         `${ApiConfig.dataverseApiUrl}/datasets/mpupload/testAbort`,
         {
           headers: { 'Content-Type': 'application/json', 'X-Dataverse-Key': 'dummyApiKey' },
-          params: {},
-          withCredentials: false
+          params: {}
         }
       )
     })

diff --git a/test/unit/files/FilesRepository.test.ts b/test/unit/files/FilesRepository.test.ts
@@ -70,9 +70,7 @@ describe('FilesRepository', () => {
       params: {
         size: testFileSize
       },
-      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
     }
     const expectedRequestConfigSessionCookie = {
       params: {
@@ -245,9 +243,7 @@ describe('FilesRepository', () => {
         includeDeaccessioned: testIncludeDeaccessioned,
         orderCriteria: testFileOrderCriteria
       },
-      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
     }
     const expectedRequestConfigSessionCookie = {
       params: {
@@ -272,9 +268,7 @@ describe('FilesRepository', () => {
 
     const expectedRequestConfigApiKeyWithOptional = {
       params: expectedRequestParamsWithOptional,
-      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
     }
 
     const expectedFiles = createFilesSubsetModel(testTotalCount)
@@ -434,9 +428,7 @@ describe('FilesRepository', () => {
 
     const expectedRequestConfigApiKey = {
       params: { includeDeaccessioned: testIncludeDeaccessioned },
-      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
     }
     const expectedRequestConfigSessionCookie = {
       params: { includeDeaccessioned: testIncludeDeaccessioned },
@@ -455,9 +447,7 @@ describe('FilesRepository', () => {
 
     const expectedRequestConfigApiKeyWithOptional = {
       params: expectedRequestParamsWithOptional,
-      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
     }
 
     const expectedCount = createFileCountsModel()
@@ -589,9 +579,7 @@ describe('FilesRepository', () => {
         mode: FileDownloadSizeMode.ARCHIVAL.toString(),
         includeDeaccessioned: testIncludeDeaccessioned
       },
-      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
     }
     const expectedRequestConfigSessionCookie = {
       params: {
@@ -611,9 +599,7 @@ describe('FilesRepository', () => {
         categoryName: testFileCriteria.categoryName,
         tabularTagName: testFileCriteria.tabularTagName
       },
-      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
     }
     const expectedApiEndpoint = `${TestConstants.TEST_API_URL}/datasets/${testDatasetId}/versions/${testDatasetVersionId}/downloadsize`
 
@@ -1036,9 +1022,7 @@ describe('FilesRepository', () => {
 
     const expectedRequestConfigApiKey = {
       params: expectedRequestParams,
-      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers,
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+      headers: TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.headers
     }
 
     const expectedRequestConfigSessionCookie = {

diff --git a/test/unit/metadataBlocks/MetadataBlocksRepository.test.ts b/test/unit/metadataBlocks/MetadataBlocksRepository.test.ts
@@ -29,9 +29,7 @@ describe('MetadataBlocksRepository', () => {
       params: {
         onlyDisplayedOnCreate: true,
         returnDatasetFieldTypes: true
-      },
-      withCredentials:
-        TestConstants.TEST_EXPECTED_AUTHENTICATED_REQUEST_CONFIG_API_KEY.withCredentials
+      }
     }
 
     test('should return collection metadata blocks on successful response', async () => {