From ac48f31e008eba1acb0cb1ff92baaa78887d9e29 Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserranom@gmail.com>
Date: Thu, 1 Oct 2020 11:53:11 +0200
Subject: [PATCH] using original single patch

---
 server-ce/hotfix/2.4.2/Dockerfile             |  8 +---
 .../2.4.2/anonymous-metadata-contacts.patch   | 20 ---------
 .../2.4.2/anonymous-metadata-router.patch     | 23 ----------
 .../hotfix/2.4.2/anonymous-metadata.patch     | 43 +++++++++++++++++++
 4 files changed, 45 insertions(+), 49 deletions(-)
 delete mode 100644 server-ce/hotfix/2.4.2/anonymous-metadata-contacts.patch
 delete mode 100644 server-ce/hotfix/2.4.2/anonymous-metadata-router.patch
 create mode 100644 server-ce/hotfix/2.4.2/anonymous-metadata.patch

diff --git a/server-ce/hotfix/2.4.2/Dockerfile b/server-ce/hotfix/2.4.2/Dockerfile
index 1464cf469a..8058aa687b 100644
--- a/server-ce/hotfix/2.4.2/Dockerfile
+++ b/server-ce/hotfix/2.4.2/Dockerfile
@@ -2,9 +2,5 @@ FROM sharelatex/sharelatex:2.4.1
 
 
 # Patch: Fixes anonymous read/write sharing
-ADD anonymous-metadata-router.patch /var/www/sharelatex/web/app/src/anonymous-metadata-router.patch
-RUN cd /var/www/sharelatex/web/app/src && \
-    patch < anonymous-metadata-router.patch
-ADD anonymous-metadata-contacts.patch /var/www/sharelatex/web/app/src/Features/Contacts/anonymous-metadata-contacts.patch
-RUN cd /var/www/sharelatex/web/app/src/Features/Contacts && \
-    patch < anonymous-metadata-contacts.patch
+COPY anonymous-metadata.patch ${baseDir}
+RUN cd ${baseDir} && patch -p0 < anonymous-metadata.patch
diff --git a/server-ce/hotfix/2.4.2/anonymous-metadata-contacts.patch b/server-ce/hotfix/2.4.2/anonymous-metadata-contacts.patch
deleted file mode 100644
index e0ff95c876..0000000000
--- a/server-ce/hotfix/2.4.2/anonymous-metadata-contacts.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/ContactRouter.js
-+++ b/ContactRouter.js
-@@ -5,6 +5,8 @@
-  * DS102: Remove unnecessary code created because of implicit returns
-  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
-  */
-+const Settings = require('settings-sharelatex')
-+
- const AuthenticationController = require('../Authentication/AuthenticationController')
- const ContactController = require('./ContactController')
- 
-@@ -12,7 +14,7 @@
-   apply(webRouter, apiRouter) {
-     return webRouter.get(
-       '/user/contacts',
--      AuthenticationController.requireLogin(),
-+      Settings.allowAnonymousReadAndWriteSharing ? (req, res, next) => { next() } : AuthenticationController.requireLogin(),
-       ContactController.getContacts
-     )
-   }
diff --git a/server-ce/hotfix/2.4.2/anonymous-metadata-router.patch b/server-ce/hotfix/2.4.2/anonymous-metadata-router.patch
deleted file mode 100644
index f1a7a70525..0000000000
--- a/server-ce/hotfix/2.4.2/anonymous-metadata-router.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/router.js
-+++ b/router.js
-@@ -607,16 +607,17 @@
-     ProjectDownloadsController.downloadMultipleProjects
-   )
- 
-+  console.log(`allowAnonymousReadAndWriteSharing: ${Settings.allowAnonymousReadAndWriteSharing}`)
-   webRouter.get(
-     '/project/:project_id/metadata',
-     AuthorizationMiddleware.ensureUserCanReadProject,
--    AuthenticationController.requireLogin(),
-+    Settings.allowAnonymousReadAndWriteSharing ? (req, res, next) => { next() } : AuthenticationController.requireLogin(),
-     MetaController.getMetadata
--  )
-+  ) 
-   webRouter.post(
-     '/project/:project_id/doc/:doc_id/metadata',
-     AuthorizationMiddleware.ensureUserCanReadProject,
--    AuthenticationController.requireLogin(),
-+    Settings.allowAnonymousReadAndWriteSharing ? (req, res, next) => { next() } : AuthenticationController.requireLogin(),
-     MetaController.broadcastMetadataForDoc
-   )
-   privateApiRouter.post(
\ No newline at end of file
diff --git a/server-ce/hotfix/2.4.2/anonymous-metadata.patch b/server-ce/hotfix/2.4.2/anonymous-metadata.patch
new file mode 100644
index 0000000000..ea041abf9c
--- /dev/null
+++ b/server-ce/hotfix/2.4.2/anonymous-metadata.patch
@@ -0,0 +1,43 @@
+--- /var/www/sharelatex/web/app/src/router.js	2020-09-14 20:21:39.741433000 +0000
++++ /var/www/sharelatex/web/app/src/router.js	2020-09-14 20:13:08.000000000 +0000
+@@ -607,16 +607,17 @@
+     ProjectDownloadsController.downloadMultipleProjects
+   )
+ 
++  console.log(`allowAnonymousReadAndWriteSharing: ${Settings.allowAnonymousReadAndWriteSharing}`)
+   webRouter.get(
+     '/project/:project_id/metadata',
+     AuthorizationMiddleware.ensureUserCanReadProject,
+-    AuthenticationController.requireLogin(),
++    Settings.allowAnonymousReadAndWriteSharing ? (req, res, next) => { next() } : AuthenticationController.requireLogin(),
+     MetaController.getMetadata
+-  )
++  ) 
+   webRouter.post(
+     '/project/:project_id/doc/:doc_id/metadata',
+     AuthorizationMiddleware.ensureUserCanReadProject,
+-    AuthenticationController.requireLogin(),
++    Settings.allowAnonymousReadAndWriteSharing ? (req, res, next) => { next() } : AuthenticationController.requireLogin(),
+     MetaController.broadcastMetadataForDoc
+   )
+   privateApiRouter.post(
+--- /var/www/sharelatex/web/app/src/Features/Contacts/ContactRouter.js	2020-09-14 20:21:52.243779000 +0000
++++ /var/www/sharelatex/web/app/src/Features/Contacts/ContactRouter.js	2020-09-14 20:13:08.000000000 +0000
+@@ -5,6 +5,8 @@
+  * DS102: Remove unnecessary code created because of implicit returns
+  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
+  */
++const Settings = require('settings-sharelatex')
++
+ const AuthenticationController = require('../Authentication/AuthenticationController')
+ const ContactController = require('./ContactController')
+ 
+@@ -12,7 +14,7 @@
+   apply(webRouter, apiRouter) {
+     return webRouter.get(
+       '/user/contacts',
+-      AuthenticationController.requireLogin(),
++      Settings.allowAnonymousReadAndWriteSharing ? (req, res, next) => { next() } : AuthenticationController.requireLogin(),
+       ContactController.getContacts
+     )
+   }