소스 검색

Corrected the use of POST vs PUT, POST creates something, PUT updates, got them mixed up

Torkel Ödegaard 11 년 전
부모
커밋
9a641ee7c0
2개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      grafana
  2. 6 6
      pkg/api/api.go

+ 1 - 1
grafana

@@ -1 +1 @@
-Subproject commit a0c8d3fa6fdf8eb3624af130fe12244f0e8d5e01
+Subproject commit ab7e2f89fb596d6adc9a28177feb97574e860ce7

+ 6 - 6
pkg/api/api.go

@@ -35,22 +35,22 @@ func Register(r *macaron.Macaron) {
 
 	// sign up
 	r.Get("/signup", Index)
-	r.Put("/api/user/signup", bind(m.CreateUserCommand{}), SignUp)
+	r.Post("/api/user/signup", bind(m.CreateUserCommand{}), SignUp)
 
 	// authed api
 	r.Group("/api", func() {
 		// user
 		r.Group("/user", func() {
 			r.Get("/", GetUser)
-			r.Post("/", bind(m.UpdateUserCommand{}), UpdateUser)
+			r.Put("/", bind(m.UpdateUserCommand{}), UpdateUser)
 			r.Post("/using/:id", SetUsingAccount)
 			r.Get("/accounts", GetUserAccounts)
 		})
 
 		// account
 		r.Group("/account", func() {
-			r.Put("/", bind(m.CreateAccountCommand{}), CreateAccount)
-			r.Put("/users", bind(m.AddAccountUserCommand{}), AddAccountUser)
+			r.Post("/", bind(m.CreateAccountCommand{}), CreateAccount)
+			r.Post("/users", bind(m.AddAccountUserCommand{}), AddAccountUser)
 			r.Get("/users", GetAccountUsers)
 			r.Delete("/users/:id", RemoveAccountUser)
 		})
@@ -58,8 +58,8 @@ func Register(r *macaron.Macaron) {
 		r.Group("/tokens", func() {
 			r.Combo("/").
 				Get(GetTokens).
-				Put(bind(m.AddTokenCommand{}), AddToken).
-				Post(bind(m.UpdateTokenCommand{}), UpdateToken)
+				Post(bind(m.AddTokenCommand{}), AddToken).
+				Put(bind(m.UpdateTokenCommand{}), UpdateToken)
 			r.Delete("/:id", DeleteToken)
 		})
 		// Data sources