settel/knowyt
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

bugfix: fixed crash b/c state.json had empty UUID as key for a newly created user

Browse Source
This commit is contained in:
Settel 2022-04-03 14:37:57 +02:00
parent 8caf619c12
commit 8f87f331cc
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/application/savePlayer.go
View File

@ -44,11 +44,13 @@ func (app *Application) SavePlayer(usr *user.User, w http.ResponseWriter, r *htt
return return
} }
} else { } else {
if err := app.createUser(gm, name, authcode); err != nil { if newPlayerId, err := app.createUser(gm, name, authcode); err != nil {
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
fmt.Printf("%v\n", err) fmt.Printf("%v\n", err)
fmt.Fprintf(w, "server error") fmt.Fprintf(w, "server error")
return return
} else {
id = newPlayerId
} }
} }
@ -97,9 +99,11 @@ func (app *Application) modifyUser(id string, gm *game.Game, name, authcode stri
return nil return nil
} }
func (app *Application) createUser(gm *game.Game, name, authcode string) error { func (app *Application) createUser(gm *game.Game, name, authcode string) (string, error) {
if _, err := app.GetUserByAuthcode(authcode); err == nil { if authcode != "" {
return fmt.Errorf("%s authcode already in use", gm.GetId()) if _, err := app.GetUserByAuthcode(authcode); err == nil {
return "", fmt.Errorf("%s authcode already in use", gm.GetId())
}
} }
dirName := path.Join(app.config.DataDir, "users") dirName := path.Join(app.config.DataDir, "users")
@ -110,9 +114,9 @@ func (app *Application) createUser(gm *game.Game, name, authcode string) error {
newUser.SetName(name) newUser.SetName(name)
newUser.SetAuthcode(authcode) newUser.SetAuthcode(authcode)
if err := newUser.SaveUser(); err != nil { if err := newUser.SaveUser(); err != nil {
return err return "", err
} }
app.users[newUser.GetId()] = newUser app.users[newUser.GetId()] = newUser
gm.AddPlayer(newUser) gm.AddPlayer(newUser)
return nil return newUser.GetId(), nil
} }