pr_16956.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334
  1. --- services/web/app/src/Features/Editor/EditorHttpController.js
  2. +++ services/web/app/src/Features/Editor/EditorHttpController.js
  3. @@ -8,7 +8,6 @@ const CollaboratorsGetter = require('../Collaborators/CollaboratorsGetter')
  4. const CollaboratorsInviteHandler = require('../Collaborators/CollaboratorsInviteHandler')
  5. const CollaboratorsHandler = require('../Collaborators/CollaboratorsHandler')
  6. const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
  7. -const TokenAccessHandler = require('../TokenAccess/TokenAccessHandler')
  8. const SessionManager = require('../Authentication/SessionManager')
  9. const Errors = require('../Errors/Errors')
  10. const DocstoreManager = require('../Docstore/DocstoreManager')
  11. @@ -178,7 +177,7 @@ async function _buildJoinProjectView(req, projectId, userId) {
  12. await CollaboratorsGetter.promises.getInvitedMembersWithPrivilegeLevels(
  13. projectId
  14. )
  15. - const token = TokenAccessHandler.getRequestToken(req, projectId)
  16. + const token = req.headers['x-sl-anonymous-access-token']
  17. const privilegeLevel =
  18. await AuthorizationManager.promises.getPrivilegeLevelForProject(
  19. userId,
  20. --- services/web/app/src/Features/TokenAccess/TokenAccessHandler.js
  21. +++ services/web/app/src/Features/TokenAccess/TokenAccessHandler.js
  22. @@ -213,10 +213,9 @@ const TokenAccessHandler = {
  23. getRequestToken(req, projectId) {
  24. const token =
  25. - (req.session &&
  26. - req.session.anonTokenAccess &&
  27. - req.session.anonTokenAccess[projectId.toString()]) ||
  28. - req.headers['x-sl-anonymous-access-token']
  29. + req.session &&
  30. + req.session.anonTokenAccess &&
  31. + req.session.anonTokenAccess[projectId.toString()]
  32. return token
  33. },