drop oauth2 feature support

.gopmfile

@@ -20,7 +20,6 @@ github.com/macaron-contrib/cache = commit:a139ea1eee
 github.com/macaron-contrib/captcha = commit:9a0a0b1468
 github.com/macaron-contrib/csrf = commit:98ddf5a710
 github.com/macaron-contrib/i18n = commit:da2b19e90b
-github.com/macaron-contrib/oauth2 = commit:1adb5ce072
 github.com/macaron-contrib/session = commit:e48134e803
 github.com/macaron-contrib/toolbox = commit:acbfe36e16
 github.com/mattn/go-sqlite3 = commit:897b8800a7

cmd/web.go

@@ -23,7 +23,6 @@ import (
 	"github.com/macaron-contrib/captcha"
 	"github.com/macaron-contrib/csrf"
 	"github.com/macaron-contrib/i18n"
-	"github.com/macaron-contrib/oauth2"
 	"github.com/macaron-contrib/session"
 	"github.com/macaron-contrib/toolbox"
 	"github.com/mcuadros/go-version"
@@ -167,13 +166,6 @@ func newMacaron() *macaron.Macaron {
 			},
 		},
 	}))
-
-	// OAuth 2.
-	if setting.OauthService != nil {
-		for _, info := range setting.OauthService.OauthInfos {
-			m.Use(oauth2.NewOAuth2Provider(info.Options, info.AuthUrl, info.TokenUrl))
-		}
-	}
 	m.Use(middleware.Contexter())
 	return m
 }
@@ -256,7 +248,6 @@ func runWeb(ctx *cli.Context) {
 	m.Group("/user", func() {
 		m.Get("/login", user.SignIn)
 		m.Post("/login", bindIgnErr(auth.SignInForm{}), user.SignInPost)
-		m.Get("/info/:name", user.SocialSignIn)
 		m.Get("/sign_up", user.SignUp)
 		m.Post("/sign_up", bindIgnErr(auth.RegisterForm{}), user.SignUpPost)
 		m.Get("/reset_password", user.ResetPasswd)
@@ -275,14 +266,12 @@ func runWeb(ctx *cli.Context) {
 		m.Combo("/ssh").Get(user.SettingsSSHKeys).
 			Post(bindIgnErr(auth.AddSSHKeyForm{}), user.SettingsSSHKeysPost)
 		m.Post("/ssh/delete", user.DeleteSSHKey)
-		m.Get("/social", user.SettingsSocial)
 		m.Combo("/applications").Get(user.SettingsApplications).
 			Post(bindIgnErr(auth.NewAccessTokenForm{}), user.SettingsApplicationsPost)
 		m.Post("/applications/delete", user.SettingsDeleteApplication)
 		m.Route("/delete", "GET,POST", user.SettingsDelete)
 	}, reqSignIn, func(ctx *middleware.Context) {
 		ctx.Data["PageIsUserSettings"] = true
-		ctx.Data["HasOAuthService"] = setting.OauthService != nil
 	})
 
 	m.Group("/user", func() {

conf/app.ini

@@ -139,44 +139,6 @@ FROM =
 USER =
 PASSWD =
 
-[oauth]
-ENABLED = false
-
-[oauth.github]
-ENABLED = false
-CLIENT_ID =
-CLIENT_SECRET =
-SCOPES = https://api.github.com/user
-AUTH_URL = https://github.com/login/oauth/authorize
-TOKEN_URL = https://github.com/login/oauth/access_token
-
-; Get client id and secret from
-; https://console.developers.google.com/project
-[oauth.google]
-ENABLED = false
-CLIENT_ID =
-CLIENT_SECRET =
-SCOPES = https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile
-AUTH_URL = https://accounts.google.com/o/oauth2/auth
-TOKEN_URL = https://accounts.google.com/o/oauth2/token
-
-[oauth.qq]
-ENABLED = false
-CLIENT_ID =
-CLIENT_SECRET =
-SCOPES = get_user_info
-; QQ 互联
-AUTH_URL = https://graph.qq.com/oauth2.0/authorize
-TOKEN_URL = https://graph.qq.com/oauth2.0/token
-
-[oauth.weibo]
-ENABLED = false
-CLIENT_ID =
-CLIENT_SECRET =
-SCOPES = all
-AUTH_URL = https://api.weibo.com/oauth2/authorize
-TOKEN_URL = https://api.weibo.com/oauth2/access_token
-
 [cache]
 ; Either "memory", "redis", or "memcache", default is "memory"
 ADAPTER = memory

conf/locale/locale_en-US.ini

@@ -5,7 +5,6 @@ dashboard = Dashboard
 explore = Explore
 help = Help
 sign_in = Sign In
-social_sign_in = Social Sign In: 2nd Step <small>associate account</small>
 sign_out = Sign Out
 sign_up = Sign Up
 register = Register

models/models.go

@@ -78,7 +78,7 @@ var (
 
 func init() {
 	tables = append(tables,
-		new(User), new(PublicKey), new(Oauth2), new(AccessToken),
+		new(User), new(PublicKey), new(AccessToken),
 		new(Repository), new(DeployKey), new(Collaboration), new(Access),
 		new(Watch), new(Star), new(Follow), new(Action),
 		new(Issue), new(PullRequest), new(Comment), new(Attachment), new(IssueUser),
@@ -236,7 +236,7 @@ func GetStatistic() (stats Statistic) {
 	stats.Counter.Access, _ = x.Count(new(Access))
 	stats.Counter.Issue, _ = x.Count(new(Issue))
 	stats.Counter.Comment, _ = x.Count(new(Comment))
-	stats.Counter.Oauth, _ = x.Count(new(Oauth2))
+	stats.Counter.Oauth = 0
 	stats.Counter.Follow, _ = x.Count(new(Follow))
 	stats.Counter.Mirror, _ = x.Count(new(Mirror))
 	stats.Counter.Release, _ = x.Count(new(Release))

models/oauth2.go

@@ -1,106 +0,0 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package models
-
-import (
-	"errors"
-	"time"
-)
-
-type OauthType int
-
-const (
-	GITHUB OauthType = iota + 1
-	GOOGLE
-	TWITTER
-	QQ
-	WEIBO
-	BITBUCKET
-	FACEBOOK
-)
-
-var (
-	ErrOauth2RecordNotExist = errors.New("OAuth2 record does not exist")
-	ErrOauth2NotAssociated  = errors.New("OAuth2 is not associated with user")
-)
-
-type Oauth2 struct {
-	Id                int64
-	Uid               int64     `xorm:"unique(s)"` // userId
-	User              *User     `xorm:"-"`
-	Type              int       `xorm:"unique(s) unique(oauth)"` // twitter,github,google...
-	Identity          string    `xorm:"unique(s) unique(oauth)"` // id..
-	Token             string    `xorm:"TEXT not null"`
-	Created           time.Time `xorm:"CREATED"`
-	Updated           time.Time
-	HasRecentActivity bool `xorm:"-"`
-}
-
-func BindUserOauth2(userId, oauthId int64) error {
-	_, err := x.Id(oauthId).Update(&Oauth2{Uid: userId})
-	return err
-}
-
-func AddOauth2(oa *Oauth2) error {
-	_, err := x.Insert(oa)
-	return err
-}
-
-func GetOauth2(identity string) (oa *Oauth2, err error) {
-	oa = &Oauth2{Identity: identity}
-	isExist, err := x.Get(oa)
-	if err != nil {
-		return
-	} else if !isExist {
-		return nil, ErrOauth2RecordNotExist
-	} else if oa.Uid == -1 {
-		return oa, ErrOauth2NotAssociated
-	}
-	oa.User, err = GetUserByID(oa.Uid)
-	return oa, err
-}
-
-func GetOauth2ById(id int64) (oa *Oauth2, err error) {
-	oa = new(Oauth2)
-	has, err := x.Id(id).Get(oa)
-	if err != nil {
-		return nil, err
-	} else if !has {
-		return nil, ErrOauth2RecordNotExist
-	}
-	return oa, nil
-}
-
-// UpdateOauth2 updates given OAuth2.
-func UpdateOauth2(oa *Oauth2) error {
-	_, err := x.Id(oa.Id).AllCols().Update(oa)
-	return err
-}
-
-// GetOauthByUserId returns list of oauthes that are related to given user.
-func GetOauthByUserId(uid int64) ([]*Oauth2, error) {
-	socials := make([]*Oauth2, 0, 5)
-	err := x.Find(&socials, Oauth2{Uid: uid})
-	if err != nil {
-		return nil, err
-	}
-
-	for _, social := range socials {
-		social.HasRecentActivity = social.Updated.Add(7 * 24 * time.Hour).After(time.Now())
-	}
-	return socials, err
-}
-
-// DeleteOauth2ById deletes a oauth2 by ID.
-func DeleteOauth2ById(id int64) error {
-	_, err := x.Delete(&Oauth2{Id: id})
-	return err
-}
-
-// CleanUnbindOauth deletes all unbind OAuthes.
-func CleanUnbindOauth() error {
-	_, err := x.Delete(&Oauth2{Uid: -1})
-	return err
-}

models/user.go

@@ -630,7 +630,6 @@ func deleteUser(e *xorm.Session, u *User) error {
 	// ***** END: Follow *****
 
 	if err = deleteBeans(e,
-		&Oauth2{Uid: u.Id},
 		&AccessToken{UID: u.Id},
 		&Collaboration{UserID: u.Id},
 		&Access{UserID: u.Id},

modules/setting/setting.go

@@ -571,7 +571,6 @@ type Oauther struct {
 
 var (
 	MailService *Mailer
-	OauthService *Oauther
 )
 
 func newMailService() {

modules/social/social.go

@@ -1,333 +0,0 @@
-// Copyright 2014 Google Inc. All Rights Reserved.
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package social
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"strconv"
-
-	"github.com/macaron-contrib/oauth2"
-
-	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/log"
-	"github.com/gogits/gogs/modules/setting"
-)
-
-type BasicUserInfo struct {
-	Identity string
-	Name     string
-	Email    string
-}
-
-type SocialConnector interface {
-	Type() int
-	UserInfo(*oauth2.Token, *url.URL) (*BasicUserInfo, error)
-}
-
-var (
-	SocialMap = make(map[string]SocialConnector)
-)
-
-func NewOauthService() {
-	if !setting.Cfg.Section("oauth").Key("ENABLED").MustBool() {
-		return
-	}
-
-	oauth2.AppSubUrl = setting.AppSubUrl
-
-	setting.OauthService = &setting.Oauther{}
-	setting.OauthService.OauthInfos = make(map[string]*setting.OauthInfo)
-
-	socialConfigs := make(map[string]*oauth2.Options)
-	allOauthes := []string{"github", "google", "qq", "twitter", "weibo"}
-	// Load all OAuth config data.
-	for _, name := range allOauthes {
-		sec := setting.Cfg.Section("oauth." + name)
-		if !sec.Key("ENABLED").MustBool() {
-			continue
-		}
-		setting.OauthService.OauthInfos[name] = &setting.OauthInfo{
-			Options: oauth2.Options{
-				ClientID:     sec.Key("CLIENT_ID").String(),
-				ClientSecret: sec.Key("CLIENT_SECRET").String(),
-				Scopes:       sec.Key("SCOPES").Strings(" "),
-				PathLogin:    "/user/login/oauth2/" + name,
-				PathCallback: setting.AppSubUrl + "/user/login/" + name,
-				RedirectURL:  setting.AppUrl + "user/login/" + name,
-			},
-			AuthUrl:  sec.Key("AUTH_URL").String(),
-			TokenUrl: sec.Key("TOKEN_URL").String(),
-		}
-		socialConfigs[name] = &oauth2.Options{
-			ClientID:     setting.OauthService.OauthInfos[name].ClientID,
-			ClientSecret: setting.OauthService.OauthInfos[name].ClientSecret,
-			Scopes:       setting.OauthService.OauthInfos[name].Scopes,
-		}
-	}
-	enabledOauths := make([]string, 0, 10)
-
-	// GitHub.
-	if setting.Cfg.Section("oauth.github").Key("ENABLED").MustBool() {
-		setting.OauthService.GitHub = true
-		newGitHubOauth(socialConfigs["github"])
-		enabledOauths = append(enabledOauths, "GitHub")
-	}
-
-	// Google.
-	if setting.Cfg.Section("oauth.google").Key("ENABLED").MustBool() {
-		setting.OauthService.Google = true
-		newGoogleOauth(socialConfigs["google"])
-		enabledOauths = append(enabledOauths, "Google")
-	}
-
-	// QQ.
-	if setting.Cfg.Section("oauth.qq").Key("ENABLED").MustBool() {
-		setting.OauthService.Tencent = true
-		newTencentOauth(socialConfigs["qq"])
-		enabledOauths = append(enabledOauths, "QQ")
-	}
-
-	// Twitter.
-	// if setting.Cfg.Section("oauth.twitter").Key( "ENABLED").MustBool() {
-	// 	setting.OauthService.Twitter = true
-	// 	newTwitterOauth(socialConfigs["twitter"])
-	// 	enabledOauths = append(enabledOauths, "Twitter")
-	// }
-
-	// Weibo.
-	if setting.Cfg.Section("oauth.weibo").Key("ENABLED").MustBool() {
-		setting.OauthService.Weibo = true
-		newWeiboOauth(socialConfigs["weibo"])
-		enabledOauths = append(enabledOauths, "Weibo")
-	}
-
-	log.Info("Oauth Service Enabled %s", enabledOauths)
-}
-
-//   ________.__  __     ___ ___      ___.
-//  /  _____/|__|/  |_  /   |   \ __ _\_ |__
-// /   \  ___|  \   __\/    ~    \  |  \ __ \
-// \    \_\  \  ||  |  \    Y    /  |  / \_\ \
-//  \______  /__||__|   \___|_  /|____/|___  /
-//         \/                 \/           \/
-
-type SocialGithub struct {
-	opts *oauth2.Options
-}
-
-func newGitHubOauth(opts *oauth2.Options) {
-	SocialMap["github"] = &SocialGithub{opts}
-}
-
-func (s *SocialGithub) Type() int {
-	return int(models.GITHUB)
-}
-
-func (s *SocialGithub) UserInfo(token *oauth2.Token, _ *url.URL) (*BasicUserInfo, error) {
-	transport := s.opts.NewTransportFromToken(token)
-	var data struct {
-		Id    int    `json:"id"`
-		Name  string `json:"login"`
-		Email string `json:"email"`
-	}
-	r, err := transport.Client().Get("https://api.github.com/user")
-	if err != nil {
-		return nil, err
-	}
-	defer r.Body.Close()
-	if err = json.NewDecoder(r.Body).Decode(&data); err != nil {
-		return nil, err
-	}
-	return &BasicUserInfo{
-		Identity: strconv.Itoa(data.Id),
-		Name:     data.Name,
-		Email:    data.Email,
-	}, nil
-}
-
-//   ________                     .__
-//  /  _____/  ____   ____   ____ |  |   ____
-// /   \  ___ /  _ \ /  _ \ / ___\|  | _/ __ \
-// \    \_\  (  <_> |  <_> ) /_/  >  |_\  ___/
-//  \______  /\____/ \____/\___  /|____/\___  >
-//         \/             /_____/           \/
-
-type SocialGoogle struct {
-	opts *oauth2.Options
-}
-
-func (s *SocialGoogle) Type() int {
-	return int(models.GOOGLE)
-}
-
-func newGoogleOauth(opts *oauth2.Options) {
-	SocialMap["google"] = &SocialGoogle{opts}
-}
-
-func (s *SocialGoogle) UserInfo(token *oauth2.Token, _ *url.URL) (*BasicUserInfo, error) {
-	transport := s.opts.NewTransportFromToken(token)
-	var data struct {
-		Id    string `json:"id"`
-		Name  string `json:"name"`
-		Email string `json:"email"`
-	}
-	r, err := transport.Client().Get("https://www.googleapis.com/userinfo/v2/me")
-	if err != nil {
-		return nil, err
-	}
-	defer r.Body.Close()
-	if err = json.NewDecoder(r.Body).Decode(&data); err != nil {
-		return nil, err
-	}
-	return &BasicUserInfo{
-		Identity: data.Id,
-		Name:     data.Name,
-		Email:    data.Email,
-	}, nil
-}
-
-// ________   ________
-// \_____  \  \_____  \
-//  /  / \  \  /  / \  \
-// /   \_/.  \/   \_/.  \
-// \_____\ \_/\_____\ \_/
-//        \__>       \__>
-
-type SocialTencent struct {
-	opts *oauth2.Options
-}
-
-func newTencentOauth(opts *oauth2.Options) {
-	SocialMap["qq"] = &SocialTencent{opts}
-}
-
-func (s *SocialTencent) Type() int {
-	return int(models.QQ)
-}
-
-func (s *SocialTencent) UserInfo(token *oauth2.Token, URL *url.URL) (*BasicUserInfo, error) {
-	r, err := http.Get("https://graph.z.qq.com/moc2/me?access_token=" + url.QueryEscape(token.AccessToken))
-	if err != nil {
-		return nil, err
-	}
-	defer r.Body.Close()
-
-	body, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, err
-	}
-	vals, err := url.ParseQuery(string(body))
-	if err != nil {
-		return nil, err
-	}
-
-	return &BasicUserInfo{
-		Identity: vals.Get("openid"),
-	}, nil
-}
-
-// ___________       .__  __    __
-// \__    ___/_  _  _|__|/  |__/  |_  ___________
-//   |    |  \ \/ \/ /  \   __\   __\/ __ \_  __ \
-//   |    |   \     /|  ||  |  |  | \  ___/|  | \/
-//   |____|    \/\_/ |__||__|  |__|  \___  >__|
-//                                       \/
-
-// type SocialTwitter struct {
-// 	Token *oauth2.Token
-// 	*oauth2.Transport
-// }
-
-// func (s *SocialTwitter) Type() int {
-// 	return int(models.TWITTER)
-// }
-
-// func newTwitterOauth(config *oauth2.Config) {
-// 	SocialMap["twitter"] = &SocialTwitter{
-// 		Transport: &oauth.Transport{
-// 			Config:    config,
-// 			Transport: http.DefaultTransport,
-// 		},
-// 	}
-// }
-
-// func (s *SocialTwitter) SetRedirectUrl(url string) {
-// 	s.Transport.Config.RedirectURL = url
-// }
-
-// //https://github.com/mrjones/oauth
-// func (s *SocialTwitter) UserInfo(token *oauth2.Token, _ *url.URL) (*BasicUserInfo, error) {
-// 	// transport := &oauth.Transport{Token: token}
-// 	// var data struct {
-// 	// 	Id    string `json:"id"`
-// 	// 	Name  string `json:"name"`
-// 	// 	Email string `json:"email"`
-// 	// }
-// 	// var err error
-
-// 	// reqUrl := "https://www.googleapis.com/oauth2/v1/userinfo"
-// 	// r, err := transport.Client().Get(reqUrl)
-// 	// if err != nil {
-// 	// 	return nil, err
-// 	// }
-// 	// defer r.Body.Close()
-// 	// if err = json.NewDecoder(r.Body).Decode(&data); err != nil {
-// 	// 	return nil, err
-// 	// }
-// 	// return &BasicUserInfo{
-// 	// 	Identity: data.Id,
-// 	// 	Name:     data.Name,
-// 	// 	Email:    data.Email,
-// 	// }, nil
-// 	return nil, nil
-// }
-
-//  __      __       ._____.
-// /  \    /  \ ____ |__\_ |__   ____
-// \   \/\/   // __ \|  || __ \ /  _ \
-//  \        /\  ___/|  || \_\ (  <_> )
-//   \__/\  /  \___  >__||___  /\____/
-//        \/       \/        \/
-
-type SocialWeibo struct {
-	opts *oauth2.Options
-}
-
-func newWeiboOauth(opts *oauth2.Options) {
-	SocialMap["weibo"] = &SocialWeibo{opts}
-}
-
-func (s *SocialWeibo) Type() int {
-	return int(models.WEIBO)
-}
-
-func (s *SocialWeibo) UserInfo(token *oauth2.Token, _ *url.URL) (*BasicUserInfo, error) {
-	transport := s.opts.NewTransportFromToken(token)
-	var data struct {
-		Name string `json:"name"`
-	}
-	var urls = url.Values{
-		"access_token": {token.AccessToken},
-		"uid":          {token.Extra("uid")},
-	}
-	reqUrl := "https://api.weibo.com/2/users/show.json"
-	r, err := transport.Client().Get(reqUrl + "?" + urls.Encode())
-	if err != nil {
-		return nil, err
-	}
-	defer r.Body.Close()
-
-	if err = json.NewDecoder(r.Body).Decode(&data); err != nil {
-		return nil, err
-	}
-	return &BasicUserInfo{
-		Identity: token.Extra("uid"),
-		Name:     data.Name,
-	}, nil
-}

routers/admin/admin.go

@@ -114,8 +114,7 @@ func updateSystemStatus() {
 type AdminOperation int
 
 const (
-	CLEAN_UNBIND_OAUTH AdminOperation = iota + 1
+	CLEAN_INACTIVATE_USER AdminOperation = iota + 1
-	CLEAN_INACTIVATE_USER
 	CLEAN_REPO_ARCHIVES
 	GIT_GC_REPOS
 	SYNC_SSH_AUTHORIZED_KEY
@@ -134,9 +133,6 @@ func Dashboard(ctx *middleware.Context) {
 		var success string
 
 		switch AdminOperation(op) {
-		case CLEAN_UNBIND_OAUTH:
-			success = ctx.Tr("admin.dashboard.clean_unbind_oauth_success")
-			err = models.CleanUnbindOauth()
 		case CLEAN_INACTIVATE_USER:
 			success = ctx.Tr("admin.dashboard.delete_inactivate_accounts_success")
 			err = models.DeleteInactivateUsers()
@@ -197,12 +193,6 @@ func Config(ctx *middleware.Context) {
 		ctx.Data["Mailer"] = setting.MailService
 	}
 
-	ctx.Data["OauthEnabled"] = false
-	if setting.OauthService != nil {
-		ctx.Data["OauthEnabled"] = true
-		ctx.Data["Oauther"] = setting.OauthService
-	}
-
 	ctx.Data["CacheAdapter"] = setting.CacheAdapter
 	ctx.Data["CacheInternal"] = setting.CacheInternal
 	ctx.Data["CacheConn"] = setting.CacheConn

routers/home.go

@@ -39,11 +39,6 @@ func Home(ctx *middleware.Context) {
 		return
 	}
 
-	if setting.OauthService != nil {
-		ctx.Data["OauthEnabled"] = true
-		ctx.Data["OauthService"] = setting.OauthService
-	}
-
 	ctx.Data["PageIsHome"] = true
 	ctx.HTML(200, HOME)
 }

routers/install.go

@@ -25,7 +25,6 @@ import (
 	"github.com/gogits/gogs/modules/mailer"
 	"github.com/gogits/gogs/modules/middleware"
 	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/modules/social"
 	"github.com/gogits/gogs/modules/user"
 )
 
@@ -46,7 +45,6 @@ func checkRunMode() {
 func NewServices() {
 	setting.NewServices()
 	mailer.NewContext()
-	social.NewOauthService()
 }
 
 // GlobalInit is for global configuration reload-able.

routers/user/auth.go

@@ -6,7 +6,6 @@ package user
 
 import (
 	"net/url"
-	"strings"
 
 	"github.com/macaron-contrib/captcha"
 
@@ -30,17 +29,6 @@ const (
 func SignIn(ctx *middleware.Context) {
 	ctx.Data["Title"] = ctx.Tr("sign_in")
 
-	if _, ok := ctx.Session.Get("socialId").(int64); ok {
-		ctx.Data["IsSocialLogin"] = true
-		ctx.HTML(200, SIGNIN)
-		return
-	}
-
-	if setting.OauthService != nil {
-		ctx.Data["OauthEnabled"] = true
-		ctx.Data["OauthService"] = setting.OauthService
-	}
-
 	// Check auto-login.
 	isSucceed, err := middleware.AutoSignIn(ctx)
 	if err != nil {
@@ -63,14 +51,6 @@ func SignIn(ctx *middleware.Context) {
 func SignInPost(ctx *middleware.Context, form auth.SignInForm) {
 	ctx.Data["Title"] = ctx.Tr("sign_in")
 
-	sid, isOauth := ctx.Session.Get("socialId").(int64)
-	if isOauth {
-		ctx.Data["IsSocialLogin"] = true
-	} else if setting.OauthService != nil {
-		ctx.Data["OauthEnabled"] = true
-		ctx.Data["OauthService"] = setting.OauthService
-	}
-
 	if ctx.HasError() {
 		ctx.HTML(200, SIGNIN)
 		return
@@ -93,20 +73,6 @@ func SignInPost(ctx *middleware.Context, form auth.SignInForm) {
 			setting.CookieRememberName, u.Name, days, setting.AppSubUrl)
 	}
 
-	// Bind with social account.
-	if isOauth {
-		if err = models.BindUserOauth2(u.Id, sid); err != nil {
-			if err == models.ErrOauth2RecordNotExist {
-				ctx.Handle(404, "GetOauth2ById", err)
-			} else {
-				ctx.Handle(500, "GetOauth2ById", err)
-			}
-			return
-		}
-		ctx.Session.Delete("socialId")
-		log.Trace("%s OAuth binded: %s -> %d", ctx.Req.RequestURI, form.UserName, sid)
-	}
-
 	ctx.Session.Set("uid", u.Id)
 	ctx.Session.Set("uname", u.Name)
 	if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {
@@ -129,25 +95,6 @@ func SignOut(ctx *middleware.Context) {
 	ctx.Redirect(setting.AppSubUrl + "/")
 }
 
-func oauthSignUp(ctx *middleware.Context, sid int64) {
-	ctx.Data["Title"] = ctx.Tr("sign_up")
-
-	if _, err := models.GetOauth2ById(sid); err != nil {
-		if err == models.ErrOauth2RecordNotExist {
-			ctx.Handle(404, "GetOauth2ById", err)
-		} else {
-			ctx.Handle(500, "GetOauth2ById", err)
-		}
-		return
-	}
-
-	ctx.Data["IsSocialLogin"] = true
-	ctx.Data["uname"] = strings.Replace(ctx.Session.Get("socialName").(string), " ", "", -1)
-	ctx.Data["email"] = ctx.Session.Get("socialEmail")
-	log.Trace("social ID: %v", ctx.Session.Get("socialId"))
-	ctx.HTML(200, SIGNUP)
-}
-
 func SignUp(ctx *middleware.Context) {
 	ctx.Data["Title"] = ctx.Tr("sign_up")
 
@@ -159,11 +106,6 @@ func SignUp(ctx *middleware.Context) {
 		return
 	}
 
-	if sid, ok := ctx.Session.Get("socialId").(int64); ok {
-		oauthSignUp(ctx, sid)
-		return
-	}
-
 	ctx.HTML(200, SIGNUP)
 }
 
@@ -177,12 +119,6 @@ func SignUpPost(ctx *middleware.Context, cpt *captcha.Captcha, form auth.Registe
 		return
 	}
 
-	isOauth := false
-	sid, isOauth := ctx.Session.Get("socialId").(int64)
-	if isOauth {
-		ctx.Data["IsSocialLogin"] = true
-	}
-
 	if ctx.HasError() {
 		ctx.HTML(200, SIGNUP)
 		return
@@ -204,7 +140,7 @@ func SignUpPost(ctx *middleware.Context, cpt *captcha.Captcha, form auth.Registe
 		Name:     form.UserName,
 		Email:    form.Email,
 		Passwd:   form.Password,
-		IsActive: !setting.Service.RegisterEmailConfirm || isOauth,
+		IsActive: !setting.Service.RegisterEmailConfirm,
 	}
 	if err := models.CreateUser(u); err != nil {
 		switch {
@@ -237,18 +173,8 @@ func SignUpPost(ctx *middleware.Context, cpt *captcha.Captcha, form auth.Registe
 		}
 	}
 
-	// Bind social account.
-	if isOauth {
-		if err := models.BindUserOauth2(u.Id, sid); err != nil {
-			ctx.Handle(500, "BindUserOauth2", err)
-			return
-		}
-		ctx.Session.Delete("socialId")
-		log.Trace("%s OAuth binded: %s -> %d", ctx.Req.RequestURI, form.UserName, sid)
-	}
-
 	// Send confirmation e-mail, no need for social account.
-	if !isOauth && setting.Service.RegisterEmailConfirm && u.Id > 1 {
+	if setting.Service.RegisterEmailConfirm && u.Id > 1 {
 		mailer.SendActivateAccountMail(ctx.Context, u)
 		ctx.Data["IsSendRegisterMail"] = true
 		ctx.Data["Email"] = u.Email

routers/user/setting.go

@@ -324,31 +324,6 @@ func DeleteSSHKey(ctx *middleware.Context) {
 	})
 }
 
-func SettingsSocial(ctx *middleware.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings")
-	ctx.Data["PageIsSettingsSocial"] = true
-
-	// Unbind social account.
-	remove, _ := com.StrTo(ctx.Query("remove")).Int64()
-	if remove > 0 {
-		if err := models.DeleteOauth2ById(remove); err != nil {
-			ctx.Handle(500, "DeleteOauth2ById", err)
-			return
-		}
-		ctx.Flash.Success(ctx.Tr("settings.unbind_success"))
-		ctx.Redirect(setting.AppSubUrl + "/user/settings/social")
-		return
-	}
-
-	socials, err := models.GetOauthByUserId(ctx.User.Id)
-	if err != nil {
-		ctx.Handle(500, "GetOauthByUserId", err)
-		return
-	}
-	ctx.Data["Socials"] = socials
-	ctx.HTML(200, SETTINGS_SOCIAL)
-}
-
 func SettingsApplications(ctx *middleware.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsApplications"] = true

routers/user/social.go

@@ -1,95 +0,0 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package user
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	// "strings"
-	"time"
-
-	"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"
-	"github.com/gogits/gogs/modules/social"
-)
-
-func SocialSignIn(ctx *middleware.Context) {
-	if setting.OauthService == nil {
-		ctx.Handle(404, "OAuth2 service not enabled", nil)
-		return
-	}
-
-	next := setting.AppSubUrl + "/user/login"
-	info := ctx.Session.Get(oauth2.KEY_TOKEN)
-	if info == nil {
-		ctx.Redirect(next)
-		return
-	}
-
-	name := ctx.Params(":name")
-	connect, ok := social.SocialMap[name]
-	if !ok {
-		ctx.Handle(404, "social login not enabled", errors.New(name))
-		return
-	}
-
-	tk := new(oauth2.Token)
-	if err := json.Unmarshal(info.([]byte), tk); err != nil {
-		ctx.Handle(500, "Unmarshal token", err)
-		return
-	}
-
-	ui, err := connect.UserInfo(tk, ctx.Req.URL)
-	if err != nil {
-		ctx.Handle(500, fmt.Sprintf("UserInfo(%s)", name), err)
-		return
-	}
-	if len(ui.Identity) == 0 {
-		ctx.Handle(404, "no identity is presented", errors.New(name))
-		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.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)
-}

templates/admin/config.tmpl

@@ -135,27 +135,6 @@
                             </div>
                         </div>
                         <br>
-                        <div class="panel panel-radius">
-                            <div class="panel-header">
-                                <strong>{{.i18n.Tr "admin.config.oauth_config"}}</strong>
-                            </div>
-                            <div class="panel-body">
-                                <dl class="dl-horizontal admin-dl-horizontal">
-                                    <dt>{{.i18n.Tr "admin.config.oauth_enabled"}}</dt>
-                                    <dd><i class="fa fa{{if .OauthEnabled}}-check{{end}}-square-o"></i></dd>
-                                    {{if .OauthEnabled}}<dt>GitHub</dt>
-                                    <dd><i class="fa fa{{if .Oauther.GitHub}}-check{{end}}-square-o"></i></dd>
-                                    <dt>Google</dt>
-                                    <dd><i class="fa fa{{if .Oauther.Google}}-check{{end}}-square-o"></i></dd>
-                                    <dt>腾讯 QQ</dt>
-                                    <dd><i class="fa fa{{if .Oauther.Tencent}}-check{{end}}-square-o"></i></dd>
-                                    <dt>新浪微博</dt>
-                                    <dd><i class="fa fa{{if .Oauther.Weibo}}-check{{end}}-square-o"></i></dd>
-                                    {{end}}
-                                </dl>
-                            </div>
-                        </div>
-                        <br>
                         <div class="panel panel-radius">
                             <div class="panel-header">
                                 <strong>{{.i18n.Tr "admin.config.cache_config"}}</strong>

templates/admin/dashboard.tmpl

@@ -27,28 +27,24 @@
                                     <table class="table">
                                         <tbody>
                                             <tr>
-                                                <td>{{.i18n.Tr "admin.dashboard.clean_unbind_oauth"}}</td>
+                                                <td>{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}}</td>
                                                 <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=1">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
                                             </tr>
                                             <tr>
-                                                <td>{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}}</td>
+                                                <td>{{.i18n.Tr "admin.dashboard.delete_repo_archives"}}</td>
                                                 <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=2">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
                                             </tr>
                                             <tr>
-                                                <td>{{.i18n.Tr "admin.dashboard.delete_repo_archives"}}</td>
+                                                <td>{{.i18n.Tr "admin.dashboard.git_gc_repos"}}</td>
                                                 <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=3">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
                                             </tr>
                                             <tr>
-                                                <td>{{.i18n.Tr "admin.dashboard.git_gc_repos"}}</td>
+                                                <td>{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}}</td>
                                                 <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=4">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
                                             </tr>
-                                            <tr>
-                                                <td>{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}}</td>
-                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=5">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
-                                            </tr>
                                             <tr>
                                                 <td>{{.i18n.Tr "admin.dashboard.resync_all_update_hooks"}}</td>
-                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=6">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
+                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=5">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
                                             </tr>
                                         </tbody>
                                     </table>

templates/base/social.tmpl

@@ -1,4 +0,0 @@
-{{if .OauthService.GitHub}}<a class="btn github" href="{{AppSubUrl}}/user/login/oauth2/github?next={{AppSubUrl}}/user/info/github"><i class="fa fa-github"></i>GitHub</a>{{end}}
-{{if .OauthService.Google}}<a class="btn google" href="{{AppSubUrl}}/user/login/oauth2/google?next={{AppSubUrl}}/user/info/google"><i class="fa fa-google"></i>Google +</a>{{end}}
-{{if .OauthService.Weibo}}<a class="btn weibo" href="{{AppSubUrl}}/user/login/oauth2/weibo?next={{AppSubUrl}}/user/info/weibo"><i class="fa fa-weibo"></i>新浪微博</a>{{end}}
-{{if .OauthService.Tencent}}<a class="btn qq" href="{{AppSubUrl}}/user/login/oauth2/qq?next={{AppSubUrl}}/user/info/qq"><i class="fa fa-qq"></i>腾讯 QQ&nbsp;</a>{{end}}

templates/user/auth/signin.tmpl

@@ -5,7 +5,7 @@
       <form class="ui form" action="{{.Link}}" method="post">
         {{.CsrfTokenHtml}}
         <h3 class="ui top attached header">
-          {{if .IsSocialLogin}}{{.i18n.Tr "social_sign_in" | Str2html}}{{else}}{{.i18n.Tr "sign_in"}}{{end}}
+          {{.i18n.Tr "sign_in"}}
         </h3>
         <div class="ui attached segment">
           {{template "base/alert" .}}
@@ -17,7 +17,6 @@
             <label for="password">{{.i18n.Tr "password"}}</label>
             <input id="password" name="password" type="password" value="{{.password}}" required>
           </div>
-          {{if not .IsSocialLogin}}
           <div class="inline field">
             <label></label>
             <div class="ui checkbox">
@@ -25,12 +24,11 @@
               <input name="remember" type="checkbox">
             </div>
           </div>
-          {{end}}
 
           <div class="inline field">
             <label></label>
             <button class="ui green button">{{.i18n.Tr "sign_in"}}</button>
-            {{if not .IsSocialLogin}}<a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>{{end}}
+            <a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>
           </div>
           {{if .ShowRegistrationButton}}
           <div class="inline field">
@@ -38,12 +36,6 @@
             <a href="{{AppSubUrl}}/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a>
           </div>
           {{end}}
-          {{if and (not .IsSocialLogin) .OauthEnabled}}
-          <div class="inline field">
-            <label></label>
-            {{template "base/social" .}}
-          </div>
-          {{end}}
         </div>
       </form>
     </div>

templates/user/settings/nav.tmpl

@@ -1,16 +0,0 @@
-<div id="setting-menu" class="grid-1-5 panel panel-radius left">
-    <p class="panel-header"><strong>{{.i18n.Tr "settings"}}</strong></p>
-    <div class="panel-body">
-        <ul class="menu menu-vertical switching-list grid-1-5 left">
-            <li {{if .PageIsSettingsProfile}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings">{{.i18n.Tr "settings.profile"}}</a></li>
-            <li {{if .PageIsSettingsPassword}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/password">{{.i18n.Tr "settings.password"}}</a></li>
-            <li {{if .PageIsSettingsEmails}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/email">{{.i18n.Tr "settings.emails"}}</a></li>
-            <li {{if .PageIsSettingsSSHKeys}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/ssh">{{.i18n.Tr "settings.ssh_keys"}}</a></li>
-            {{if .HasOAuthService}}
-            <li {{if .PageIsSettingsSocial}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/social">{{.i18n.Tr "settings.social"}}</a></li>
-            {{end}}
-            <li {{if .PageIsSettingsApplications}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/applications">{{.i18n.Tr "settings.applications"}}</a></li>
-            <li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/delete">{{.i18n.Tr "settings.delete"}}</a></li>
-        </ul>
-    </div>
-</div>

templates/user/settings/navbar.tmpl

@@ -13,11 +13,6 @@
 	  <a class="{{if .PageIsSettingsSSHKeys}}active{{end}} item" href="{{AppSubUrl}}/user/settings/ssh">
 	    {{.i18n.Tr "settings.ssh_keys"}}
 	  </a>
-	  {{if .HasOAuthService}}
-	  <a class="{{if .PageIsSettingsSocial}}active{{end}} item" href="{{AppSubUrl}}/user/settings/social">
-	    {{.i18n.Tr "settings.social"}}
-	  </a>
-	  {{end}}
 	  <a class="{{if .PageIsSettingsApplications}}active{{end}} item" href="{{AppSubUrl}}/user/settings/applications">
 	    {{.i18n.Tr "settings.applications"}}
 	  </a>

templates/user/settings/social.tmpl

@@ -1,33 +0,0 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="setting-wrapper" class="main-wrapper">
-    <div id="user-profile-setting" class="container clear">
-        {{template "user/settings/nav" .}}
-        <div class="grid-4-5 left">
-            <div class="setting-content">
-                {{template "ng/base/alert" .}}
-                <div id="setting-content">
-                    <div id="user-social-panel" class="panel panel-radius">
-                        <div class="panel-header"><strong>{{.i18n.Tr "settings.manage_social"}}</strong></div>
-                        <ul class="panel-body setting-list">
-                            <li>{{.i18n.Tr "settings.social_desc"}}</li>
-                            {{range .Socials}}
-                            <li class="ssh clear">
-                                <span class="active-icon left label label-{{if .HasRecentActivity}}green{{else}}gray{{end}} label-radius"></span>
-                                <i class="fa {{Oauth2Icon .Type}} fa-2x left"></i>
-                                <div class="ssh-content left">
-                                    <p><strong>{{Oauth2Name .Type}}</strong></p>
-                                    <p class="print">{{.Identity}}</p>
-                                    <p class="activity"><i>{{$.i18n.Tr "settings.add_on"}} <span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span> —  <i class="octicon octicon-info"></i>{{$.i18n.Tr "settings.last_used"}} {{DateFmtShort .Updated}}</i></p>
-                                </div>
-                                <a class="right btn btn-small btn-red btn-header btn-radius" href="{{AppSubUrl}}/user/settings/social?remove={{.Id}}">{{$.i18n.Tr "settings.unbind"}}</a>
-                            </li>
-                            {{end}}
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{{template "ng/base/footer" .}}