companion: fix cc type files for zoom provider and filter out timeline files (#2508)

packages/@uppy/companion/src/server/provider/zoom/adapter.js

@@ -94,8 +94,8 @@ exports.getMimeType = (item) => {
 }
 
 exports.getId = (item) => {
-  if (item.file_type && item.file_type === 'TIMELINE') {
-    return `${encodeURIComponent(item.meeting_id)}__TIMELINE`
+  if (item.file_type && item.file_type === 'CC') {
+    return `${encodeURIComponent(item.meeting_id)}__CC__${encodeURIComponent(item.recording_start)}`
   } else if (item.file_type) {
     return `${encodeURIComponent(item.meeting_id)}__${encodeURIComponent(item.id)}`
   }
@@ -103,8 +103,8 @@ exports.getId = (item) => {
 }
 
 exports.getRequestPath = (item) => {
-  if (item.file_type && item.file_type === 'TIMELINE') {
-    return `${encodeURIComponent(item.meeting_id)}?recordingId=TIMELINE`
+  if (item.file_type && item.file_type === 'CC') {
+    return `${encodeURIComponent(item.meeting_id)}?recordingId=CC&recordingStart=${encodeURIComponent(item.recording_start)}`
   } else if (item.file_type) {
     return `${encodeURIComponent(item.meeting_id)}?recordingId=${encodeURIComponent(item.id)}`
   }
@@ -112,14 +112,14 @@ exports.getRequestPath = (item) => {
 }
 
 exports.getStartDate = (item) => {
-  if (item.file_type === 'TIMELINE') {
+  if (item.file_type === 'CC') {
     return item.recording_start
   }
   return item.start_time
 }
 
 exports.getSize = (item) => {
-  if (item.file_type && item.file_type === 'TIMELINE') {
+  if (item.file_type && item.file_type === 'CC') {
     const maxExportFileSize = 1024 * 1024
     return maxExportFileSize
   } else if (item.file_type) {

packages/@uppy/companion/src/server/provider/zoom/index.js

@@ -113,9 +113,10 @@ class Zoom extends Provider {
 
   download ({ id, token, query }, done) {
     // meeting id + file id required
-    // timeline files don't have an ID or size
+    // cc files don't have an ID or size
     const meetingId = id
     const fileId = query.recordingId
+    const recordingStart = query.recordingStart
     const GET_MEETING_FILES = `/meetings/${meetingId}/recordings`
 
     const downloadUrlPromise = new Promise((resolve) => {
@@ -129,7 +130,7 @@ class Zoom extends Provider {
           const file = resp
             .body
             .recording_files
-            .find(file => fileId === file.id || fileId === file.file_type)
+            .find(file => fileId === file.id || (file.file_type === fileId && file.recording_start === recordingStart))
           if (!file || !file.download_url) {
             return this._downloadError(resp, done)
           }
@@ -160,6 +161,7 @@ class Zoom extends Provider {
   size ({ id, token, query }, done) {
     const meetingId = id
     const fileId = query.recordingId
+    const recordingStart = query.recordingStart
     const GET_MEETING_FILES = `/meetings/${meetingId}/recordings`
 
     return this.client
@@ -172,13 +174,12 @@ class Zoom extends Provider {
         const file = resp
           .body
           .recording_files
-          .find(file => file.id === fileId || file.file_type === fileId)
+          .find(file => file.id === fileId || (file.file_type === fileId && file.recording_start === recordingStart))
 
         if (!file) {
           return this._downloadError(resp, done)
         }
-        // timeline files don't have file size, but are typically small json files, should be much less than 1MB
-        const maxExportFileSize = 1024 * 1024
+        const maxExportFileSize = 10 * 1024 * 1024 // 10MB
         done(null, file.file_size || maxExportFileSize)
       })
   }
@@ -225,7 +226,7 @@ class Zoom extends Provider {
       items: [],
       username: adapter.getUserEmail(userResponse)
     }
-    const items = results.meetings || results.recording_files
+    const items = results.meetings || results.recording_files.filter(file => file.file_type !== 'TIMELINE')
     items.forEach(item => {
       data.items.push({
         isFolder: adapter.getIsFolder(item),