diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-07-26 00:24:27 -0400 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-07-26 00:24:27 -0400 |
| commit | 8dd07c0ddd99ae626a1ec8c06f75f27fed51269f (patch) | |
| tree | 261d3c9911dabc58c1ac54e4e36b3dee24d2032b /routers/user/social.go | |
| parent | 0a739cf9ac901f54484c34bba8322418dedb09b0 (diff) | |
| download | gitea-8dd07c0ddd99ae626a1ec8c06f75f27fed51269f.tar.gz gitea-8dd07c0ddd99ae626a1ec8c06f75f27fed51269f.zip | |
New UI merge in progress
Diffstat (limited to 'routers/user/social.go')
| -rw-r--r-- | routers/user/social.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/routers/user/social.go b/routers/user/social.go index 9a56415fd4..ef83cd5b42 100644 --- a/routers/user/social.go +++ b/routers/user/social.go @@ -11,8 +11,6 @@ import ( "net/url" "strings" - "github.com/go-martini/martini" - "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" @@ -28,14 +26,14 @@ func extractPath(next string) string { return n.Path } -func SocialSignIn(ctx *middleware.Context, params martini.Params) { +func SocialSignIn(ctx *middleware.Context) { if setting.OauthService == nil { ctx.Handle(404, "social.SocialSignIn(oauth service not enabled)", nil) return } next := extractPath(ctx.Query("next")) - name := params["name"] + name := ctx.Params(":name") connect, ok := social.SocialMap[name] if !ok { ctx.Handle(404, "social.SocialSignIn(social login not enabled)", errors.New(name)) @@ -81,7 +79,7 @@ func SocialSignIn(ctx *middleware.Context, params martini.Params) { } log.Trace("social.SocialSignIn(oa): %v", oa) if err = models.AddOauth2(oa); err != nil { - log.Error("social.SocialSignIn(add oauth2): %v", err) // 501 + log.Error(4, "social.SocialSignIn(add oauth2): %v", err) // 501 return } case models.ErrOauth2NotAssociated: |