LumeWeb
/
gitea-github-proxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add parseJsonBody helper and update comment methods to parse json

This commit is contained in:
Derrick Hammer 2024-02-12 03:15:23 -05:00
parent 5345523eec
commit dc9a0acb8e
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
api/routes_rest_api.go
View File

@ -164,42 +164,43 @@ func (r restApi) handlerGetTree(w http.ResponseWriter, request *http.Request) {
r.respond(w, http.StatusOK, treeResponse) r.respond(w, http.StatusOK, treeResponse)
} }
func (r restApi) handlerCreateIssueComment(writer http.ResponseWriter, request *http.Request) { func (r restApi) handlerCreateIssueComment(w http.ResponseWriter, request *http.Request) {
vars := mux.Vars(request) vars := mux.Vars(request)
owner := vars["owner"] owner := vars["owner"]
repo := vars["repo"] repo := vars["repo"]
issueNumber := vars["issue_number"] issueNumber := vars["issue_number"]
client := r.getClientOrError(writer) client := r.getClientOrError(w)
if client == nil { if client == nil {
return return
} }
if err := request.ParseForm(); err != nil { ghComment := github.IssueComment{}
http.Error(writer, "Failed to parse form", http.StatusBadRequest)
r.logger.Error("Failed to parse form", zap.Error(err)) if err := r.parseJsonBody(request, &ghComment); err != nil {
return http.Error(w, "Failed to parse request body", http.StatusBadRequest)
r.logger.Error("Failed to parse request body", zap.Error(err))
} }
issueNumberInt, err := strconv.Atoi(issueNumber) issueNumberInt, err := strconv.Atoi(issueNumber)
if err != nil { if err != nil {
http.Error(writer, "Failed to parse issue number", http.StatusBadRequest) http.Error(w, "Failed to parse issue number", http.StatusBadRequest)
r.logger.Error("Failed to parse issue number", zap.Error(err)) r.logger.Error("Failed to parse issue number", zap.Error(err))
return return
} }
comment := gitea.CreateIssueCommentOption{ comment := gitea.CreateIssueCommentOption{
Body: request.FormValue("body"), Body: ghComment.GetBody(),
} }
commentResponse, _, err := client.CreateIssueComment(owner, repo, int64(issueNumberInt), comment) commentResponse, _, err := client.CreateIssueComment(owner, repo, int64(issueNumberInt), comment)
if err != nil { if err != nil {
http.Error(writer, "Failed to create comment", http.StatusInternalServerError) http.Error(w, "Failed to create comment", http.StatusInternalServerError)
r.logger.Error("Failed to create comment", zap.Error(err)) r.logger.Error("Failed to create comment", zap.Error(err))
return return
} }
r.respond(writer, http.StatusCreated, commentResponse) r.respond(w, http.StatusCreated, commentResponse)
} }
func (r restApi) handlerUpdateIssueComment(w http.ResponseWriter, request *http.Request) { func (r restApi) handlerUpdateIssueComment(w http.ResponseWriter, request *http.Request) {
@ -214,10 +215,11 @@ func (r restApi) handlerUpdateIssueComment(w http.ResponseWriter, request *http.
return return
} }
if err := request.ParseForm(); err != nil { ghComment := github.IssueComment{}
http.Error(w, "Failed to parse form", http.StatusBadRequest)
r.logger.Error("Failed to parse form", zap.Error(err)) if err := r.parseJsonBody(request, &ghComment); err != nil {
return http.Error(w, "Failed to parse request body", http.StatusBadRequest)
r.logger.Error("Failed to parse request body", zap.Error(err))
} }
commentIDInt, err := strconv.Atoi(commentID) commentIDInt, err := strconv.Atoi(commentID)
@ -241,6 +243,15 @@ func (r restApi) handlerUpdateIssueComment(w http.ResponseWriter, request *http.
r.respond(w, http.StatusOK, commentResponse) r.respond(w, http.StatusOK, commentResponse)
} }
func (r restApi) parseJsonBody(request *http.Request, obj interface{}) error {
if obj == nil {
obj = make(map[string]interface{})
}
decoder := json.NewDecoder(request.Body)
return decoder.Decode(obj)
}
func setupRestRoutes(params RouteParams) { func setupRestRoutes(params RouteParams) {
logger := params.Logger logger := params.Logger
cfg := params.Config cfg := params.Config