Weibo oauth

diff --git a/conf/app.ini b/conf/app.ini
index c70919961cdaf43b8850b2de9b81e529962c178b..90ed0b5bc1f8daf9e6745ca85fea50a2e41e376a 100644 (file)
--- 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 c2ee541776472ee2b606ad7e4515e3caae390b1a..5baa3c8d81be044a98604b6b46443f965006fc2f 100644 (file)
--- 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 109ddd35342bf35ab08c38ea3bc1e2172b8e24ce..68231391c07f1c0c84959d7f07ff77502e5bf35d 100644 (file)
--- 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}}