github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

[web] pipe history zip download to history-v1 in CE/SP (#11362)

Browse source 
GitOrigin-RevId: 4ef181d1b79b3d0e2254af698defe0c2fa8c679f
This commit is contained in:
Miguel Serrano 2023-01-23 11:34:58 +01:00 committed by Copybot
parent 2291fd5dae
commit b4e9bf3449
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
services/web/app/src/Features/History/HistoryController.js
View file

@ -13,6 +13,7 @@ const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandle
const RestoreManager = require('./RestoreManager')
const { pipeline } = require('stream')
const { prepareZipAttachment } = require('../../infrastructure/Response')
const Features = require('../../infrastructure/Features')
module.exports = HistoryController = {
selectHistoryApi(req, res, next) {
@ -344,10 +345,20 @@ module.exports = HistoryController = {
pass: settings.apis.v1_history.pass,
},
json: true,
method: 'post',
url,
}
request(options, function (err, response, body) {
if (!Features.hasFeature('saas')) {
const getReq = request({ ...options, method: 'get' })
getReq.pipe(res)
getReq.on('error', function (err) {
logger.error({ url, err }, 'history API error')
next(err)
})
return
}
request({ ...options, method: 'post' }, function (err, response, body) {
if (err) {
OError.tag(err, 'history API error', {
v1ProjectId,

4
services/web/test/unit/src/History/HistoryControllerTests.js
View file

@ -34,6 +34,10 @@ describe('HistoryController', function () {
(this.ProjectEntityUpdateHandler = {}),
'../User/UserGetter': (this.UserGetter = {}),
'./RestoreManager': (this.RestoreManager = {}),
'../../infrastructure/Features': (this.Features = sinon
.stub()
.withArgs('saas')
.returns(true)),
},
})
return (this.settings.apis = {