mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
using original single patch
This commit is contained in:
parent
53f2e2a235
commit
ac48f31e00
4 changed files with 45 additions and 49 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
)
|
||||
}
|
|
@ -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(
|
43
server-ce/hotfix/2.4.2/anonymous-metadata.patch
Normal file
43
server-ce/hotfix/2.4.2/anonymous-metadata.patch
Normal file
|
@ -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
|
||||
)
|
||||
}
|
Loading…
Reference in a new issue