%s to %s`
+ TPL_PUSH_TAG = `%s pushed tag %s at %s`
)
type PushCommit struct {
@@ -174,6 +176,8 @@ func ActionDesc(act Actioner) string {
case 8: // Transfer repository.
newRepoLink := content + "/" + repoName
return fmt.Sprintf(TPL_TRANSFER_REPO, actUserName, actUserName, repoLink, newRepoLink, newRepoLink)
+ case 9: // Push tag.
+ return fmt.Sprintf(TPL_PUSH_TAG, actUserName, actUserName, repoLink, branch, branch, repoLink, repoLink)
default:
return "invalid type"
}
@@ -197,3 +201,19 @@ func DiffLineTypeToStr(diffType int) string {
}
return "same"
}
+
+func Oauth2Icon(t int) string {
+ switch t {
+ case 1:
+ return "fa-github-square"
+ case 2:
+ return "fa-google-plus-square"
+ case 3:
+ return "fa-twitter-square"
+ case 4:
+ return "fa-linux"
+ case 5:
+ return "fa-weibo"
+ }
+ return ""
+}
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 1e79ce9870e..82c1c2dbf60 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -123,6 +123,13 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler {
ctx.Repo.GitRepo = gitRepo
ctx.Repo.RepoLink = "/" + user.Name + "/" + repo.Name
+ tags, err := ctx.Repo.GitRepo.GetTags()
+ if err != nil {
+ ctx.Handle(500, "RepoAssignment(GetTags))", err)
+ return
+ }
+ ctx.Repo.Repository.NumTags = len(tags)
+
ctx.Data["Title"] = user.Name + "/" + repo.Name
ctx.Data["Repository"] = repo
ctx.Data["Owner"] = user
diff --git a/modules/social/social.go b/modules/social/social.go
index 230f478fe4a..c2ee5417764 100644
--- a/modules/social/social.go
+++ b/modules/social/social.go
@@ -48,7 +48,7 @@ func NewOauthService() {
base.OauthService.OauthInfos = make(map[string]*base.OauthInfo)
socialConfigs := make(map[string]*oauth.Config)
- allOauthes := []string{"github", "google", "qq", "twitter"}
+ allOauthes := []string{"github", "google", "qq", "twitter", "weibo"}
// Load all OAuth config data.
for _, name := range allOauthes {
base.OauthService.OauthInfos[name] = &base.OauthInfo{
@@ -98,6 +98,13 @@ func NewOauthService() {
enabledOauths = append(enabledOauths, "Twitter")
}
+ // Weibo.
+ if base.Cfg.MustBool("oauth.weibo", "ENABLED") {
+ base.OauthService.Weibo = true
+ newWeiboOauth(socialConfigs["weibo"])
+ enabledOauths = append(enabledOauths, "Weibo")
+ }
+
log.Info("Oauth Service Enabled %s", enabledOauths)
}
@@ -331,3 +338,56 @@ func (s *SocialTwitter) UserInfo(token *oauth.Token, _ *url.URL) (*BasicUserInfo
// }, nil
return nil, nil
}
+
+// __ __ ._____.
+// / \ / \ ____ |__\_ |__ ____
+// \ \/\/ // __ \| || __ \ / _ \
+// \ /\ ___/| || \_\ ( <_> )
+// \__/\ / \___ >__||___ /\____/
+// \/ \/ \/
+
+type SocialWeibo struct {
+ Token *oauth.Token
+ *oauth.Transport
+}
+
+func (s *SocialWeibo) Type() int {
+ return models.OT_WEIBO
+}
+
+func newWeiboOauth(config *oauth.Config) {
+ SocialMap["weibo"] = &SocialWeibo{
+ Transport: &oauth.Transport{
+ Config: config,
+ Transport: http.DefaultTransport,
+ },
+ }
+}
+
+func (s *SocialWeibo) SetRedirectUrl(url string) {
+ s.Transport.Config.RedirectURL = url
+}
+
+func (s *SocialWeibo) UserInfo(token *oauth.Token, _ *url.URL) (*BasicUserInfo, error) {
+ transport := &oauth.Transport{Token: token}
+ var data struct {
+ Id string `json:"id"`
+ Name string `json:"name"`
+ }
+ var err error
+
+ reqUrl := "https://api.weibo.com/2/users/show.json"
+ 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,
+ }, nil
+ return nil, nil
+}
diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index 18a43ff8179..d0f737e645e 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -153,6 +153,12 @@ func Config(ctx *middleware.Context) {
ctx.Data["Mailer"] = base.MailService
}
+ ctx.Data["OauthEnabled"] = false
+ if base.OauthService != nil {
+ ctx.Data["OauthEnabled"] = true
+ ctx.Data["Oauther"] = base.OauthService
+ }
+
ctx.Data["CacheAdapter"] = base.CacheAdapter
ctx.Data["CacheConfig"] = base.CacheConfig
diff --git a/routers/user/setting.go b/routers/user/setting.go
index 7e66ad35999..a8fdc116c6d 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -69,6 +69,20 @@ func SettingPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
ctx.Redirect("/user/setting")
}
+func SettingSocial(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Social Account"
+ ctx.Data["PageIsUserSetting"] = true
+ ctx.Data["IsUserPageSettingSocial"] = true
+ socials, err := models.GetOauthByUserId(ctx.User.Id)
+ if err != nil {
+ ctx.Handle(500, "user.SettingSocial", err)
+ return
+ }
+
+ ctx.Data["Socials"] = socials
+ ctx.HTML(200, "user/social")
+}
+
func SettingPassword(ctx *middleware.Context) {
ctx.Data["Title"] = "Password"
ctx.Data["PageIsUserSetting"] = true
@@ -147,7 +161,7 @@ func SettingSSHKeys(ctx *middleware.Context, form auth.AddSSHKeyForm) {
// Add new SSH key.
if ctx.Req.Method == "POST" {
- if hasErr, ok := ctx.Data["HasError"]; ok && hasErr.(bool) {
+ if ctx.HasError() {
ctx.HTML(200, "user/publickey")
return
}
@@ -162,11 +176,13 @@ func SettingSSHKeys(ctx *middleware.Context, form auth.AddSSHKeyForm) {
ctx.RenderWithErr("Public key name has been used", "user/publickey", &form)
return
}
- ctx.Handle(200, "ssh.AddPublicKey", err)
- log.Trace("%s User SSH key added: %s", ctx.Req.RequestURI, ctx.User.LowerName)
+ ctx.Handle(500, "ssh.AddPublicKey", err)
return
} else {
- ctx.Data["AddSSHKeySuccess"] = true
+ log.Trace("%s User SSH key added: %s", ctx.Req.RequestURI, ctx.User.LowerName)
+ ctx.Flash.Success("New SSH Key has been added!")
+ ctx.Redirect("/user/setting/ssh")
+ return
}
}
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 31cfb77bad6..757a800c205 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -88,12 +88,34 @@
New SSH Key has been added !
{{else if .HasError}}{{.ErrorMsg}}
{{end}} +