chore: avoid aliasing models in middleware (#22484)

This commit is contained in:
Carl Bergquist authored and GitHub committed 2020-02-28 12:50:58 +01:00
1 parent 8b9b67f248
commit f2f2722bb1
15 files changed
+74 -74

No files matched your search

+4 -5
View File
@@ -3,12 +3,11 @@ package middleware
import (
"time"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/rendering"
m "github.com/grafana/grafana/pkg/models"
)
func initContextWithRenderAuth(ctx *m.ReqContext, renderService rendering.Service) bool {
func initContextWithRenderAuth(ctx *models.ReqContext, renderService rendering.Service) bool {
key := ctx.GetCookie("renderKey")
if key == "" {
return false
@@ -21,10 +20,10 @@ func initContextWithRenderAuth(ctx *m.ReqContext, renderService rendering.Servic
}
ctx.IsSignedIn = true
ctx.SignedInUser = &m.SignedInUser{
ctx.SignedInUser = &models.SignedInUser{
OrgId: renderUser.OrgID,
UserId: renderUser.UserID,
OrgRole: m.RoleType(renderUser.OrgRole),
OrgRole: models.RoleType(renderUser.OrgRole),
}
ctx.IsRenderCall = true
ctx.LastSeenAt = time.Now()