Merge pull request #18 from oneblink/ON-39766

ON-39766 # Fixed prefill response type and  authorisation header for requests

src/OneBlinkUploader.ts

@@ -390,7 +390,9 @@ export default class OneBlinkUploader {
     /** The prefill data to upload */
     prefillData: SubmissionTypes.NewS3SubmissionData['submission']
   }) {
-    return await uploadToS3({
+    return await uploadToS3<{
+      preFillFormDataId: string
+    }>({
       ...this,
       contentType: 'application/json',
       body: JSON.stringify(prefillData),

src/http-handlers/NodeJsHandler.ts

@@ -47,6 +47,7 @@ export class OneBlinkNodeJsHandler<T>
     }
 
     switch (result.response.headers['content-type']) {
+      case 'application/json; charset=utf-8':
       case 'application/json': {
         const { Readable } = await import('stream')
         if (result.response.body instanceof Readable) {

src/http-handlers/handleRequest.ts

@@ -5,28 +5,32 @@ export async function prepareRequest<T>(
   oneBlinkRequestHandler: IOneBlinkRequestHandler<T>,
   request: HttpRequest,
 ) {
+  delete request.headers['authorization']
+
   const token = await oneBlinkRequestHandler.getIdToken()
   if (token) {
-    request.headers['x-oneblink-authorization'] = 'Bearer ' + token
+    request.headers['authorization'] = 'Bearer ' + token
   }
+
   if (oneBlinkRequestHandler.requestBodyHeader) {
     request.headers['x-oneblink-request-body'] = JSON.stringify(
       oneBlinkRequestHandler.requestBodyHeader,
     )
   }
+
   if (oneBlinkRequestHandler.oneblinkResponse) {
     request.query['key'] = oneBlinkRequestHandler.oneblinkResponse.s3.key
   }
 
-  console.log('S3 upload request', request)
+  console.log('S3 upload request path', request.path)
 }
 
 export async function handleResponse<T>(
   oneBlinkRequestHandler: IOneBlinkRequestHandler<T>,
   request: HttpRequest,
   response: HttpResponse,
 ) {
-  console.log('S3 upload result for request path', request.path, response)
+  console.log('S3 upload result for request path', request.path)
 
   const oneblinkResponse = response.headers['x-oneblink-response']
   if (typeof oneblinkResponse === 'string') {

src/uploadToS3.ts

@@ -84,7 +84,7 @@ async function uploadToS3<T>({
       // new S3 bucket domain concept with includes the bucket in the
       // domain instead of the path. We need it in the path to use the
       // API as the domain.
-      Bucket: 'storage.oneblink.io',
+      Bucket: apiOrigin.split('.').slice(-2).join('.'),
       Key: key,
       Body: body,
       ContentType: contentType,