resolve folder inside shared drive (#6093)

also ignore shortcuts to folders
and simplify

closes #6089

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Merlijn Vos <merlijn@soverin.net>

.changeset/chilly-numbers-warn.md

@@ -0,0 +1,6 @@
+---
+"@uppy/google-drive-picker": patch
+"@uppy/provider-views": patch
+---
+
+Improve Google Drive Picker folder picking: Resolve also folders inside shared drives (but not symlinks to folders)

packages/@uppy/provider-views/src/GooglePicker/googlePicker.ts

@@ -226,15 +226,39 @@ export async function showDrivePicker({
     throw new InvalidTokenError()
   }
 
-  async function listFilesInDriveFolder({
+  async function handleDocObjectRecursively({
     doc,
     token,
     signal,
   }: {
-    doc: PickedItemBase
+    doc: {
+      id: string
+      name: string
+      mimeType: string
+      shortcutDetails?: { targetMimeType: string }
+    }
     token: string
     signal?: AbortSignal
   }): Promise<PickedDriveItem[]> {
+    if (doc.mimeType === 'application/vnd.google-apps.shortcut') {
+      if (
+        doc.shortcutDetails?.targetMimeType ===
+        'application/vnd.google-apps.folder'
+      ) {
+        // If we were to recurse into shortcuts to folders, it could get a bit crazy. We could end up picking things outside of the user's intended scope as well as infinite loops
+        // If we were to just pass it through as-is, Companion would not be able to download it, so we just ignore it entirely
+        return []
+      }
+      // for other shortcut types, we just treat them as normal files and pass them to Companion to resolve
+      return [
+        {
+          platform: 'drive',
+          id: doc.id,
+          name: doc.name,
+          mimeType: doc.mimeType,
+        },
+      ]
+    }
     if (doc.mimeType !== 'application/vnd.google-apps.folder') {
       return [
         {
@@ -253,7 +277,10 @@ export async function showDrivePicker({
     do {
       const params = new URLSearchParams({
         q: `'${doc.id.replace(/'/g, "\\'")}' in parents and trashed = false`,
-        fields: 'nextPageToken, files(id, name, mimeType)',
+        fields:
+          'nextPageToken, files(id, name, mimeType, shortcutDetails(targetMimeType))',
+        includeItemsFromAllDrives: 'true',
+        supportsAllDrives: 'true',
         pageSize: '1000',
         ...(pageToken && { pageToken }),
       })
@@ -273,7 +300,7 @@ export async function showDrivePicker({
 
       for (const file of json.files) {
         items.push(
-          ...(await listFilesInDriveFolder({ doc: file, token, signal })),
+          ...(await handleDocObjectRecursively({ doc: file, token, signal })),
         )
       }
     } while (pageToken)
@@ -287,21 +314,11 @@ export async function showDrivePicker({
     try {
       onLoadingChange(true)
 
-      // console.log('Picker response', JSON.stringify(picked, null, 2));
       const results: PickedDriveItem[] = []
       for (const doc of picked.docs) {
-        if (doc.mimeType === 'application/vnd.google-apps.folder') {
+        results.push(
-          results.push(
+          ...(await handleDocObjectRecursively({ doc, token, signal })),
-            ...(await listFilesInDriveFolder({ doc, token, signal })),
+        )
-          )
-        } else {
-          results.push({
-            platform: 'drive',
-            id: doc.id,
-            name: doc.name,
-            mimeType: doc.mimeType,
-          })
-        }
       }
       onFilesPicked(results, token)
     } catch (err) {