From e727687ec81beebdb0b8b40ee6865ace60997964 Mon Sep 17 00:00:00 2001
From: Jerko Steiner <jerko.steiner@gmail.com>
Date: Sun, 7 Apr 2019 00:23:01 +0800
Subject: [PATCH] Refactor CommentActions, add skeleton for Reducer

---
 packages/server/src/routes/UserRoutes.ts |  2 +-
 packages/server/src/team/TeamRoutes.ts   | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/server/src/routes/UserRoutes.ts b/packages/server/src/routes/UserRoutes.ts
index 6164f5a..9e7c4d0 100644
--- a/packages/server/src/routes/UserRoutes.ts
+++ b/packages/server/src/routes/UserRoutes.ts
@@ -13,7 +13,7 @@ export class UserRoutes extends BaseRoute<IAPIDef> {
   }
 
   setup(t: AsyncRouter<IAPIDef>) {
-    t.use(ensureLoggedInApi)
+    t.use('/users', ensureLoggedInApi)
 
     t.post('/users/password', async req => {
       await this.userService.changePassword({
diff --git a/packages/server/src/team/TeamRoutes.ts b/packages/server/src/team/TeamRoutes.ts
index 5b79659..51c4b90 100644
--- a/packages/server/src/team/TeamRoutes.ts
+++ b/packages/server/src/team/TeamRoutes.ts
@@ -16,18 +16,18 @@ export class TeamRoutes extends BaseRoute<IAPIDef> {
 
   setup(t: AsyncRouter<IAPIDef>) {
 
-    t.get('/teams/:id', async req => {
+    const ensureLoggedIn = [ensureLoggedInApi]
+
+    t.get('/teams/:id', ensureLoggedIn, async req => {
       const {id} = req.params
       return this.teamService.findOne(id)
     })
 
-    t.use(ensureLoggedInApi)
-
-    t.get('/my/teams', async req => {
+    t.get('/my/teams', ensureLoggedIn, async req => {
       return this.teamService.find(req.user!.id)
     })
 
-    t.post('/teams', async req => {
+    t.post('/teams', ensureLoggedIn, async req => {
       const {name} = req.body
       return this.teamService.create({
         name,
@@ -35,7 +35,7 @@ export class TeamRoutes extends BaseRoute<IAPIDef> {
       })
     })
 
-    t.put('/teams/:id', async req => {
+    t.put('/teams/:id', ensureLoggedIn, async req => {
       const id = Number(req.params.id)
 
       await this.permissions.belongsToTeam({
@@ -50,7 +50,7 @@ export class TeamRoutes extends BaseRoute<IAPIDef> {
       })
     })
 
-    t.delete('/teams/:id', async req => {
+    t.delete('/teams/:id', ensureLoggedIn, async req => {
       const id = Number(req.params.id)
 
       await this.permissions.belongsToTeam({
@@ -64,7 +64,7 @@ export class TeamRoutes extends BaseRoute<IAPIDef> {
       })
     })
 
-    t.get('/teams/:teamId/users', async req => {
+    t.get('/teams/:teamId/users', ensureLoggedIn, async req => {
       const teamId = Number(req.params.teamId)
 
       await this.permissions.belongsToTeam({
@@ -75,7 +75,7 @@ export class TeamRoutes extends BaseRoute<IAPIDef> {
       return this.teamService.findUsers(teamId)
     })
 
-    t.post('/teams/:teamId/users/:userId', async req => {
+    t.post('/teams/:teamId/users/:userId', ensureLoggedIn, async req => {
       const teamId = Number(req.params.teamId)
       const userId = Number(req.params.userId)
 
@@ -91,7 +91,7 @@ export class TeamRoutes extends BaseRoute<IAPIDef> {
       })
     })
 
-    t.delete('/teams/:teamId/users/:userId', async req => {
+    t.delete('/teams/:teamId/users/:userId', ensureLoggedIn, async req => {
       const teamId = Number(req.params.teamId)
       const userId = Number(req.params.userId)