mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
652f0cb0b7
[server-pro] add hotfix 4.2.2 GitOrigin-RevId: 61e7866798b3e263cabea4d32bc08957760013bf
34 lines
1.7 KiB
Diff
34 lines
1.7 KiB
Diff
--- services/web/app/src/Features/Editor/EditorHttpController.js
|
|
+++ services/web/app/src/Features/Editor/EditorHttpController.js
|
|
@@ -8,7 +8,6 @@ const CollaboratorsGetter = require('../Collaborators/CollaboratorsGetter')
|
|
const CollaboratorsInviteHandler = require('../Collaborators/CollaboratorsInviteHandler')
|
|
const CollaboratorsHandler = require('../Collaborators/CollaboratorsHandler')
|
|
const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
|
|
-const TokenAccessHandler = require('../TokenAccess/TokenAccessHandler')
|
|
const SessionManager = require('../Authentication/SessionManager')
|
|
const Errors = require('../Errors/Errors')
|
|
const DocstoreManager = require('../Docstore/DocstoreManager')
|
|
@@ -178,7 +177,7 @@ async function _buildJoinProjectView(req, projectId, userId) {
|
|
await CollaboratorsGetter.promises.getInvitedMembersWithPrivilegeLevels(
|
|
projectId
|
|
)
|
|
- const token = TokenAccessHandler.getRequestToken(req, projectId)
|
|
+ const token = req.headers['x-sl-anonymous-access-token']
|
|
const privilegeLevel =
|
|
await AuthorizationManager.promises.getPrivilegeLevelForProject(
|
|
userId,
|
|
--- services/web/app/src/Features/TokenAccess/TokenAccessHandler.js
|
|
+++ services/web/app/src/Features/TokenAccess/TokenAccessHandler.js
|
|
@@ -213,10 +213,9 @@ const TokenAccessHandler = {
|
|
|
|
getRequestToken(req, projectId) {
|
|
const token =
|
|
- (req.session &&
|
|
- req.session.anonTokenAccess &&
|
|
- req.session.anonTokenAccess[projectId.toString()]) ||
|
|
- req.headers['x-sl-anonymous-access-token']
|
|
+ req.session &&
|
|
+ req.session.anonTokenAccess &&
|
|
+ req.session.anonTokenAccess[projectId.toString()]
|
|
return token
|
|
},
|