Make sessions user like API user

kasbah · kasbah · commit cdb8b215b53b · 2020-08-24T15:33:46.000+01:00
diff --git a/routers/kitspace.go b/routers/kitspace.go
@@ -11,13 +11,14 @@ import (
 	"gitea.com/macaron/csrf"
 	"gitea.com/macaron/session"
 
-	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/structs"
 )
 
 type KitspaceSession struct {
-	User *models.User
+	User *structs.User
 	Csrf string
 }
 
@@ -33,7 +34,7 @@ func Kitspace(ctx *context.Context, sess session.Store, x csrf.CSRF) (int, []byt
 	)
 
 	m := KitspaceSession{
-		User: ctx.User,
+		User: convert.ToUser(ctx.User, ctx.IsSigned, ctx.User != nil),
 		Csrf: x.GetToken(),
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,14 @@ import (`
`11`	`11`	`"gitea.com/macaron/csrf"`
`12`	`12`	`"gitea.com/macaron/session"`
`13`	`13`
`14`		`- "code.gitea.io/gitea/models"`
`15`	`14`	`"code.gitea.io/gitea/modules/context"`
	`15`	`+ "code.gitea.io/gitea/modules/convert"`
`16`	`16`	`"code.gitea.io/gitea/modules/setting"`
	`17`	`+ "code.gitea.io/gitea/modules/structs"`
`17`	`18`	`)`
`18`	`19`
`19`	`20`	`type KitspaceSession struct {`
`20`		`- User *models.User`
	`21`	`+ User *structs.User`
`21`	`22`	`Csrf string`
`22`	`23`	`}`
`23`	`24`
`@@ -33,7 +34,7 @@ func Kitspace(ctx *context.Context, sess session.Store, x csrf.CSRF) (int, []byt`
`33`	`34`	`)`
`34`	`35`
`35`	`36`	`m := KitspaceSession{`
`36`		`- User: ctx.User,`
	`37`	`+ User: convert.ToUser(ctx.User, ctx.IsSigned, ctx.User != nil),`
`37`	`38`	`Csrf: x.GetToken(),`
`38`	`39`	`}`
`39`	`40`