switched from id for authentication to authcode

server/data/users/3e6eef0e-3dbd-4f60-9009-1be052408d0a.json

@@ -1,4 +1,5 @@
 {
+  "authcode": "646162",
   "name": "Settel",
   "role": "admin"
 }

server/data/users/426365af-d10b-4370-bde9-e953ed4fb81f.json

@@ -1,4 +1,5 @@
 {
+  "authcode": "123457",
   "name": "Player #2",
   "role": "player",
   "game": "067fb1b8-8303-4faa-95d2-1832770a791c"

server/data/users/7de2fcfa-6ac0-4ff6-8337-a224effc826d.json

@@ -1,4 +1,5 @@
 {
+  "authcode": "123123",
   "name": "Master",
   "role": "gamemaster",
   "game": "067fb1b8-8303-4faa-95d2-1832770a791c"

server/data/users/8241aab8-fcea-4cd0-8428-2f19556dfc13.json

@@ -1,4 +1,5 @@
 {
+  "authcode": "123458",
   "name": "Player #3",
   "role": "player",
   "game": "067fb1b8-8303-4faa-95d2-1832770a791c"

server/data/users/c2584135-a110-4780-95e5-ba089213ef50.json

@@ -1,4 +1,5 @@
 {
+  "authcode": "123456",
   "name": "Player #1",
   "role": "player",
   "game": "067fb1b8-8303-4faa-95d2-1832770a791c"

server/src/application/getUser.go

@@ -12,3 +12,12 @@ func (app Application) GetUserById(id string) (*user.User, error) {
 	}
 	return usr, nil
 }
+
+func (app Application) GetUserByAuthcode(authcode string) (*user.User, error) {
+	for _, usr := range app.users {
+		if usr.GetAuthCode() == authcode {
+			return usr, nil
+		}
+	}
+	return nil, fmt.Errorf("unknown id")
+}

server/src/application/syncHandler.go

@@ -15,7 +15,7 @@ func (app *Application) SyncHandler(usr *user.User, w http.ResponseWriter, r *ht
 		return
 	}
 
-	if usr.Game != gameRef && !usr.IsAdmin() {
+	if usr.GetGameId() != gameRef && !usr.IsAdmin() {
 		w.WriteHeader(http.StatusForbidden)
 		fmt.Fprintf(w, "forbidden")
 		return

server/src/handler/gameinfo.go

@@ -20,7 +20,7 @@ func (authMux *AuthMux) GetGameInfo(usr *user.User, w http.ResponseWriter, r *ht
 		return
 	}
 
-	if !usr.IsGamemaster() || (usr.Game != gameRef && !usr.IsAdmin()) {
+	if !usr.IsGamemaster() || (usr.GetGameId() != gameRef && !usr.IsAdmin()) {
 		w.WriteHeader(http.StatusForbidden)
 		fmt.Fprintf(w, "forbidden")
 		return

server/src/handler/login.go

@@ -31,7 +31,7 @@ func (authMux *AuthMux) Login(w http.ResponseWriter, r *http.Request) {
 	}
 
 	cookie := authMux.createCookie()
-	cookie.Value = usr.GetId()
+	cookie.Value = usr.GetId() + ":" + usr.GetAuthCode()
 	cookie.MaxAge = 0
 	http.SetCookie(w, cookie)
 	w.Header().Add("Content-Type", "text/plain")
@@ -47,7 +47,7 @@ func (authMux *AuthMux) checkCode(r *http.Request) (*user.User, error) {
 		return nil, fmt.Errorf("invalid code")
 	}
 
-	usr, err := authMux.app.GetUserById(code)
+	usr, err := authMux.app.GetUserByAuthcode(code)
 	if err != nil {
 		return nil, fmt.Errorf("invalid code")
 	}

server/src/handler/private.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"sirlab.de/go/knyt/user"
+	"strings"
 )
 
 func (authMux *AuthMux) PrivateHandleFunc(pattern string, handlerFunc PrivateHandlerFunc) {
@@ -30,10 +31,16 @@ func (authMux *AuthMux) getUserFromSession(r *http.Request) (*user.User, error)
 		return nil, fmt.Errorf("invalid cookie")
 	}
 
-	usr, usrErr := authMux.app.GetUserById(authCookie.Value)
+	vals := strings.SplitN(authCookie.Value, ":", 2)
+
+	usr, usrErr := authMux.app.GetUserById(vals[0])
 	if usrErr != nil {
 		return nil, fmt.Errorf("invalid cookie")
 	}
 
+	if usr.GetAuthCode() != vals[1] {
+		return nil, fmt.Errorf("invalid cookie")
+	}
+
 	return usr, nil
 }

server/src/handler/userinfo.go

@@ -7,17 +7,17 @@ import (
 	"sirlab.de/go/knyt/user"
 )
 
-type userLight struct {
+type UserInfoJson struct {
-	Name string `json:"name"`
+	Name   string `json:"name"`
-	Role string `json:"role"`
+	Role   string `json:"role"`
-	Game string `json:"game"`
+	GameId string `json:"game"`
 }
 
 func (authMux *AuthMux) GetUserInfo(usr *user.User, w http.ResponseWriter, r *http.Request) {
-	usrLight := userLight{
+	usrLight := UserInfoJson{
-		Name: usr.Name,
+		Name:   usr.GetName(),
-		Role: usr.Role,
+		Role:   usr.GetRole(),
-		Game: usr.Game,
+		GameId: usr.GetGameId(),
 	}
 
 	w.Header().Add("Content-Type", "application/json")

server/src/statement/struct.go

@@ -1,6 +1,11 @@
 package statement
 
 type Statement struct {
+	id        string `json:"id"`
+	statement string `json:"statement"`
+}
+
+type StatementJson struct {
 	Id        string `json:"id"`
 	Statement string `json:"statement"`
 }

server/src/syncdata/syncdata.go

@@ -1,5 +1,11 @@
 package syncdata
 
-type SyncData struct {
+type Gameinfo struct {
-	VersionRef int `json:"version"`
+	Players []string `json:"players"`
+}
+
+type SyncData struct {
+	VersionRef int       `json:"version"`
+	Players    []string  `json:"players"`
+	Gameinfo   *Gameinfo `json:"game"`
 }

server/src/user/struct.go

@@ -7,8 +7,22 @@ const (
 )
 
 type User struct {
-	id   string
+	id       string
-	Name string `json:"name"`
+	authcode string
-	Role string `json:"role"`
+	name     string
-	Game string `json:"game"`
+	role     string
+	gameId   string
+}
+
+type UserJson struct {
+	Authcode string `json:"authcode"`
+	Name     string `json:"name"`
+	Role     string `json:"role"`
+	GameId   string `json:"game"`
+}
+
+type UserinfoJson struct {
+	Name   string `json:"name"`
+	Role   string `json:"role"`
+	GameId string `json:"game"`
 }

server/src/user/user.go

@@ -4,28 +4,30 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path"
+	"strings"
 )
 
-func NewUser(id, name, role string) *User {
-	return &User{
-		id:   id,
-		Name: name,
-		Role: role,
-	}
-}
-
 func NewUserFromFile(id, fileName string) (*User, error) {
 	jsonBytes, err := os.ReadFile(fileName)
 	if err != nil {
 		return nil, err
 	}
 
-	var usr User
+	// var usr User
-	if err := json.Unmarshal(jsonBytes, &usr); err != nil {
+	var userJson UserJson
+	if err := json.Unmarshal(jsonBytes, &userJson); err != nil {
 		return nil, fmt.Errorf("%s: %v\n", fileName, err)
 	} else {
-		usr.id = id
+		_, fileNameShort := path.Split(fileName)
-		return &usr, nil
+		id := strings.TrimSuffix(fileNameShort, ".json")
+		return &User{
+			id:       id,
+			name:     userJson.Name,
+			role:     userJson.Role,
+			authcode: userJson.Authcode,
+			gameId:   userJson.GameId,
+		}, nil
 	}
 }
 
@@ -33,14 +35,30 @@ func (user *User) GetId() string {
 	return user.id
 }
 
+func (user *User) GetAuthCode() string {
+	return user.authcode
+}
+
+func (user *User) GetName() string {
+	return user.name
+}
+
+func (user *User) GetRole() string {
+	return user.role
+}
+
+func (user *User) GetGameId() string {
+	return user.gameId
+}
+
 func (user *User) IsPlayer() bool {
 	return true
 }
 
 func (user *User) IsGamemaster() bool {
-	return user.Role == ROLE_GAMEMASTER || user.Role == ROLE_ADMIN
+	return user.role == ROLE_GAMEMASTER || user.role == ROLE_ADMIN
 }
 
 func (user *User) IsAdmin() bool {
-	return user.Role == ROLE_ADMIN
+	return user.role == ROLE_ADMIN
 }