mirror/rogueserver
1
0
Fork 0
mirror of https://github.com/pagefaultgames/rogueserver.git synced 2025-04-03 19:47:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up clientSessionId checks

Browse Source
This commit is contained in:
maru 2024-06-02 18:23:51 -04:00
parent 3269e30a25
commit 68caa148f6
No known key found for this signature in database
GPG Key ID: 37689350E9CD0F0D
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/endpoints.go
View File

@ -162,14 +162,12 @@ func handleGetSessionData(w http.ResponseWriter, r *http.Request) {
} }
} }
var clientSessionId string if !r.URL.Query().Has("clientSessionId") {
if r.URL.Query().Has("clientSessionId") {
clientSessionId = r.URL.Query().Get("clientSessionId")
} else {
httpError(w, r, fmt.Errorf("missing clientSessionId"), http.StatusBadRequest) httpError(w, r, fmt.Errorf("missing clientSessionId"), http.StatusBadRequest)
return
} }
err = db.UpdateActiveSession(uuid, clientSessionId) err = db.UpdateActiveSession(uuid, r.URL.Query().Get("clientSessionId"))
if err != nil { if err != nil {
httpError(w, r, fmt.Errorf("failed to update active session: %s", err), http.StatusBadRequest) httpError(w, r, fmt.Errorf("failed to update active session: %s", err), http.StatusBadRequest)
return return
@ -434,10 +432,7 @@ func legacyHandleSaveData(w http.ResponseWriter, r *http.Request) {
} }
} }
var clientSessionId string clientSessionId := r.URL.Query().Get("clientSessionId")
if r.URL.Query().Has("clientSessionId") {
clientSessionId = r.URL.Query().Get("clientSessionId")
}
if clientSessionId == "" { if clientSessionId == "" {
clientSessionId = legacyClientSessionId clientSessionId = legacyClientSessionId
} }
@ -709,14 +704,12 @@ func handleGetSystemData(w http.ResponseWriter, r *http.Request) {
return return
} }
var clientSessionId string if !r.URL.Query().Has("clientSessionId") {
if r.URL.Query().Has("clientSessionId") {
clientSessionId = r.URL.Query().Get("clientSessionId")
} else {
httpError(w, r, fmt.Errorf("missing clientSessionId"), http.StatusBadRequest) httpError(w, r, fmt.Errorf("missing clientSessionId"), http.StatusBadRequest)
return
} }
err = db.UpdateActiveSession(uuid, clientSessionId) err = db.UpdateActiveSession(uuid, r.URL.Query().Get("clientSessionId"))
if err != nil { if err != nil {
httpError(w, r, fmt.Errorf("failed to update active session: %s", err), http.StatusBadRequest) httpError(w, r, fmt.Errorf("failed to update active session: %s", err), http.StatusBadRequest)
return return