Fix staticcheck's SA1029

2020-05-13 16:49:55 -04:00
parent 5ce3135f00
commit f8362a4acb
19 changed files with 152 additions and 57 deletions
@@ -7,6 +7,7 @@ import (

 	"github.com/deluan/navidrome/consts"
 	"github.com/deluan/navidrome/model"
+	"github.com/deluan/navidrome/model/request"
 )

 type Entry struct {
@@ -159,10 +160,9 @@ func FromArtists(ars model.Artists) Entries {
 }

 func userName(ctx context.Context) string {
-	user := ctx.Value("user")
-	if user == nil {
+	if user, ok := request.UserFrom(ctx); !ok {
 		return "UNKNOWN"
+	} else {
+		return user.UserName
 	}
-	usr := user.(model.User)
-	return usr.UserName
 }