Mirroring/send
1
0
Fork 0
mirror of https://gitlab.com/timvisee/send.git synced 2025-12-11 04:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vnext' into modal

Browse Source
This commit is contained in:
Danny Coates
2018-09-14 09:20:30 -07:00
committed by GitHub
parent cdc15596df 7ccf462bf8
commit bf83b43866
18 changed files with 331 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/routes/index.js
View File

@@ -76,9 +76,14 @@ 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', function(state, emit) {
emit('replaceState', '/');
setTimeout(() => emit('render'));
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')));