some finishing touches on the bitbucket implementation for 0.4

This commit is contained in:
Brad Rydzewski
2015-10-04 17:40:27 -07:00
parent 1c87bd9c3b
commit 528fbb0f2c
9 changed files with 421 additions and 142 deletions

View File

@@ -0,0 +1,55 @@
package refresh
import (
"time"
"github.com/drone/drone/model"
"github.com/drone/drone/remote"
"github.com/drone/drone/router/middleware/context"
"github.com/drone/drone/router/middleware/session"
log "github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin"
)
func Refresh(c *gin.Context) {
user := session.User(c)
if user == nil || user.Expiry == 0 {
c.Next()
return
}
db := context.Database(c)
remote_ := context.Remote(c)
// check if the remote includes the ability to
// refresh the user token.
refresher, ok := remote_.(remote.Refresher)
if !ok {
c.Next()
return
}
// check to see if the user token is expired or
// will expire within the next 30 minutes (1800 seconds).
// If not, there is nothing we really need to do here.
if time.Now().UTC().Unix() > (user.Expiry - 1800) {
c.Next()
return
}
// attempts to refresh the access token. If the
// token is refreshed, we must also persist to the
// database.
ok, _ = refresher.Refresh(user)
if ok {
err := model.UpdateUser(db, user)
if err != nil {
// we only log the error at this time. not sure
// if we really want to fail the request, do we?
log.Errorf("cannot refresh access token for %s. %s", user.Login, err)
}
}
c.Next()
}

View File

@@ -8,6 +8,7 @@ import (
"github.com/drone/drone/controller"
"github.com/drone/drone/router/middleware/header"
"github.com/drone/drone/router/middleware/refresh"
"github.com/drone/drone/router/middleware/session"
"github.com/drone/drone/static"
"github.com/drone/drone/template"
@@ -21,6 +22,7 @@ func Load(middleware ...gin.HandlerFunc) http.Handler {
e.Use(header.SetHeaders())
e.Use(middleware...)
e.Use(session.SetUser())
e.Use(refresh.Refresh)
e.GET("/", controller.ShowIndex)
e.GET("/login", controller.ShowLogin)