handle json instead of raw content

src/config.js

@@ -1,7 +1,7 @@
 import mapKeys from 'lodash/mapKeys'
 
 const defaultConfig = {
-  API_URL: '',
+  API_URL: 'http://localhost:8000',
   STRIPE_KEY: '',
   IS_ENTERPRISE: false,
   SENTRY_ENVIRONMENT: 'staging',
@@ -17,7 +17,7 @@ function removeReactAppPrefix(obj) {
 const config = {
   ...defaultConfig,
   ...removeReactAppPrefix(process.env),
-  ...window.configEnv,
+  // ...window.configEnv,
 }
 
 export default config

src/pages/CommitPage/CommitPage.spec.js

@@ -92,13 +92,13 @@ const fileData = {
   flagNames: [],
 }
 
+const mockedPresignedUrl = {presignedUrl: "http://minio:9000/archive/v4/raw/2022-06-23/942173DE95CBF167C5683F40B7DB34C0/ee3ecad424e67419d6c4531540f1ef5df045ff12/919ccc6d-7972-4895-b289-f2d569683a17.txt?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=codecov-default-key%2F20220705%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20220705T101702Z&X-Amz-Expires=10&X-Amz-SignedHeaders=host&X-Amz-Signature=8846492d85f62187493cbff3631ec7f0ccf2d355f768eecf294f0572cf758e4c"}
+
 describe('CommitPage', () => {
   function setup(data) {
     useCommit.mockReturnValue(data)
     useFileWithMainCoverage.mockReturnValue(fileData)
-    useUploadPresignedUrl.mockReturnValue({
-      data: '/archive/v4/raw/2022-06-23/..',
-    })
+    useUploadPresignedUrl.mockReturnValue(mockedPresignedUrl)
 
     render(
       <QueryClientProvider client={queryClient}>
@@ -250,7 +250,7 @@ describe('CommitPage', () => {
 
       it('the impacted file', () => {
         expect(screen.getByTestId('spinner')).toBeInTheDocument()
-         waitFor(()=>expect(screen.getByText(/index.js/)).toBeInTheDocument()) 
+         waitFor(()=> expect(screen.getByText(/index.js/)).toBeInTheDocument()) 
       })
     })
 

src/pages/CommitPage/UploadsCard/Upload.js

@@ -23,7 +23,8 @@ const Upload = ({
   state,
 }) => {
   const isCarriedForward = uploadType === UploadTypeEnum.CARRIED_FORWARD
-  const { data: url } = useUploadPresignedUrl({ pathUrl: downloadUrl })
+  const { data } = useUploadPresignedUrl({ path :downloadUrl })
+  const presignedGetUrl = data?.presignedUrl
 
   return (
     <div className="py-2 px-4 flex flex-col gap-1">
@@ -56,8 +57,8 @@ const Upload = ({
             <span className="text-ds-gray-quinary text-xs">carry-forward</span>
           )}
         </div>
-        {downloadUrl && (
-          <A href={url} isExternal hook="get-presigned-url" download>
+        {presignedGetUrl && (
+          <A href={presignedGetUrl} isExternal hook="get-presigned-url" download>
             Download
           </A>
         )}

src/services/uploadPresignedUrl/hooks.js

@@ -3,21 +3,17 @@ import { useParams } from 'react-router-dom'
 
 import Api from 'shared/api'
 
-function getPathUploadPresignedUrl({ provider, owner, repo, pathUrl }) {
-  return `/${provider}/${owner}/${repo}/download?path=${pathUrl}`
-}
 
-function fetchUploadPresignedUrl({ provider, owner, repo, pathUrl }) {
-  const path = getPathUploadPresignedUrl({ provider, owner, repo, pathUrl })
+function fetchUploadPresignedUrl({ provider, path }) {
   return Api.get({ path, provider }, { useUploadPath: true })
 }
 
-export function useUploadPresignedUrl({ pathUrl }) {
-  const { provider, owner, repo } = useParams()
+export function useUploadPresignedUrl({ path }) {
+  const { provider } = useParams()
   return useQuery(
-    ['uploadPresignedUrl', provider, owner, repo, pathUrl],
+    ['uploadPresignedUrl', provider],
     () => {
-      return fetchUploadPresignedUrl({ provider, owner, repo, pathUrl })
+      return fetchUploadPresignedUrl({ provider, path })
     }
   )
 }

src/services/uploadPresignedUrl/hooks.spec.js

@@ -8,6 +8,8 @@ import { useUploadPresignedUrl } from './hooks'
 
 const downloadUrl =
   'v4/raw/2022-06-23/storage_hash/repo_hash/commit_id/file_name.txt'
+
+const mockedPresignedUrl = {presignedUrl: "http://minio:9000/archive/v4/raw/2022-06-23/942173DE95CBF167C5683F40B7DB34C0/ee3ecad424e67419d6c4531540f1ef5df045ff12/919ccc6d-7972-4895-b289-f2d569683a17.txt?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=codecov-default-key%2F20220705%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20220705T101702Z&X-Amz-Expires=10&X-Amz-SignedHeaders=host&X-Amz-Signature=8846492d85f62187493cbff3631ec7f0ccf2d355f768eecf294f0572cf758e4c"}
 
 const queryClient = new QueryClient()
 const wrapper = ({ children }) => (
@@ -32,12 +34,12 @@ describe('useUploadPresignedUrl', () => {
 
   function setup() {
     server.use(
-      rest.get(`/upload/gh/codecov/test/download`, (req, res, ctx) => {
-        return res(ctx.status(200), ctx.text('presigned url'))
+      rest.get(downloadUrl, (req, res, ctx) => {
+        return res(ctx.status(200), ctx.json(mockedPresignedUrl))
       })
     )
     hookData = renderHook(
-      () => useUploadPresignedUrl({ pathUrl: downloadUrl }),
+      () => useUploadPresignedUrl({ path: downloadUrl }),
       {
         wrapper,
       }
@@ -59,7 +61,7 @@ describe('useUploadPresignedUrl', () => {
       })
 
       it('returns the data', () => {
-        expect(hookData.result.current.data).toEqual('presigned url')
+        expect(hookData.result.current.data).toEqual(mockedPresignedUrl)
       })
     })
   })

src/shared/api/api.js

@@ -17,10 +17,8 @@ function _fetch({
 }) {
   const uri = generatePath({ path, query, useUploadPath })
   const headers = {
-    Accept: useUploadPath ? 'text/plain' : 'application/json',
-    'Content-Type': useUploadPath
-      ? 'text/plain'
-      : 'application/json; charset=utf-8',
+    Accept: 'application/json',
+    'Content-Type': 'application/json; charset=utf-8',
     ...getHeaders(provider),
     ...extraHeaders,
   }
@@ -33,7 +31,7 @@ function _fetch({
   }).then(async (res) => {
     let data = null
     try {
-      data = useUploadPath ? await res.text() : camelizeKeys(await res.json())
+      data =  camelizeKeys(await res.json())
     } catch {
       // nothing to do, body can be empty
     }

src/shared/api/api.test.js

@@ -26,13 +26,15 @@ const userData = {
   ],
 }
 
+const mockedPresignedUrl = {presignedUrl: "http://minio:9000/archive/v4/raw/2022-06-23/942173DE95CBF167C5683F40B7DB34C0/ee3ecad424e67419d6c4531540f1ef5df045ff12/919ccc6d-7972-4895-b289-f2d569683a17.txt?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=codecov-default-key%2F20220705%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20220705T101702Z&X-Amz-Expires=10&X-Amz-SignedHeaders=host&X-Amz-Signature=8846492d85f62187493cbff3631ec7f0ccf2d355f768eecf294f0572cf758e4c"}
+
 const server = setupServer(
   rest.get('/internal/test', (req, res, ctx) => {
     const hasTokenType = Boolean(req.headers.get('token-type'))
     return res(ctx.status(hasTokenType ? 200 : 401), ctx.json(rawUserData))
   }),
-  rest.get('/upload/test', (req, res, ctx) => {
-    return res(ctx.status(200), ctx.text('presigned-url'))
+  rest.get('/upload', (req, res, ctx) => {
+    return res(ctx.status(200), ctx.json(mockedPresignedUrl))
   }),
   rest.post('/internal/test', (req, res, ctx) => {
     return res(ctx.status(200), ctx.json(req.body))
@@ -129,15 +131,15 @@ describe('when calling an endpoint with a token', () => {
 describe('when using a get request with upload path', () => {
   beforeEach(() => {
     return Api.get(
-      { path: '/test', provider: 'gh' },
+      { path: '/upload', provider: 'gh' },
       { useUploadPath: true }
     ).then((data) => {
       result = data
     })
   })
 
   it('returns data as text', () => {
-    expect(result).toEqual('presigned-url')
+    expect(result).toEqual(mockedPresignedUrl)
   })
 })
 

src/shared/api/helpers.js

@@ -15,7 +15,7 @@ export const ProviderCookieKeyMapping = {
 
 export function generatePath({ path, query, useUploadPath = false }) {
   const baseUrl = useUploadPath
-    ? `${config.API_URL}/upload`
+    ? config.API_URL
     : `${config.API_URL}/internal`
   const queryString = qs.stringify(snakeifyKeys(query), {
     arrayFormat: 'repeat',

src/shared/api/helpers.spec.js

@@ -21,8 +21,8 @@ describe('generatePath', () => {
   })
 
   it('generates a upload report path when use useUploadPath', () => {
-    expect(generatePath({ path: '/epic', useUploadPath: true })).toStrictEqual(
-      `${config.API_URL}/upload/epic`
+    expect(generatePath({ path: '/upload', useUploadPath: true })).toStrictEqual(
+      `${config.API_URL}/upload`
     )
   })
 })