diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-04-14 05:07:19 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-04-14 05:07:19 -0400 |
| commit | 3c3cda7326f11b2bb8a2a57a3bc327285bf6b115 (patch) | |
| tree | 07d61773af91318adc1974c14695f216c2b0d9a3 | |
| parent | c3c2cfebaa5cf482f59a7c25972374cdc7a3fab4 (diff) | |
| download | gitea-3c3cda7326f11b2bb8a2a57a3bc327285bf6b115.tar.gz gitea-3c3cda7326f11b2bb8a2a57a3bc327285bf6b115.zip | |
Weibo oauth
| -rw-r--r-- | conf/app.ini | 12 | ||||
| -rw-r--r-- | modules/social/social.go | 8 | ||||
| -rw-r--r-- | templates/base/head.tmpl | 1 |
3 files changed, 14 insertions, 7 deletions
diff --git a/conf/app.ini b/conf/app.ini index c70919961c..90ed0b5bc1 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -98,16 +98,20 @@ ENABLED = false CLIENT_ID = CLIENT_SECRET = SCOPES = all -AUTH_URL = https://open.t.qq.com/cgi-bin/oauth2/authorize -TOKEN_URL = https://open.t.qq.com/cgi-bin/oauth2/access_token +AUTH_URL = https://graph.qq.com/oauth2.0/authorize +TOKEN_URL = https://graph.qq.com/oauth2.0/token [oauth.twitter] ENABLED = false CLIENT_ID = CLIENT_SECRET = SCOPES = all -AUTH_URL = https://api.twitter.com/oauth/authorize -TOKEN_URL = https://api.twitter.com/oauth/access_token +; Tencent weibo +AUTH_URL = https://open.t.qq.com/cgi-bin/oauth2/authorize +TOKEN_URL = https://open.t.qq.com/cgi-bin/oauth2/access_token +; QQ 互联 +; AUTH_URL = https://api.twitter.com/oauth/authorize +; TOKEN_URL = https://api.twitter.com/oauth/access_token [oauth.weibo] ENABLED = false diff --git a/modules/social/social.go b/modules/social/social.go index c2ee541776..5baa3c8d81 100644 --- a/modules/social/social.go +++ b/modules/social/social.go @@ -368,7 +368,7 @@ func (s *SocialWeibo) SetRedirectUrl(url string) { s.Transport.Config.RedirectURL = url } -func (s *SocialWeibo) UserInfo(token *oauth.Token, _ *url.URL) (*BasicUserInfo, error) { +func (s *SocialWeibo) UserInfo(token *oauth.Token, URL *url.URL) (*BasicUserInfo, error) { transport := &oauth.Transport{Token: token} var data struct { Id string `json:"id"` @@ -376,8 +376,12 @@ func (s *SocialWeibo) UserInfo(token *oauth.Token, _ *url.URL) (*BasicUserInfo, } var err error + var urls = url.Values{ + "access_token": {token.AccessToken}, + "uid": URL.Query()["uid"], + } reqUrl := "https://api.weibo.com/2/users/show.json" - r, err := transport.Client().Get(reqUrl) + r, err := transport.Client().Get(reqUrl + "?" + urls.Encode()) if err != nil { return nil, err } diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 109ddd3534..68231391c0 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -10,7 +10,6 @@ <meta name="keywords" content="go, git"> <meta name="_csrf" content="{{.CsrfToken}}" /> {{if .Repository.IsGoget}}<meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}">{{end}} - <meta property="qc:admins" content="34543312371436727" /> <!-- Stylesheets --> {{if IsProdMode}} |