#1692 add user email APIs

4 files changed, 90 insertions, 1 deletions

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 1ac60c26b9..eeba713945 100644
--- a/routers/api/v1/api.go
+++ b/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
diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go
new file mode 100644
index 0000000000..449560e782
--- /dev/null
+++ b/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)
+}
diff --git a/routers/api/v1/utils/convert.go b/routers/api/v1/utils/convert.go
index 7ac4edf26f..3871c0da11 100644
--- a/routers/api/v1/utils/convert.go
+++ b/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()
diff --git a/routers/user/setting.go b/routers/user/setting.go
index b338e112ab..56a9cab0a2 100644
--- a/routers/user/setting.go
+++ b/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 {