Mirrors/send
1
0
Fork 0
mirror of https://gitlab.com/timvisee/send.git synced 2025-12-07 22:50:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed leaky app.state on the server-side. fixes #928

Browse Source
This commit is contained in:
Danny Coates
2018-09-18 16:23:58 -07:00
parent 17a0393ce0
commit 99055b1342
4 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
app/routes/index.js
View File

@@ -11,23 +11,25 @@ const profile = require('../templates/userAccount');
const modal = require('../templates/modal');
nanotiming.disabled = true;
const app = choo();
function banner(state, emit) {
if (state.promo && !state.route.startsWith('/unsupported/')) {
return fxPromo(state, emit);
module.exports = function() {
const app = choo();
function banner(state, emit) {
if (state.promo && !state.route.startsWith('/unsupported/')) {
return fxPromo(state, emit);
}
}
}
function modalDialog(state, emit) {
if (state.modal) {
return modal(state, emit);
function modalDialog(state, emit) {
if (state.modal) {
return modal(state, emit);
}
}
}
function body(template) {
return function(state, emit) {
const b = html`<body class="background ${activeBackground(state)}">
function body(template) {
return function(state, emit) {
const b = html`<body class="background ${activeBackground(state)}">
${modalDialog(state, emit)}
${banner(state, emit)}
<main class="main">
@@ -59,32 +61,32 @@ function body(template) {
</main>
${footer(state)}
</body>`;
if (state.layout) {
// server side only
return state.layout(state, b);
}
return b;
};
}
app.route('/', body(require('../pages/welcome')));
app.route('/share/:id', body(require('../pages/share')));
app.route('/download/:id', body(download));
app.route('/download/:id/:key', body(download));
app.route('/unsupported/:reason', body(require('../pages/unsupported')));
app.route('/legal', body(require('../pages/legal')));
app.route('/error', body(require('../pages/error')));
app.route('/blank', body(require('../pages/blank')));
app.route('/signin', body(require('../pages/signin')));
app.route('/api/fxa/oauth', async function(state, emit) {
try {
await state.user.finishLogin(state.query.code);
emit('replaceState', '/');
} catch (e) {
emit('replaceState', '/error');
setTimeout(() => emit('render'));
if (state.layout) {
// server side only
return state.layout(state, b);
}
return b;
};
}
});
app.route('*', body(require('../pages/notFound')));
module.exports = app;
app.route('/', body(require('../pages/welcome')));
app.route('/share/:id', body(require('../pages/share')));
app.route('/download/:id', body(download));
app.route('/download/:id/:key', body(download));
app.route('/unsupported/:reason', body(require('../pages/unsupported')));
app.route('/legal', body(require('../pages/legal')));
app.route('/error', body(require('../pages/error')));
app.route('/blank', body(require('../pages/blank')));
app.route('/signin', body(require('../pages/signin')));
app.route('/api/fxa/oauth', async function(state, emit) {
try {
await state.user.finishLogin(state.query.code);
emit('replaceState', '/');
} catch (e) {
emit('replaceState', '/error');
setTimeout(() => emit('render'));
}
});
app.route('*', body(require('../pages/notFound')));
return app;
};