Merge pull request #482 from IvanIFChen/tma953-camera-screen-merged-with-master

[TMA-953] Camera Screen from Master to PoC Video Branch

1 files changed, 6 insertions, 14 deletions

diff --git a/src/services/MomentService.ts b/src/services/MomentService.ts
index b274ef04..60e6be3f 100644
--- a/src/services/MomentService.ts
+++ b/src/services/MomentService.ts
@@ -16,7 +16,6 @@ import {MomentPostType, MomentTagType, PresignedURLResponse} from '../types';
 import {checkImageUploadStatus} from '../utils';
 
 export const postMoment = async (
-  fileName: string,
   uri: string,
   caption: string,
   category: string,
@@ -25,13 +24,9 @@ export const postMoment = async (
   try {
     const request = new FormData();
 
-    //Manipulating filename to end with .jpg instead of .heic
-    if (fileName.endsWith('.heic') || fileName.endsWith('.HEIC')) {
-      fileName = fileName.split('.')[0] + '.jpg';
-    }
     request.append('image', {
       uri: uri,
-      name: fileName,
+      name: 'moment.jpg', // we don't care about filename, anything works
       type: 'image/jpg',
     });
     request.append('moment', category);
@@ -219,14 +214,13 @@ export const deleteMomentTag = async (moment_tag_id: string) => {
  * This function makes a request to the server in order to provide the client with a presigned URL.
  * This is called first, in order for the client to directly upload a file to S3
  * @param value: string | undefined
- * @param filename: string | undefined
  * @returns a PresignedURLResponse object
  */
-export const handlePresignedURL = async (
-  filename: string | undefined,
-  momentCategory: string,
-) => {
+export const handlePresignedURL = async (momentCategory: string) => {
   try {
+    // TODO: just a random filename for video poc, we should not need to once complete
+    const randHash = Math.random().toString(36).substring(7);
+    const filename = `pc_${randHash}.mov`;
     const token = await AsyncStorage.getItem('token');
     const response = await fetch(PRESIGNED_URL_ENDPOINT, {
       method: 'POST',
@@ -260,13 +254,11 @@ export const handlePresignedURL = async (
 /**
  * This util function takes in the file object and the PresignedURLResponse object, creates form data from the latter,
  * and makes a post request to the presigned URL, sending the file object inside of the form data.
- * @param filename: the filename
  * @param filePath: the path to the file, including filename
  * @param urlObj  PresignedURLResponse | undefined
  * @returns responseURL or boolean
  */
 export const handleVideoUpload = async (
-  filename: string,
   filePath: string,
   urlObj: PresignedURLResponse | undefined,
 ) => {
@@ -297,7 +289,7 @@ export const handleVideoUpload = async (
       uri: filePath,
       // other types such as 'quicktime' 'image' etc exist, and we can programmatically type this, but for now sticking with simple 'video'
       type: 'video',
-      name: filename,
+      name: urlObj.response_url.fields.key,
     });
     const response = await fetch(urlObj.response_url.url, {
       method: 'POST',