Merge pull request #2817 from overleaf/ns-project-import-deletion-v1-handler
remove checks if project is in importing state GitOrigin-RevId: f087cf04436b38b351b6985cecc9182256401cba
This commit is contained in:
@@ -37,7 +37,6 @@ const { V1ConnectionError } = require('../Errors/Errors')
|
||||
const Features = require('../../infrastructure/Features')
|
||||
const BrandVariationsHandler = require('../BrandVariations/BrandVariationsHandler')
|
||||
const { getUserAffiliations } = require('../Institutions/InstitutionsAPI')
|
||||
const V1Handler = require('../V1/V1Handler')
|
||||
const UserController = require('../User/UserController')
|
||||
|
||||
const _ssoAvailable = (affiliation, session, linkedInstitutionIds) => {
|
||||
@@ -619,35 +618,7 @@ const ProjectController = {
|
||||
if (err != null) {
|
||||
return cb(err)
|
||||
}
|
||||
if (
|
||||
(project.overleaf != null ? project.overleaf.id : undefined) ==
|
||||
null ||
|
||||
(project.tokens != null
|
||||
? project.tokens.readAndWrite
|
||||
: undefined) == null ||
|
||||
Settings.projectImportingCheckMaxCreateDelta == null
|
||||
) {
|
||||
return cb(null, project)
|
||||
}
|
||||
const createDelta =
|
||||
(new Date().getTime() -
|
||||
new Date(project._id.getTimestamp()).getTime()) /
|
||||
1000
|
||||
if (
|
||||
!(createDelta < Settings.projectImportingCheckMaxCreateDelta)
|
||||
) {
|
||||
return cb(null, project)
|
||||
}
|
||||
V1Handler.getDocExported(
|
||||
project.tokens.readAndWrite,
|
||||
(err, docExported) => {
|
||||
if (err != null) {
|
||||
return next(err)
|
||||
}
|
||||
project.exporting = docExported.exporting
|
||||
cb(null, project)
|
||||
}
|
||||
)
|
||||
cb(null, project)
|
||||
}
|
||||
)
|
||||
},
|
||||
@@ -738,11 +709,6 @@ const ProjectController = {
|
||||
return res.sendStatus(401)
|
||||
}
|
||||
|
||||
if (project.exporting) {
|
||||
res.render('project/importing', { bodyClasses: ['editor'] })
|
||||
return
|
||||
}
|
||||
|
||||
if (
|
||||
subscription != null &&
|
||||
subscription.freeTrial != null &&
|
||||
|
||||
Reference in New Issue
Block a user