diff options
Diffstat (limited to 'routers/user/social.go')
| -rw-r--r-- | routers/user/social.go | 108 |
1 files changed, 50 insertions, 58 deletions
diff --git a/routers/user/social.go b/routers/user/social.go index 0bc1fa592f..5d2f2027c4 100644 --- a/routers/user/social.go +++ b/routers/user/social.go @@ -9,10 +9,12 @@ import ( "errors" "fmt" "net/url" - "strings" - "time" + // "strings" + // "time" - "github.com/gogits/gogs/models" + "github.com/macaron-contrib/oauth2" + + // "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/setting" @@ -29,79 +31,69 @@ func extractPath(next string) string { func SocialSignIn(ctx *middleware.Context) { if setting.OauthService == nil { - ctx.Handle(404, "social.SocialSignIn(oauth service not enabled)", nil) + ctx.Handle(404, "OAuth2 service not enabled", nil) return } - next := extractPath(ctx.Query("next")) - name := ctx.Params(":name") - connect, ok := social.SocialMap[name] - if !ok { - ctx.Handle(404, "social.SocialSignIn(social login not enabled)", errors.New(name)) + info := ctx.Session.Get(oauth2.KEY_TOKEN) + if info == nil { + ctx.Redirect(setting.AppSubUrl + "/user/login") return } - appUrl := strings.TrimSuffix(setting.AppUrl, "/") - if name == "weibo" { - appUrl = strings.Replace(appUrl, "localhost", "127.0.0.1", 1) - } - code := ctx.Query("code") - if code == "" { - // redirect to social login page - connect.SetRedirectUrl(appUrl + ctx.Req.URL.Path) - ctx.Redirect(connect.AuthCodeURL(next)) + name := ctx.Params(":name") + connect, ok := social.SocialMap[name] + if !ok { + ctx.Handle(404, "social login not enabled", errors.New(name)) return } - // handle call back - tk, err := connect.Exchange(code) - if err != nil { - ctx.Handle(500, "social.SocialSignIn(Exchange)", err) + tk := new(oauth2.Token) + if err := json.Unmarshal(info.([]byte), tk); err != nil { + ctx.Handle(500, "Unmarshal token", err) return } - next = extractPath(ctx.Query("state")) - log.Trace("social.SocialSignIn(Got token)") ui, err := connect.UserInfo(tk, ctx.Req.URL) if err != nil { - ctx.Handle(500, fmt.Sprintf("social.SocialSignIn(get info from %s)", name), err) + ctx.Handle(500, fmt.Sprintf("UserInfo(%s)", name), err) return } log.Info("social.SocialSignIn(social login): %s", ui) - oa, err := models.GetOauth2(ui.Identity) - switch err { - case nil: - ctx.Session.Set("uid", oa.User.Id) - ctx.Session.Set("uname", oa.User.Name) - case models.ErrOauth2RecordNotExist: - raw, _ := json.Marshal(tk) - oa = &models.Oauth2{ - Uid: -1, - Type: connect.Type(), - Identity: ui.Identity, - Token: string(raw), - } - log.Trace("social.SocialSignIn(oa): %v", oa) - if err = models.AddOauth2(oa); err != nil { - log.Error(4, "social.SocialSignIn(add oauth2): %v", err) // 501 - return - } - case models.ErrOauth2NotAssociated: - next = setting.AppSubUrl + "/user/sign_up" - default: - ctx.Handle(500, "social.SocialSignIn(GetOauth2)", err) - return - } + // oa, err := models.GetOauth2(ui.Identity) + // switch err { + // case nil: + // ctx.Session.Set("uid", oa.User.Id) + // ctx.Session.Set("uname", oa.User.Name) + // case models.ErrOauth2RecordNotExist: + // raw, _ := json.Marshal(tk) + // oa = &models.Oauth2{ + // Uid: -1, + // Type: connect.Type(), + // Identity: ui.Identity, + // Token: string(raw), + // } + // log.Trace("social.SocialSignIn(oa): %v", oa) + // if err = models.AddOauth2(oa); err != nil { + // log.Error(4, "social.SocialSignIn(add oauth2): %v", err) // 501 + // return + // } + // case models.ErrOauth2NotAssociated: + // next = setting.AppSubUrl + "/user/sign_up" + // default: + // ctx.Handle(500, "social.SocialSignIn(GetOauth2)", err) + // return + // } - oa.Updated = time.Now() - if err = models.UpdateOauth2(oa); err != nil { - log.Error(4, "UpdateOauth2: %v", err) - } + // oa.Updated = time.Now() + // if err = models.UpdateOauth2(oa); err != nil { + // log.Error(4, "UpdateOauth2: %v", err) + // } - ctx.Session.Set("socialId", oa.Id) - ctx.Session.Set("socialName", ui.Name) - ctx.Session.Set("socialEmail", ui.Email) - log.Trace("social.SocialSignIn(social ID): %v", oa.Id) - ctx.Redirect(next) + // ctx.Session.Set("socialId", oa.Id) + // ctx.Session.Set("socialName", ui.Name) + // ctx.Session.Set("socialEmail", ui.Email) + // log.Trace("social.SocialSignIn(social ID): %v", oa.Id) + // ctx.Redirect(next) } |