Merge pull request #48 from titouanfreville/issue-30-secureAPI

linted
titouanfreville · Apr 8, 2017 · bbec283 · bbec283
2 parents a49097a + cf0fb08
commit bbec283
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/api/member_route.go b/api/member_route.go
@@ -134,7 +134,6 @@ func initMemberOverUser(userRoutes chi.Router) {
 		// 	  422: wrongEntity
 		// 	  503: databaseError
 		// 	  default: genericError
-		userRoutes.Post("/role/:roleID", getMemberFromRole)
 		// swagger:route PUT user/{userID}/channel/{channelID} Members updateMember
 		//
 		// Update member
@@ -160,6 +159,7 @@ func initMemberOverUser(userRoutes chi.Router) {
 		// 	  default: genericError
 		r.Delete("/", deleteMember)
 	})
+	userRoutes.Get("/role/:roleID", getMemberFromRole)
 }
 
 func memberContext(next http.Handler) http.Handler {
@@ -203,12 +203,12 @@ func memberContext(next http.Handler) http.Handler {
 			}
 			oldMember = datastores.Store().Member().GetByID(channel.IDChannel, userID, dbStore.db)
 		}
-		roleId, err := strconv.ParseUint(chi.URLParam(r, "roleID"), 10, 64)
+		roleID, err := strconv.ParseUint(chi.URLParam(r, "roleID"), 10, 64)
 		if err != nil {
 			roleName := chi.URLParam(r, "roleID")
 			role = datastores.Store().Role().GetByName(roleName, dbStore.db)
 		} else {
-			role = datastores.Store().Role().GetByID(roleId, dbStore.db)
+			role = datastores.Store().Role().GetByID(roleID, dbStore.db)
 		}
 		ctx = context.WithValue(ctx, oldMemberKey, oldMember)
 		ctx = context.WithValue(ctx, oldChannelKey, channel)

diff --git a/api/user_route.go b/api/user_route.go
@@ -187,7 +187,7 @@ func initUserRoute(router chi.Router) {
 			// 	  default: deleteMessage
 			r.Delete("/", deleteUser)
 			initUserParameterRoute(r)
-			initMemberOverUser(r)
+			//initMemberOverUser(r)
 		})
 	})
 }