|
@ -25,7 +25,7 @@ func (c *UserController) getUsers(w http.ResponseWriter, r *http.Request) { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// TODO: Only admin can do this?
|
|
|
|
|
|
|
|
|
// TODO: Only admin should be allowed to do this?
|
|
|
|
|
|
|
|
|
users, err := c.users.List(r.Context()) |
|
|
users, err := c.users.List(r.Context()) |
|
|
if err != nil { |
|
|
if err != nil { |
|
@ -33,7 +33,7 @@ func (c *UserController) getUsers(w http.ResponseWriter, r *http.Request) { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
respond.JSON(w, 200, users) |
|
|
|
|
|
|
|
|
respond.Data(w, users) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// getUser (`GET /:id`): Get user by id
|
|
|
// getUser (`GET /:id`): Get user by id
|
|
@ -44,7 +44,7 @@ func (c *UserController) getUser(w http.ResponseWriter, r *http.Request) { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// TODO: Only admin can do this?
|
|
|
|
|
|
|
|
|
// TODO: Only admin should be allowed to do this?
|
|
|
|
|
|
|
|
|
var user models.User |
|
|
var user models.User |
|
|
|
|
|
|
|
@ -63,7 +63,7 @@ func (c *UserController) getUser(w http.ResponseWriter, r *http.Request) { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
respond.JSON(w, 200, user) |
|
|
|
|
|
|
|
|
respond.Data(w, user) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// login (`POST /login`): Log in as user
|
|
|
// login (`POST /login`): Log in as user
|
|
@ -106,7 +106,7 @@ func (c *UserController) login(w http.ResponseWriter, r *http.Request) { |
|
|
|
|
|
|
|
|
log.Printf("User %s logged in", user.Name) |
|
|
log.Printf("User %s logged in", user.Name) |
|
|
|
|
|
|
|
|
respond.JSON(w, 200, user) |
|
|
|
|
|
|
|
|
respond.Data(w, user) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
func (c *UserController) register(w http.ResponseWriter, r *http.Request) { |
|
|
func (c *UserController) register(w http.ResponseWriter, r *http.Request) { |
|
@ -144,7 +144,7 @@ func (c *UserController) register(w http.ResponseWriter, r *http.Request) { |
|
|
|
|
|
|
|
|
log.Printf("User %s registered", user.Name) |
|
|
log.Printf("User %s registered", user.Name) |
|
|
|
|
|
|
|
|
respond.JSON(w, 200, user) |
|
|
|
|
|
|
|
|
respond.Data(w, user) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// login (`POST /logout`): Log in as user
|
|
|
// login (`POST /logout`): Log in as user
|
|
@ -189,7 +189,7 @@ func (c *UserController) logout(w http.ResponseWriter, r *http.Request) { |
|
|
|
|
|
|
|
|
log.Printf("User %s logged out (clearAll: %t)", user.Name, logoutData.ClearAll) |
|
|
log.Printf("User %s logged out (clearAll: %t)", user.Name, logoutData.ClearAll) |
|
|
|
|
|
|
|
|
respond.JSON(w, 200, logoutData) |
|
|
|
|
|
|
|
|
respond.Data(w, logoutData) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Mount mounts the controller
|
|
|
// Mount mounts the controller
|
|
|