From 337eef2ee57707f055042db21b7b4159db0f0200 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 14 Apr 2014 06:29:47 -0400 Subject: [PATCH] Weibo oauth --- .gopmfile | 2 +- modules/social/social.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gopmfile b/.gopmfile index d7eeef0782..79f98e02bd 100644 --- a/.gopmfile +++ b/.gopmfile @@ -10,7 +10,6 @@ github.com/go-sql-driver/mysql = github.com/lib/pq = github.com/qiniu/log = github.com/robfig/cron = -code.google.com/p/goauth2 = github.com/Unknwon/com = github.com/Unknwon/cae = github.com/Unknwon/goconfig = @@ -20,6 +19,7 @@ github.com/gogits/git = github.com/gogits/gfm = github.com/gogits/cache = github.com/gogits/session = +github.com/gogits/oauth2 = [res] include = templates|public|conf diff --git a/modules/social/social.go b/modules/social/social.go index ac63b61582..a628bfe639 100644 --- a/modules/social/social.go +++ b/modules/social/social.go @@ -371,7 +371,6 @@ func (s *SocialWeibo) SetRedirectUrl(url string) { func (s *SocialWeibo) UserInfo(token *oauth.Token, _ *url.URL) (*BasicUserInfo, error) { transport := &oauth.Transport{Token: token} var data struct { - Id int64 `json:"id"` Name string `json:"name"` } var err error @@ -390,7 +389,7 @@ func (s *SocialWeibo) UserInfo(token *oauth.Token, _ *url.URL) (*BasicUserInfo, return nil, err } return &BasicUserInfo{ - Identity: base.StrTo(data.Id).String(), + Identity: token.Extra["id_token"], Name: data.Name, }, nil return nil, nil