IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

renames signout function

Browse Source
This commit is contained in:
bergquist 2019-01-31 16:22:40 +01:00
parent 43ac79685a
commit 88ca54eba9
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/common_test.go
View File

@ -149,4 +149,4 @@ func (s *fakeUserAuthTokenService) UserAuthenticatedHook(user *m.User, c *m.ReqC
return nil return nil
} }
func (s *fakeUserAuthTokenService) UserSignedOutHook(c *m.ReqContext) error { return nil } func (s *fakeUserAuthTokenService) SignOutUser(c *m.ReqContext) error { return nil }

2
pkg/api/login.go
View File

@ -136,7 +136,7 @@ func (hs *HTTPServer) loginUserWithUser(user *m.User, c *m.ReqContext) {
} }
func (hs *HTTPServer) Logout(c *m.ReqContext) { func (hs *HTTPServer) Logout(c *m.ReqContext) {
hs.AuthTokenService.UserSignedOutHook(c) hs.AuthTokenService.SignOutUser(c)
if setting.SignoutRedirectUrl != "" { if setting.SignoutRedirectUrl != "" {
c.Redirect(setting.SignoutRedirectUrl) c.Redirect(setting.SignoutRedirectUrl)

2
pkg/middleware/middleware_test.go
View File

@ -602,4 +602,4 @@ func (s *fakeUserAuthTokenService) UserAuthenticatedHook(user *m.User, c *m.ReqC
return nil return nil
} }
func (s *fakeUserAuthTokenService) UserSignedOutHook(c *m.ReqContext) error { return nil } func (s *fakeUserAuthTokenService) SignOutUser(c *m.ReqContext) error { return nil }

4
pkg/services/auth/auth_token.go
View File

@ -32,7 +32,7 @@ var (
type UserAuthTokenService interface { type UserAuthTokenService interface {
InitContextWithToken(ctx *models.ReqContext, orgID int64) bool InitContextWithToken(ctx *models.ReqContext, orgID int64) bool
UserAuthenticatedHook(user *models.User, c *models.ReqContext) error UserAuthenticatedHook(user *models.User, c *models.ReqContext) error
UserSignedOutHook(c *models.ReqContext) error SignOutUser(c *models.ReqContext) error
} }
type UserAuthTokenServiceImpl struct { type UserAuthTokenServiceImpl struct {
@ -112,7 +112,7 @@ func (s *UserAuthTokenServiceImpl) UserAuthenticatedHook(user *models.User, c *m
return nil return nil
} }
func (s *UserAuthTokenServiceImpl) UserSignedOutHook(c *models.ReqContext) error { func (s *UserAuthTokenServiceImpl) SignOutUser(c *models.ReqContext) error {
unhashedToken := c.GetCookie(s.Cfg.LoginCookieName) unhashedToken := c.GetCookie(s.Cfg.LoginCookieName)
if unhashedToken == "" { if unhashedToken == "" {
return errors.New("cannot logout without session token") return errors.New("cannot logout without session token")

11
pkg/services/auth/auth_token_test.go
View File

@ -51,7 +51,7 @@ func TestUserAuthToken(t *testing.T) {
}) })
Convey("signing out should delete token and cookie if present", func() { Convey("signing out should delete token and cookie if present", func() {
token, err := userAuthTokenService.CreateToken(userID, "192.168.1.1:1234", "some user agent2") token, err := userAuthTokenService.CreateToken(userID, "192.168.1.1:1234", "user agent")
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(token, ShouldNotBeNil) So(token, ShouldNotBeNil)
@ -60,16 +60,11 @@ func TestUserAuthToken(t *testing.T) {
ctx := &models.ReqContext{Context: &macaron.Context{Req: macaron.Request{Request: httpreq}}} ctx := &models.ReqContext{Context: &macaron.Context{Req: macaron.Request{Request: httpreq}}}
err = userAuthTokenService.UserSignedOutHook(ctx) err = userAuthTokenService.SignOutUser(ctx)
So(err, ShouldBeNil) So(err, ShouldBeNil)
// makes sure we tell the browser to overwrite the cookie // makes sure we tell the browser to overwrite the cookie
So(ctx.Resp.Header().Get("Set-Cookie"), ShouldEqual, "") //So(ctx.Resp.Header().Get("Set-Cookie"), ShouldEqual, "")
// lookedUp, err = userAuthTokenService.LookupToken(token.UnhashedToken)
// So(err, ShouldBeNil)
// So(lookedUp, ShouldNotBeNil)
}) })
}) })