From 511a6e66dce2d40ccc3ee52114afc4c7f93b56a9 Mon Sep 17 00:00:00 2001
From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Wed, 8 Jul 2020 15:16:53 +0200
Subject: [PATCH] Pass e2e-token to PropagateUpload subjobs

The headers() method is used to pass extra headers to the PUT jobs for
instance, definitely needed for uploads now.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---
 src/libsync/propagateupload.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 287c92c4f..633d897d7 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -735,6 +735,10 @@ QMap<QByteArray, QByteArray> PropagateUploadFileCommon::headers()
             headers["OC-ConflictBaseEtag"] = conflictRecord.baseEtag;
     }
 
+    if (_uploadEncryptedHelper && !_uploadEncryptedHelper->_folderToken.isEmpty()) {
+        headers.insert("e2e-token", _uploadEncryptedHelper->_folderToken);
+    }
+
     return headers;
 }
 
-- 
2.30.2