darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #995 from Bugagazavr/gitlab-tokens-fix

Browse source 
Fix token problems at first login
This commit is contained in:
Brad Rydzewski 2015-04-28 17:19:51 -07:00
commit 758910cbca
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugin/remote/gitlab/gitlab.go
View file

@ -268,7 +268,8 @@ func (r *Gitlab) OpenRegistration() bool {
func (r *Gitlab) GetToken(user *model.User) (*model.Token, error) { func (r *Gitlab) GetToken(user *model.User) (*model.Token, error) {
expiry := time.Unix(user.TokenExpiry, 0) expiry := time.Unix(user.TokenExpiry, 0)
if user.TokenExpiry == 0 || expiry.Sub(time.Now()) > (60*time.Second) { if user.TokenExpiry == 0 && len(user.Access) != 0 ||
expiry.Sub(time.Now()) > (60*time.Second) {
return nil, nil return nil, nil
} }