finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' of github.com:gogits/gogs into dev

Browse source
This commit is contained in:
Unknown 2014-04-12 16:19:16 -04:00
commit d60f7b85e5
6 changed files with 284 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

5
models/oauth2.go
View file

@ -13,6 +13,7 @@ const (
OT_GITHUB = iota + 1
OT_GOOGLE
OT_TWITTER
OT_QQ
)
var (
@ -26,7 +27,7 @@ type Oauth2 struct {
User *User `xorm:"-"`
Type int `xorm:"unique(s) unique(oauth)"` // twitter,github,google...
Identity string `xorm:"unique(s) unique(oauth)"` // id..
Token string `xorm:"VARCHAR(200) not null"`
Token string `xorm:"TEXT not null"`
}
func BindUserOauth2(userId, oauthId int64) error {
@ -48,7 +49,7 @@ func GetOauth2(identity string) (oa *Oauth2, err error) {
return
} else if !isExist {
return nil, ErrOauth2RecordNotExists
} else if oa.Uid == 0 {
} else if oa.Uid == -1 {
return oa, ErrOauth2NotAssociatedWithUser
}
oa.User, err = GetUserById(oa.Uid)