Merge pull request #8171 from opencrvs/revert-8170-auto-pr-release-v1.6.2-8010-80

Revert "🍒 Merge changes from PR #8010 to release-v1.6.2"

Author: euanmillar

packages/gateway/src/utils/documents.ts

@@ -0,0 +1,31 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+import fetch from '@gateway/fetch'
+import { DOCUMENTS_URL } from '@gateway/constants'
+import { internal } from '@hapi/boom'
+import { logger, IAuthHeader } from '@opencrvs/commons'
+
+export async function uploadSvg(fileData: string, authHeader: IAuthHeader) {
+  const url = new URL('upload-svg', DOCUMENTS_URL).toString()
+  const res = await fetch(url, {
+    method: 'POST',
+    headers: {
+      ...authHeader,
+      'Content-Type': 'image/svg+xml'
+    },
+    body: Buffer.from(fileData)
+  })
+  if (!res.ok) {
+    logger.error(await res.json())
+    throw internal()
+  }
+  return (await res.json()).refUrl
+}

packages/workflow/src/documents.ts

@@ -18,40 +18,36 @@ import {
 } from '@opencrvs/commons/types'
 import { CertifyInput, IssueInput } from './records/validations'
 
-export async function uploadFileToMinio(
-  fileData: string,
-  authHeader: IAuthHeader
-): Promise<string> {
-  const suffix = '/upload'
-  const request = {
-    method: 'POST',
+const fetchDocuments = async <T = any>(
+  suffix: string,
+  authHeader: IAuthHeader,
+  method = 'GET',
+  body: string | undefined = undefined
+): Promise<T> => {
+  const result = await fetch(`${DOCUMENTS_URL}${suffix}`, {
+    method,
     headers: {
       ...authHeader,
       'Content-Type': 'application/json'
     },
-    body: JSON.stringify({ fileData: fileData })
-  }
-  const result = await fetch(`${DOCUMENTS_URL}${suffix}`, request)
+    body
+  })
   const res = await result.json()
-  return res.refUrl
+  return res
 }
 
-async function uploadSVGToMinio(
+export async function uploadBase64ToMinio(
   fileData: string,
   authHeader: IAuthHeader
 ): Promise<string> {
-  const suffix = '/upload-svg'
-  const request = {
-    method: 'POST',
-    headers: {
-      ...authHeader,
-      'Content-Type': 'image/svg+xml'
-    },
-    body: fileData
-  }
-  const result = await fetch(`${DOCUMENTS_URL}${suffix}`, request)
-  const res = await result.json()
-  return res.refUrl
+  const docUploadResponse = await fetchDocuments(
+    '/upload',
+    authHeader,
+    'POST',
+    JSON.stringify({ fileData: fileData })
+  )
+
+  return docUploadResponse.refUrl
 }
 
 export async function uploadCertificateAttachmentsToDocumentsStore<
@@ -62,11 +58,11 @@ export async function uploadCertificateAttachmentsToDocumentsStore<
     certificateDetails.collector.affidavit
   ) {
     for (const affidavit of certificateDetails.collector.affidavit) {
-      affidavit.data = await uploadFileToMinio(affidavit.data, authHeader)
+      affidavit.data = await uploadBase64ToMinio(affidavit.data, authHeader)
     }
   }
   if ('data' in certificateDetails) {
-    certificateDetails.data = await uploadSVGToMinio(
+    certificateDetails.data = await uploadBase64ToMinio(
       certificateDetails.data,
       authHeader
     )
@@ -90,7 +86,7 @@ function uploadOrNormaliseSignatureData(
   authHeader: IAuthHeader
 ) {
   if (isBase64FileString(signature)) {
-    return uploadFileToMinio(signature, authHeader)
+    return uploadBase64ToMinio(signature, authHeader)
   }
 
   if (isPresignedUrl(signature)) {
@@ -142,7 +138,7 @@ export async function uploadBase64AttachmentsToDocumentsStore(
   if (record.registration?.attachments) {
     for (const attachment of record.registration.attachments) {
       if (attachment.data && isBase64FileString(attachment.data)) {
-        const fileUri = await uploadFileToMinio(attachment.data, authHeader)
+        const fileUri = await uploadBase64ToMinio(attachment.data, authHeader)
         attachment.data = fileUri
       }
     }
@@ -155,15 +151,18 @@ export async function uploadBase64AttachmentsToDocumentsStore(
       if (certificate.collector.affidavit) {
         for (const affidavit of certificate.collector.affidavit) {
           if (affidavit.data && isBase64FileString(affidavit.data)) {
-            const fileUri = await uploadFileToMinio(affidavit.data, authHeader)
+            const fileUri = await uploadBase64ToMinio(
+              affidavit.data,
+              authHeader
+            )
             affidavit.data = fileUri
           }
         }
       }
       if (certificate.collector.photo) {
         for (const photo of certificate.collector.photo) {
           if (photo.data && isBase64FileString(photo.data)) {
-            const fileUri = await uploadFileToMinio(photo.data, authHeader)
+            const fileUri = await uploadBase64ToMinio(photo.data, authHeader)
             photo.data = fileUri
           }
         }
@@ -173,13 +172,13 @@ export async function uploadBase64AttachmentsToDocumentsStore(
   if (record.registration?.correction?.attachments) {
     for (const attachment of record.registration.correction.attachments) {
       if (attachment.data && isBase64FileString(attachment.data)) {
-        const fileUri = await uploadFileToMinio(attachment.data, authHeader)
+        const fileUri = await uploadBase64ToMinio(attachment.data, authHeader)
         attachment.data = fileUri
       }
     }
   }
   if (record.registration?.correction?.payment?.attachmentData) {
-    const fileUri = await uploadFileToMinio(
+    const fileUri = await uploadBase64ToMinio(
       record.registration.correction.payment.attachmentData,
       authHeader
     )

packages/workflow/src/records/handler/certify.test.ts

@@ -57,7 +57,7 @@ describe('Certify record endpoint', () => {
 
     // Upload certificate to minio
     mswServer.use(
-      rest.post('http://localhost:9050/upload-svg', (_, res, ctx) => {
+      rest.post('http://localhost:9050/upload', (_, res, ctx) => {
         return res(
           ctx.json({ refUrl: '/ocrvs/6e964d7a-25d0-4524-bdc2-b1f29d1e816c' })
         )
@@ -153,7 +153,7 @@ describe('Certify record endpoint', () => {
 
     // Upload certificate to minio
     mswServer.use(
-      rest.post('http://localhost:9050/upload-svg', (_, res, ctx) => {
+      rest.post('http://localhost:9050/upload', (_, res, ctx) => {
         return res(
           ctx.json({ refUrl: '/ocrvs/6e964d7a-25d0-4524-bdc2-b1f29d1e816c' })
         )

packages/workflow/src/records/handler/correction/request.ts

@@ -12,7 +12,7 @@
 import { conflict } from '@hapi/boom'
 import { getAuthHeader } from '@opencrvs/commons/http'
 import { CorrectionRequestedRecord } from '@opencrvs/commons/types'
-import { uploadFileToMinio } from '@workflow/documents'
+import { uploadBase64ToMinio } from '@workflow/documents'
 import {
   getLoggedInPractitionerResource,
   getPractitionerOfficeId
@@ -51,15 +51,15 @@ export const requestCorrectionRoute = createRoute({
 
     const paymentAttachmentUrl =
       correctionDetails.payment?.attachmentData &&
-      (await uploadFileToMinio(
+      (await uploadBase64ToMinio(
         correctionDetails.payment.attachmentData,
         getAuthHeader(request)
       ))
 
     const proofOfLegalCorrectionAttachments = await Promise.all(
       correctionDetails.attachments.map(async (attachment) => ({
         type: attachment.type,
-        url: await uploadFileToMinio(attachment.data, getAuthHeader(request))
+        url: await uploadBase64ToMinio(attachment.data, getAuthHeader(request))
       }))
     )
 

yarn.lock

@@ -23937,9 +23937,9 @@ [email protected], typescript@^4.5:
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 "typescript@>=3 < 6":
-  version "5.6.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
-  integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
 typical@^2.6.1:
   version "2.6.1"