Merge pull request #16980 from overleaf/jpa-join-project-remove-sl-2

[misc] joinProject: pass userId and anonymous access token in body 2/2

GitOrigin-RevId: b1a11941a6d9c7cc779769d1e97d3a0f03bed610
This commit is contained in:
Jakob Ackermann
2024-02-12 10:37:06 +00:00
committed by Copybot
parent 8523c21158
commit 385d3f9c1b
11 changed files with 18 additions and 112 deletions

View File

@@ -12,6 +12,7 @@
let MockWebServer
const sinon = require('sinon')
const express = require('express')
const bodyParser = require('body-parser')
module.exports = MockWebServer = {
projects: {},
@@ -43,8 +44,7 @@ module.exports = MockWebServer = {
joinProjectRequest(req, res, next) {
const { project_id: projectId } = req.params
const { user_id: userId } = req.query
const { 'x-sl-anonymous-access-token': anonymousAccessToken } = req.headers
const { anonymousAccessToken, userId } = req.body
if (projectId === '404404404404404404404404') {
// not-found
return res.status(404).send()
@@ -89,6 +89,7 @@ module.exports = MockWebServer = {
return callback()
}
const app = express()
app.use(bodyParser.json())
app.post('/project/:project_id/join', MockWebServer.joinProjectRequest)
return app
.listen(3000, error => {

View File

@@ -60,9 +60,6 @@ describe('WebApiManager', function () {
return this.request.post
.calledWith({
url: `${this.settings.apis.web.url}/project/${this.project_id}/join`,
qs: {
user_id: this.user_id,
},
auth: {
user: this.settings.apis.web.user,
pass: this.settings.apis.web.pass,
@@ -73,7 +70,6 @@ describe('WebApiManager', function () {
anonymousAccessToken: undefined,
},
jar: false,
headers: {},
})
.should.equal(true)
})
@@ -122,9 +118,6 @@ describe('WebApiManager', function () {
it('should send a request to web to join the project', function () {
this.request.post.should.have.been.calledWith({
url: `${this.settings.apis.web.url}/project/${this.project_id}/join`,
qs: {
user_id: this.user_id,
},
auth: {
user: this.settings.apis.web.user,
pass: this.settings.apis.web.pass,
@@ -135,7 +128,6 @@ describe('WebApiManager', function () {
anonymousAccessToken: this.token,
},
jar: false,
headers: { 'x-sl-anonymous-access-token': this.token },
})
})