diff options
| -rw-r--r-- | .fswatch.json | 4 | ||||
| -rw-r--r-- | models/oauth2.go | 25 | ||||
| -rw-r--r-- | routers/user/social.go | 30 |
3 files changed, 33 insertions, 26 deletions
diff --git a/.fswatch.json b/.fswatch.json index 90a6e4eae7..4ef36ce478 100644 --- a/.fswatch.json +++ b/.fswatch.json @@ -2,12 +2,12 @@ "paths": ["."], "depth": 2, "exclude": [], - "include": ["\\.go$"], + "include": ["\\.go$", "\\.ini$"], "command": [ "bash", "-c", "go build && ./gogs web" ], "env": { "POWERED_BY": "github.com/shxsun/fswatch" }, - "enable-restart": true + "enable-restart": false } diff --git a/models/oauth2.go b/models/oauth2.go index a17d4e30fa..10771d6a73 100644 --- a/models/oauth2.go +++ b/models/oauth2.go @@ -1,6 +1,9 @@ package models -import "fmt" +import ( + "errors" + "fmt" +) // OT: Oauth2 Type const ( @@ -9,12 +12,18 @@ const ( OT_TWITTER ) +var ( + ErrOauth2RecordNotExists = errors.New("not exists oauth2 record") + ErrOauth2NotAssociatedWithUser = errors.New("not associated with user") +) + type Oauth2 struct { - Uid int64 `xorm:"pk"` // userId + Id int64 + Uid int64 `xorm:"pk"` // userId + User *User `xorm:"-"` Type int `xorm:"pk unique(oauth)"` // twitter,github,google... Identity string `xorm:"pk unique(oauth)"` // id.. Token string `xorm:"VARCHAR(200) not null"` - //RefreshTime time.Time `xorm:"created"` } func AddOauth2(oa *Oauth2) (err error) { @@ -24,8 +33,8 @@ func AddOauth2(oa *Oauth2) (err error) { return nil } -func GetOauth2User(identity string) (u *User, err error) { - oa := &Oauth2{} +func GetOauth2(identity string) (oa *Oauth2, err error) { + oa = &Oauth2{} oa.Identity = identity exists, err := orm.Get(oa) if err != nil { @@ -35,5 +44,9 @@ func GetOauth2User(identity string) (u *User, err error) { err = fmt.Errorf("not exists oauth2: %s", identity) return } - return GetUserById(oa.Uid) + if oa.Uid == 0 { + return oa, ErrOauth2NotAssociatedWithUser + } + oa.User, err = GetUserById(oa.Uid) + return } diff --git a/routers/user/social.go b/routers/user/social.go index 08cfcd83f2..b47a4c1cef 100644 --- a/routers/user/social.go +++ b/routers/user/social.go @@ -11,7 +11,6 @@ import ( "code.google.com/p/goauth2/oauth" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/oauth2" @@ -85,7 +84,6 @@ func SocialSignIn(ctx *middleware.Context, tokens oauth2.Tokens) { return } var err error - var u *models.User if err = gh.Update(); err != nil { // FIXME: handle error page log.Error("connect with github error: %s", err) @@ -93,20 +91,14 @@ func SocialSignIn(ctx *middleware.Context, tokens oauth2.Tokens) { } var soc SocialConnector = gh log.Info("login: %s", soc.Name()) - // FIXME: login here, user email to check auth, if not registe, then generate a uniq username - if u, err = models.GetOauth2User(soc.Identity()); err != nil { - u = &models.User{ - Name: soc.Name(), - Email: soc.Email(), - Passwd: "123456", - IsActive: !base.Service.RegisterEmailConfirm, - } - if u, err = models.RegisterUser(u); err != nil { - log.Error("register user: %v", err) - return - } - oa := &models.Oauth2{} - oa.Uid = u.Id + oa, err := models.GetOauth2(soc.Identity()) + switch err { + case nil: + ctx.Session.Set("userId", oa.User.Id) + ctx.Session.Set("userName", oa.User.Name) + case models.ErrOauth2RecordNotExists: + oa = &models.Oauth2{} + oa.Uid = 0 oa.Type = soc.Type() oa.Token = soc.Token() oa.Identity = soc.Identity() @@ -115,8 +107,10 @@ func SocialSignIn(ctx *middleware.Context, tokens oauth2.Tokens) { log.Error("add oauth2 %v", err) return } + case models.ErrOauth2NotAssociatedWithUser: + // pass } - ctx.Session.Set("userId", u.Id) - ctx.Session.Set("userName", u.Name) + ctx.Session.Set("socialId", oa.Id) + log.Info("socialId: %v", oa.Id) ctx.Redirect("/") } |