mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

import: Ajaxify pad import

Browse source 
This eliminates an inline script (good for Content Security Policy)
and improves the user experience.
This commit is contained in:
Richard Hansen 2020-10-05 22:22:44 -04:00 • committed by John McLear
parent fba55fa6cf
commit b711ff6acf
3 changed files with 76 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/node/handler/ImportHandler.js
View file

@ -258,21 +258,18 @@ const doImport = async (req, res, padId) => {
};
exports.doImport = async (req, res, padId) => {
let status = 'ok';
let httpStatus = 200;
let code = 0;
let message = 'ok';
let directDatabaseAccess;
try {
directDatabaseAccess = await doImport(req, res, padId);
} catch (err) {
if (!(err instanceof ImportError) || !err.status) throw err;
status = err.status;
const known = err instanceof ImportError && err.status;
if (!known) logger.error(`Internal error during import: ${err.stack || err}`);
httpStatus = known ? 400 : 500;
code = known ? 1 : 2;
message = known ? err.status : 'internalError';
}
// close the connection
res.send([
'<script>',
"document.addEventListener('DOMContentLoaded', () => {",
' window.parent.padimpexp.handleFrameCall(',
` ${JSON.stringify(directDatabaseAccess)}, ${JSON.stringify(status)});`,
'});',
'</script>',
].join('\n'));
res.status(httpStatus).json({code, message, data: {directDatabaseAccess}});
};