dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit bf83b43866
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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')));