Implement new user endpoint on client and companion

packages/@uppy/companion-client/src/Provider.js

@@ -95,6 +95,10 @@ export default class Provider extends RequestClient {
     return this.get(`${this.id}/list/${directory || ''}`, options)
   }
 
+  user (options) {
+    return this.get(`${this.id}/user`, options)
+  }
+
   logout () {
     return this.get(`${this.id}/logout`)
       .then((response) => Promise.all([

packages/@uppy/companion/src/companion.js

@@ -127,6 +127,8 @@ module.exports.app = (optionsArg = {}) => {
   app.get('/:providerName/logout', middlewares.hasSessionAndProvider, middlewares.hasOAuthProvider, middlewares.gentleVerifyToken, controllers.logout)
   app.get('/:providerName/send-token', middlewares.hasSessionAndProvider, middlewares.hasOAuthProvider, middlewares.verifyToken, controllers.sendToken)
 
+  app.get('/:providerName/user/:id?', middlewares.hasSessionAndProvider, middlewares.verifyToken, controllers.user)
+
   app.get('/:providerName/list/:id?', middlewares.hasSessionAndProvider, middlewares.verifyToken, controllers.list)
   // backwards compat:
   app.get('/search/:providerName/list', middlewares.hasSessionAndProvider, middlewares.verifyToken, controllers.list)

packages/@uppy/companion/src/server/controllers/index.js

@@ -6,6 +6,7 @@ module.exports = {
   get: require('./get'),
   thumbnail: require('./thumbnail'),
   list: require('./list'),
+  user: require('./user'),
   logout: require('./logout'),
   connect: require('./connect'),
   preauth: require('./preauth'),

packages/@uppy/companion/src/server/controllers/user.js

@@ -0,0 +1,19 @@
+const { errorToResponse } = require('../provider/error')
+
+async function user ({ query, params, companion }, res, next) {
+  const token = companion.providerToken
+
+  try {
+    const data = await companion.provider.user({ companion, token, directory: params.id, query })
+    res.json(data)
+  } catch (err) {
+    const errResp = errorToResponse(err)
+    if (errResp) {
+      res.status(errResp.code).json({ message: errResp.message })
+      return
+    }
+    next(err)
+  }
+}
+
+module.exports = user

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

@@ -1,6 +1,6 @@
 const querystring = require('node:querystring')
 
-const getUsername = (data) => {
+exports.getUsername = (data) => {
   return data.user.emailAddress
 }
 
@@ -140,7 +140,7 @@ const getVideoDurationMillis = (item) => item.videoMediaMetadata && item.videoMe
 // Hopefully this name will not be used by Google
 exports.VIRTUAL_SHARED_DIR = 'shared-with-me'
 
-exports.adaptData = (listFilesResp, sharedDrivesResp, directory, query, showSharedWithMe, about) => {
+exports.adaptData = (listFilesResp, sharedDrivesResp, directory, query, showSharedWithMe) => {
   const adaptItem = (item) => ({
     isFolder: isFolder(item),
     icon: getItemIcon(item),
@@ -183,7 +183,6 @@ exports.adaptData = (listFilesResp, sharedDrivesResp, directory, query, showShar
   ]
 
   return {
-    username: getUsername(about),
     items: adaptedItems,
     nextPagePath: getNextPagePath(listFilesResp, query, directory),
   }

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

@@ -2,7 +2,14 @@ const got = require('got').default
 
 const Provider = require('../Provider')
 const logger = require('../../logger')
-const { VIRTUAL_SHARED_DIR, adaptData, isShortcut, isGsuiteFile, getGsuiteExportType } = require('./adapter')
+const {
+  VIRTUAL_SHARED_DIR,
+  adaptData,
+  getUsername,
+  isShortcut,
+  isGsuiteFile,
+  getGsuiteExportType,
+} = require('./adapter')
 const { withProviderErrorHandling } = require('../providerErrors')
 const { prepareStream } = require('../../helpers/utils')
 
@@ -45,6 +52,18 @@ class Drive extends Provider {
     return 'google'
   }
 
+  async user (options) {
+    return this.#withErrorHandling('provider.drive.user.error', async () => {
+      const { token } = options
+      const searchParams = { fields: 'user' }
+      const client = getClient({ token })
+
+      const res = await client.get('about', { searchParams, responseType: 'json' }).json()
+
+      return getUsername(res)
+    })
+  }
+
   async list (options) {
     return this.#withErrorHandling('provider.drive.list.error', async () => {
       const directory = options.directory || 'root'
@@ -91,21 +110,14 @@ class Drive extends Provider {
         return client.get('files', { searchParams, responseType: 'json' }).json()
       }
 
-      async function fetchAbout () {
-        const searchParams = { fields: 'user' }
-
-        return client.get('about', { searchParams, responseType: 'json' }).json()
-      }
-
-      const [sharedDrives, filesResponse, about] = await Promise.all([fetchSharedDrives(), fetchFiles(), fetchAbout()])
+      const [sharedDrives, filesResponse] = await Promise.all([fetchSharedDrives(), fetchFiles()])
 
       return adaptData(
         filesResponse,
         sharedDrives,
         directory,
         query,
         isRoot && !query.cursor, // we can only show it on the first page request, or else we will have duplicates of it
-        about,
       )
     })
   }

packages/@uppy/provider-views/src/ProviderView/ProviderView.jsx

@@ -126,6 +126,10 @@ export default class ProviderView extends View {
       const files = []
       let path = id
 
+      if (!this.username) {
+        this.username = await this.provider.user()
+      }
+
       while (path) {
         const res = await this.provider.list(path, { signal: controller.signal })
 
@@ -135,7 +139,6 @@ export default class ProviderView extends View {
         }
 
         path = res.nextPagePath
-        this.username ??= res.username
         this.setLoading(this.plugin.uppy.i18n('addedNumFiles', { numFiles: files.length + folders.length }))
       }
 
@@ -179,6 +182,7 @@ export default class ProviderView extends View {
 
           const newState = {
             authenticated: false,
+            username: null,
             files: [],
             folders: [],
             directories: [],