From aff200fc6259f89e511abb0f9cd00ef23b4b7239 Mon Sep 17 00:00:00 2001
From: Rashesh Padia <rashesh.padia@collabora.com>
Date: Thu, 23 May 2024 15:23:20 +0530
Subject: [PATCH] admin: add dockey to adddoc message

Signed-off-by: Rashesh Padia <rashesh.padia@collabora.com>
Change-Id: I1f6432a3872e5d0dc91cb47e25e0d306402e88f0
---
 wsd/AdminModel.cpp | 3 ++-
 wsd/protocol.txt   | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/wsd/AdminModel.cpp b/wsd/AdminModel.cpp
index 41e7c9118df7..f0f14d881d88 100644
--- a/wsd/AdminModel.cpp
+++ b/wsd/AdminModel.cpp
@@ -558,7 +558,8 @@ void AdminModel::addDocument(const std::string& docKey, pid_t pid,
     }
 
     const std::string& wopiHost = wopiSrc.getHost();
-    oss << memoryAllocated << ' ' << wopiHost << ' ' << isViewReadOnly << ' ' << wopiSrc.toString();
+    oss << memoryAllocated << ' ' << wopiHost << ' ' << isViewReadOnly << ' ' << wopiSrc.toString()
+        << ' ' << Util::decodeURIComponent(docKey);
     if (COOLWSD::getConfigValue<bool>("logging.docstats", false))
     {
         std::string docstats = "docstats : adding a document : " + filename
diff --git a/wsd/protocol.txt b/wsd/protocol.txt
index 919b5f4b006a..94cbef7ee742 100644
--- a/wsd/protocol.txt
+++ b/wsd/protocol.txt
@@ -917,13 +917,17 @@ Commands marked with [*] are notifications that are delivered only if client is
 subscribed to these commands using `subscribe` (see client->admin
 section). Others are just response messages to some client command.
 
-[*] adddoc <pid> <filename> <sessionid> <username> <userid> <memory consumed> <wopiHost> <isViewReadOnly> <wopiSrc>
+[*] adddoc <pid> <filename> <sessionid> <username> <userid> <memory consumed>
+           <wopiHost> <isViewReadOnly> <wopiSrc> <dockey>
 
     <pid> process id hosting the document
     <filename> URL encoded name of the file
     <sessionid> string identifying the view of this document
     <memory consumed> RSS of <pid> in kilobytes
     <wopihost> storage host on which document exist
+    <isViewReadOnly> if the view is readonly
+    <wopiSrc> wopisrc of the document
+    <dockey> unique identifying key of the document
 
 [*] rmdoc <pid> <sessionid>