#1692 add user email APIs

README.md

@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current version: 0.8.6
+##### Current version: 0.8.7
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|

gogs.go

@@ -18,7 +18,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.8.6.1215"
+const APP_VER = "0.8.7.1215"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

models/user.go

@@ -888,7 +888,7 @@ func GetEmailAddresses(uid int64) ([]*EmailAddress, error) {
 }
 
 func AddEmailAddress(email *EmailAddress) error {
-	email.Email = strings.ToLower(email.Email)
+	email.Email = strings.ToLower(strings.TrimSpace(email.Email))
 	used, err := IsEmailUsed(email.Email)
 	if err != nil {
 		return err
@@ -900,6 +900,29 @@ func AddEmailAddress(email *EmailAddress) error {
 	return err
 }
 
+func AddEmailAddresses(emails []*EmailAddress) error {
+	if len(emails) == 0 {
+		return nil
+	}
+
+	// Check if any of them has been used
+	for i := range emails {
+		emails[i].Email = strings.ToLower(strings.TrimSpace(emails[i].Email))
+		used, err := IsEmailUsed(emails[i].Email)
+		if err != nil {
+			return err
+		} else if used {
+			return ErrEmailAlreadyUsed{emails[i].Email}
+		}
+	}
+
+	if _, err := x.Insert(emails); err != nil {
+		return fmt.Errorf("Insert: %v", err)
+	}
+
+	return nil
+}
+
 func (email *EmailAddress) Activate() error {
 	email.IsActivated = true
 	if _, err := x.Id(email.ID).AllCols().Update(email); err != nil {
@@ -914,20 +937,23 @@ func (email *EmailAddress) Activate() error {
 	}
 }
 
-func DeleteEmailAddress(email *EmailAddress) error {
-	has, err := x.Get(email)
-	if err != nil {
-		return err
-	} else if !has {
-		return ErrEmailNotExist
+func DeleteEmailAddress(email *EmailAddress) (err error) {
+	if email.ID > 0 {
+		_, err = x.Id(email.ID).Delete(new(EmailAddress))
+	} else {
+		_, err = x.Where("email=?", email.Email).Delete(new(EmailAddress))
 	}
+	return err
+}
 
-	if _, err = x.Id(email.ID).Delete(email); err != nil {
-		return err
+func DeleteEmailAddresses(emails []*EmailAddress) (err error) {
+	for i := range emails {
+		if err = DeleteEmailAddress(emails[i]); err != nil {
+			return err
+		}
 	}
 
 	return nil
-
 }
 
 func MakeEmailPrimary(email *EmailAddress) error {

routers/api/v1/api.go

@@ -144,6 +144,9 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Combo("/:id").Get(user.GetPublicKey).
 					Delete(user.DeletePublicKey)
 			})
+			m.Combo("/emails").Get(user.ListEmails).
+				Post(bind(api.CreateEmailOption{}), user.AddEmail).
+				Delete(bind(api.CreateEmailOption{}), user.DeleteEmail)
 		}, ReqToken())
 
 		// Repositories

routers/api/v1/user/email.go

@@ -0,0 +1,78 @@
+// Copyright 2015 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 (
+	api "github.com/gogits/go-gogs-client"
+
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/middleware"
+	"github.com/gogits/gogs/modules/setting"
+	to "github.com/gogits/gogs/routers/api/v1/utils"
+)
+
+func ListEmails(ctx *middleware.Context) {
+	emails, err := models.GetEmailAddresses(ctx.User.Id)
+	if err != nil {
+		ctx.Handle(500, "GetEmailAddresses", err)
+		return
+	}
+	apiEmails := make([]*api.Email, len(emails))
+	for i := range emails {
+		apiEmails[i] = to.ApiEmail(emails[i])
+	}
+	ctx.JSON(200, &apiEmails)
+}
+
+func AddEmail(ctx *middleware.Context, form api.CreateEmailOption) {
+	if len(form.Emails) == 0 {
+		ctx.Status(422)
+		return
+	}
+
+	emails := make([]*models.EmailAddress, len(form.Emails))
+	for i := range form.Emails {
+		emails[i] = &models.EmailAddress{
+			UID:         ctx.User.Id,
+			Email:       form.Emails[i],
+			IsActivated: !setting.Service.RegisterEmailConfirm,
+		}
+	}
+
+	if err := models.AddEmailAddresses(emails); err != nil {
+		if models.IsErrEmailAlreadyUsed(err) {
+			ctx.APIError(422, "", "Email address has been used: "+err.(models.ErrEmailAlreadyUsed).Email)
+		} else {
+			ctx.APIError(500, "AddEmailAddresses", err)
+		}
+		return
+	}
+
+	apiEmails := make([]*api.Email, len(emails))
+	for i := range emails {
+		apiEmails[i] = to.ApiEmail(emails[i])
+	}
+	ctx.JSON(201, &apiEmails)
+}
+
+func DeleteEmail(ctx *middleware.Context, form api.CreateEmailOption) {
+	if len(form.Emails) == 0 {
+		ctx.Status(204)
+		return
+	}
+
+	emails := make([]*models.EmailAddress, len(form.Emails))
+	for i := range form.Emails {
+		emails[i] = &models.EmailAddress{
+			Email: form.Emails[i],
+		}
+	}
+
+	if err := models.DeleteEmailAddresses(emails); err != nil {
+		ctx.APIError(500, "DeleteEmailAddresses", err)
+		return
+	}
+	ctx.Status(204)
+}

routers/api/v1/utils/convert.go

@@ -26,6 +26,14 @@ func ApiUser(u *models.User) *api.User {
 	}
 }
 
+func ApiEmail(email *models.EmailAddress) *api.Email {
+	return &api.Email{
+		Email:    email.Email,
+		Verified: email.IsActivated,
+		Primary:  email.IsPrimary,
+	}
+}
+
 // ApiRepository converts repository to API format.
 func ApiRepository(owner *models.User, repo *models.Repository, permission api.Permission) *api.Repository {
 	cl := repo.CloneLink()

routers/user/setting.go

@@ -226,7 +226,7 @@ func SettingsEmailPost(ctx *middleware.Context, form auth.AddEmailForm) {
 
 	e := &models.EmailAddress{
 		UID:         ctx.User.Id,
-		Email:       strings.TrimSpace(form.Email),
+		Email:       form.Email,
 		IsActivated: !setting.Service.RegisterEmailConfirm,
 	}
 	if err := models.AddEmailAddress(e); err != nil {

templates/.VERSION

@@ -1 +1 @@
-0.8.6.1215
+0.8.7.1215