games/factorio-server-manager
games/factorio-server-manager
1
0
Fork 0
mirror of https://github.com/OpenFactorioServerManager/factorio-server-manager.git synced 2025-01-06 03:54:06 +02:00
Code Issues Releases Activity

use new "ReadFromRequestBody" in modPortalHandler

Browse Source
This commit is contained in:
knoxfighter 2020-09-06 03:54:40 +02:00
parent d6d3ced37b
commit bae76f28a7
1 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/mod_portal_handler.go
View File

@ -1,7 +1,6 @@
package main
import (
"encoding/json"
"fmt"
"github.com/gorilla/mux"
"log"
@ -68,22 +67,14 @@ func ModPortalInstallHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json;charset=UTF-8")
body, err := ReadRequestBody(w, r, &resp)
if err != nil {
return
}
// Get Data out of the request
var data struct {
DownloadURL string `json:"link"`
Filename string `json:"filename"`
ModName string `json:"modName"`
}
err = json.Unmarshal(body, &data)
err = ReadFromRequestBody(w, r, &resp, &data)
if err != nil {
resp = fmt.Sprintf("Error reading data from request {%s}: %s", r.RequestURI, err)
log.Println(resp)
w.WriteHeader(http.StatusBadRequest)
return
}
@ -113,20 +104,12 @@ func ModPortalLoginHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json;charset=UTF-8")
body, err := ReadRequestBody(w, r, &resp)
if err != nil {
return
}
var data struct {
Username string `json:"username"`
Password string `json:"password"`
}
err = json.Unmarshal(body, &data)
err = ReadFromRequestBody(w, r, &resp, &data)
if err != nil {
resp = fmt.Sprintf("Error reading data from request {%s}: %s", r.RequestURI, err)
log.Println(resp)
w.WriteHeader(http.StatusBadRequest)
return
}
@ -195,20 +178,12 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json;charset=UTF-8")
body, err := ReadRequestBody(w, r, &resp)
if err != nil {
return
}
var data []struct {
Name string `json:"name"`
Version Version `json:"version"`
}
err = json.Unmarshal(body, &data)
err = ReadFromRequestBody(w, r, &resp, &data)
if err != nil {
resp = fmt.Sprintf("Error reading data from request {%s}: %s", r.RequestURI, err)
log.Println(resp)
w.WriteHeader(http.StatusBadRequest)
return
}