diff --git a/engine/players.go b/engine/players.go index 132c602e8..d560d4188 100644 --- a/engine/players.go +++ b/engine/players.go @@ -38,7 +38,7 @@ func (p *players) Register(ctx context.Context, id, client, typ, ip string) (*mo if err != nil || id == "" { plr, err = p.ds.Player(ctx).FindByName(client, userName) if err == nil { - log.Debug("Found player by name", "id", plr.ID, "client", client, "userName", userName) + log.Debug("Found player by name", "id", plr.ID, "client", client, "username", userName) } else { r, _ := uuid.NewRandom() plr = &model.Player{ @@ -47,7 +47,7 @@ func (p *players) Register(ctx context.Context, id, client, typ, ip string) (*mo UserName: userName, Client: client, } - log.Info("Registering new player", "id", plr.ID, "client", client, "userName", userName) + log.Info("Registering new player", "id", plr.ID, "client", client, "username", userName) } } plr.LastSeen = time.Now() diff --git a/model/request/request.go b/model/request/request.go index 16b3a9333..a1a19e8d3 100644 --- a/model/request/request.go +++ b/model/request/request.go @@ -2,6 +2,7 @@ package request import ( "context" + "strings" "github.com/deluan/navidrome/model" ) @@ -22,7 +23,7 @@ func WithUser(ctx context.Context, u model.User) context.Context { } func WithUsername(ctx context.Context, username string) context.Context { - return context.WithValue(ctx, Username, username) + return context.WithValue(ctx, Username, strings.ToLower(username)) } func WithClient(ctx context.Context, client string) context.Context { diff --git a/server/subsonic/middlewares.go b/server/subsonic/middlewares.go index cb9ae2562..5db52c168 100644 --- a/server/subsonic/middlewares.go +++ b/server/subsonic/middlewares.go @@ -105,7 +105,7 @@ func getPlayer(players engine.Players) func(next http.Handler) http.Handler { ip, _, _ := net.SplitHostPort(r.RemoteAddr) player, trc, err := players.Register(ctx, playerId, client, r.Header.Get("user-agent"), ip) if err != nil { - log.Error("Could not register player", "userName", userName, "client", client) + log.Error("Could not register player", "username", userName, "client", client) } else { ctx = request.WithPlayer(ctx, *player) if trc != nil {