From a74e90fc094b717b4c3afb2d46b17a76c53d193c Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Tue, 26 Dec 2017 15:01:16 +0200
Subject: [PATCH] Move auth to router.use

---
 server/api/apiKeys.js | 7 ++++---
 server/api/index.js   | 2 ++
 server/api/user.js    | 7 ++++---
 server/api/views.js   | 5 +++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/server/api/apiKeys.js b/server/api/apiKeys.js
index 4b6e5c84..bfa41a11 100644
--- a/server/api/apiKeys.js
+++ b/server/api/apiKeys.js
@@ -8,8 +8,9 @@ import { presentApiKey } from '../presenters';
 import { ApiKey } from '../models';
 
 const router = new Router();
+router.use(auth());
 
-router.post('apiKeys.create', auth(), async ctx => {
+router.post('apiKeys.create', async ctx => {
   const { name } = ctx.body;
   ctx.assertPresent(name, 'name is required');
 
@@ -25,7 +26,7 @@ router.post('apiKeys.create', auth(), async ctx => {
   };
 });
 
-router.post('apiKeys.list', auth(), pagination(), async ctx => {
+router.post('apiKeys.list', pagination(), async ctx => {
   const user = ctx.state.user;
   const keys = await ApiKey.findAll({
     where: {
@@ -46,7 +47,7 @@ router.post('apiKeys.list', auth(), pagination(), async ctx => {
   };
 });
 
-router.post('apiKeys.delete', auth(), async ctx => {
+router.post('apiKeys.delete', async ctx => {
   const { id } = ctx.body;
   ctx.assertPresent(id, 'id is required');
 
diff --git a/server/api/index.js b/server/api/index.js
index 5a93e31e..a1b4f8e9 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -12,6 +12,7 @@ import documents from './documents';
 import views from './views';
 import hooks from './hooks';
 import apiKeys from './apiKeys';
+import team from './team';
 
 import validation from './middlewares/validation';
 import methodOverride from '../middlewares/methodOverride';
@@ -64,6 +65,7 @@ router.use('/', documents.routes());
 router.use('/', views.routes());
 router.use('/', hooks.routes());
 router.use('/', apiKeys.routes());
+router.use('/', team.routes());
 
 // Router is embedded in a Koa application wrapper, because koa-router does not
 // allow middleware to catch any routes which were not explicitly defined.
diff --git a/server/api/user.js b/server/api/user.js
index 77fdf41a..e2052f13 100644
--- a/server/api/user.js
+++ b/server/api/user.js
@@ -7,12 +7,13 @@ import auth from './middlewares/authentication';
 import { presentUser } from '../presenters';
 
 const router = new Router();
+router.use(auth());
 
-router.post('user.info', auth(), async ctx => {
+router.post('user.info', async ctx => {
   ctx.body = { data: await presentUser(ctx, ctx.state.user) };
 });
 
-router.post('user.update', auth(), async ctx => {
+router.post('user.update', async ctx => {
   const { user } = ctx.state;
   const { name, avatarUrl } = ctx.body;
   const endpoint = publicS3Endpoint();
@@ -28,7 +29,7 @@ router.post('user.update', auth(), async ctx => {
   ctx.body = { data: await presentUser(ctx, user) };
 });
 
-router.post('user.s3Upload', auth(), async ctx => {
+router.post('user.s3Upload', async ctx => {
   const { filename, kind, size } = ctx.body;
   ctx.assertPresent(filename, 'filename is required');
   ctx.assertPresent(kind, 'kind is required');
diff --git a/server/api/views.js b/server/api/views.js
index 84a26b21..e26e3ec7 100644
--- a/server/api/views.js
+++ b/server/api/views.js
@@ -6,8 +6,9 @@ import { presentView } from '../presenters';
 import { View, Document } from '../models';
 
 const router = new Router();
+router.use(auth());
 
-router.post('views.list', auth(), async ctx => {
+router.post('views.list', async ctx => {
   const { id } = ctx.body;
   ctx.assertPresent(id, 'id is required');
 
@@ -36,7 +37,7 @@ router.post('views.list', auth(), async ctx => {
   };
 });
 
-router.post('views.create', auth(), async ctx => {
+router.post('views.create', async ctx => {
   const { id } = ctx.body;
   ctx.assertPresent(id, 'id is required');