From c9db0bf3d764437b30c42aae7e1ccfa7e8df7532 Mon Sep 17 00:00:00 2001
From: Eric Doughty-Papassideris <edoughtypapassideris@linagora.com>
Date: Tue, 17 Sep 2024 17:03:36 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20cli:=20better=20informatio?=
 =?UTF-8?q?n=20about=20file=20history=20and=20key=20(#525)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../node/src/cli/cmds/editing_session_cmds/list.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tdrive/backend/node/src/cli/cmds/editing_session_cmds/list.ts b/tdrive/backend/node/src/cli/cmds/editing_session_cmds/list.ts
index d7386ea7..e796a7f5 100644
--- a/tdrive/backend/node/src/cli/cmds/editing_session_cmds/list.ts
+++ b/tdrive/backend/node/src/cli/cmds/editing_session_cmds/list.ts
@@ -20,11 +20,11 @@ async function makeUserCache(platform: TdrivePlatform) {
     .getProvider<DatabaseServiceAPI>("database")
     .getRepository<User>(User_TYPE, User);
   const cache: { [id: string]: User } = {};
-  return async id => {
-    if (id in cache) return cache[id];
+  return async (id): Promise<[boolean, User]> => {
+    if (id in cache) return [true, cache[id]];
     const user = await usersRepo.findOne({ id });
     if (user) cache[id] = user;
-    return user;
+    return [false, user];
   };
 }
 
@@ -36,8 +36,10 @@ interface ListArguments {
 async function report(platform: TdrivePlatform, args: ListArguments) {
   const users = await makeUserCache(platform);
   async function formatUser(id) {
-    const user = await users(id);
-    return user?.email_canonical || id;
+    const [wasKnown, user] = await users(id);
+    return user?.email_canonical
+      ? user.email_canonical + (wasKnown ? "" : ` (${id})`)
+      : `${JSON.stringify(id)} (user id not found)`;
   }
   const drivesRepo = await platform
     .getProvider<DatabaseServiceAPI>("database")
@@ -60,7 +62,7 @@ async function report(platform: TdrivePlatform, args: ListArguments) {
       console.error(`    - URL encoded:   ${encodeURIComponent(dfile.editing_session_key)}`);
       console.error(`    - applicationId: ${parsed.applicationId}`);
       console.error(`    - companyId:     ${parsed.companyId}`);
-      console.error(`    - instanceId:    ${parsed.instanceId}`);
+      console.error(`    - instanceId:    ${JSON.stringify(parsed.instanceId)}`);
       console.error(
         `    - userId:        ${await formatUser(parsed.userId)} (${
           parsed.userId === dfile.creator ? "same as creator ID" : "not the creator"