diff options
Diffstat (limited to 'modules/auth/sso/basic.go')
| -rw-r--r-- | modules/auth/sso/basic.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/modules/auth/sso/basic.go b/modules/auth/sso/basic.go index aab4eceebc..2db1147fc4 100644 --- a/modules/auth/sso/basic.go +++ b/modules/auth/sso/basic.go @@ -6,6 +6,7 @@ package sso import ( + "net/http" "strings" "code.gitea.io/gitea/models" @@ -13,9 +14,6 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" - - "gitea.com/macaron/macaron" - "gitea.com/macaron/session" ) // Ensure the struct implements the interface. @@ -49,8 +47,8 @@ func (b *Basic) IsEnabled() bool { // "Authorization" header of the request and returns the corresponding user object for that // name/token on successful validation. // Returns nil if header is empty or validation fails. -func (b *Basic) VerifyAuthData(ctx *macaron.Context, sess session.Store) *models.User { - baHead := ctx.Req.Header.Get("Authorization") +func (b *Basic) VerifyAuthData(req *http.Request, store DataStore, sess SessionStore) *models.User { + baHead := req.Header.Get("Authorization") if len(baHead) == 0 { return nil } @@ -75,7 +73,7 @@ func (b *Basic) VerifyAuthData(ctx *macaron.Context, sess session.Store) *models uid := CheckOAuthAccessToken(authToken) if uid != 0 { var err error - ctx.Data["IsApiToken"] = true + store.GetData()["IsApiToken"] = true u, err = models.GetUserByID(uid) if err != nil { @@ -108,7 +106,7 @@ func (b *Basic) VerifyAuthData(ctx *macaron.Context, sess session.Store) *models return nil } } else { - ctx.Data["IsApiToken"] = true + store.GetData()["IsApiToken"] = true } return u |