From a997a44a236036a577b2685802c141fa8e18d228 Mon Sep 17 00:00:00 2001 From: Danny Coates Date: Wed, 26 Sep 2018 12:22:04 -0700 Subject: [PATCH] renamed auth route --- app/routes/index.js | 2 +- server/bin/dev.js | 2 +- server/routes/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/routes/index.js b/app/routes/index.js index 86caf891..180f8ca3 100644 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -77,7 +77,7 @@ module.exports = function() { 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) { + app.route('/oauth', async function(state, emit) { try { await state.user.finishLogin(state.query.code, state.query.state); emit('replaceState', '/'); diff --git a/server/bin/dev.js b/server/bin/dev.js index 13e3d2b2..d13a54b4 100644 --- a/server/bin/dev.js +++ b/server/bin/dev.js @@ -45,7 +45,7 @@ module.exports = function(app, devServer) { app.get('/completed', android); app.get('/preferences', android); app.get('/options', android); - app.get('/api/fxa/oauth', android); + app.get('/oauth', android); } routes(app); tests(app); diff --git a/server/routes/index.js b/server/routes/index.js index 704f5e2d..a14513a7 100644 --- a/server/routes/index.js +++ b/server/routes/index.js @@ -68,6 +68,7 @@ module.exports = function(app) { app.use(express.json()); app.get('/', language, pages.index); app.get('/signin', pages.blank); + app.get('/oauth', pages.blank); app.get('/legal', language, pages.legal); app.get('/jsconfig.js', require('./jsconfig')); app.get(`/share/:id${ID_REGEX}`, language, pages.blank); @@ -82,7 +83,6 @@ module.exports = function(app) { ); app.get(`/api/exists/:id${ID_REGEX}`, require('./exists')); app.get(`/api/metadata/:id${ID_REGEX}`, auth.hmac, require('./metadata')); - app.get('/api/fxa/oauth', pages.blank); app.get('/api/filelist', auth.fxa, filelist.get); app.post('/api/filelist', auth.fxa, filelist.post); app.post('/api/upload', auth.fxa, require('./upload'));