From a5c62fc572e4870630090d19f6fad364de77a135 Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Mon, 18 May 2015 12:42:00 -0600 Subject: [PATCH] Drop settings in PostToken -- it isn't needed --- pkg/server/token.go | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/pkg/server/token.go b/pkg/server/token.go index 38629b5d..24b32f28 100644 --- a/pkg/server/token.go +++ b/pkg/server/token.go @@ -6,23 +6,15 @@ import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" - "github.com/drone/drone/pkg/server/session" common "github.com/drone/drone/pkg/types" ) // POST /api/user/tokens func PostToken(c *gin.Context) { - settings := ToSettings(c) + sess := ToSession(c) store := ToDatastore(c) user := ToUser(c) - // if a session secret is not defined there is no way to - // generate jwt user tokens, so we must throw an error - if settings.Session == nil || len(settings.Session.Secret) == 0 { - c.String(500, "User tokens are not configured") - return - } - in := &common.Token{} if !c.BindWith(in, binding.JSON) { return @@ -43,14 +35,6 @@ func PostToken(c *gin.Context) { return } - var sess session.Session - val, _ := c.Get("session") - if val != nil { - sess = val.(session.Session) - } else { - sess = session.New(settings.Session) - } - jwt, err := sess.GenerateToken(token) if err != nil { c.Fail(400, err)