refactor API routes and some work for #976

routers/api/v1/user/app.go

@@ -0,0 +1,40 @@
+// 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 (
+	api "github.com/gogits/go-gogs-client"
+
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/middleware"
+)
+
+// https://github.com/gogits/go-gogs-client/wiki/Users#list-access-tokens-for-a-user
+func ListAccessTokens(ctx *middleware.Context) {
+	tokens, err := models.ListAccessTokens(ctx.User.Id)
+	if err != nil {
+		ctx.APIError(500, "ListAccessTokens", err)
+		return
+	}
+
+	apiTokens := make([]*api.AccessToken, len(tokens))
+	for i := range tokens {
+		apiTokens[i] = &api.AccessToken{tokens[i].Name, tokens[i].Sha1}
+	}
+	ctx.JSON(200, &apiTokens)
+}
+
+// https://github.com/gogits/go-gogs-client/wiki/Users#create-a-access-token
+func CreateAccessToken(ctx *middleware.Context, form api.CreateAccessTokenOption) {
+	t := &models.AccessToken{
+		UID:  ctx.User.Id,
+		Name: form.Name,
+	}
+	if err := models.NewAccessToken(t); err != nil {
+		ctx.APIError(500, "NewAccessToken", err)
+		return
+	}
+	ctx.JSON(201, &api.AccessToken{t.Name, t.Sha1})
+}

routers/api/v1/user/keys.go

@@ -0,0 +1,122 @@
+// 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"
+	"github.com/gogits/gogs/routers/api/v1/repo"
+	to "github.com/gogits/gogs/routers/api/v1/utils"
+)
+
+func getUserByParams(ctx *middleware.Context) *models.User {
+	user, err := models.GetUserByName(ctx.Params(":username"))
+	if err != nil {
+		if models.IsErrUserNotExist(err) {
+			ctx.Error(404)
+		} else {
+			ctx.APIError(500, "GetUserByName", err)
+		}
+		return nil
+	}
+	return user
+}
+
+func composePublicKeysAPILink() string {
+	return setting.AppUrl + "api/v1/user/keys/"
+}
+
+func listPublicKeys(ctx *middleware.Context, uid int64) {
+	keys, err := models.ListPublicKeys(uid)
+	if err != nil {
+		ctx.APIError(500, "ListPublicKeys", err)
+		return
+	}
+
+	apiLink := composePublicKeysAPILink()
+	apiKeys := make([]*api.PublicKey, len(keys))
+	for i := range keys {
+		apiKeys[i] = to.ApiPublicKey(apiLink, keys[i])
+	}
+
+	ctx.JSON(200, &apiKeys)
+}
+
+// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#list-your-public-keys
+func ListMyPublicKeys(ctx *middleware.Context) {
+	listPublicKeys(ctx, ctx.User.Id)
+}
+
+// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#list-public-keys-for-a-user
+func ListPublicKeys(ctx *middleware.Context) {
+	user := getUserByParams(ctx)
+	if ctx.Written() {
+		return
+	}
+	listPublicKeys(ctx, user.Id)
+}
+
+// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#get-a-single-public-key
+func GetPublicKey(ctx *middleware.Context) {
+	key, err := models.GetPublicKeyByID(ctx.ParamsInt64(":id"))
+	if err != nil {
+		if models.IsErrKeyNotExist(err) {
+			ctx.Error(404)
+		} else {
+			ctx.Handle(500, "GetPublicKeyByID", err)
+		}
+		return
+	}
+
+	apiLink := composePublicKeysAPILink()
+	ctx.JSON(200, to.ApiPublicKey(apiLink, key))
+}
+
+func createUserPublicKey(ctx *middleware.Context, form api.CreateKeyOption, uid int64) {
+	content, err := models.CheckPublicKeyString(form.Key)
+	if err != nil {
+		repo.HandleCheckKeyStringError(ctx, err)
+		return
+	}
+
+	key, err := models.AddPublicKey(uid, form.Title, content)
+	if err != nil {
+		repo.HandleAddKeyError(ctx, err)
+		return
+	}
+	apiLink := composePublicKeysAPILink()
+	ctx.JSON(201, to.ApiPublicKey(apiLink, key))
+}
+
+// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#create-a-public-key-for-user
+func CreateUserPublicKey(ctx *middleware.Context, form api.CreateKeyOption) {
+	user := getUserByParams(ctx)
+	if ctx.Written() {
+		return
+	}
+	createUserPublicKey(ctx, form, user.Id)
+}
+
+// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#create-a-public-key
+func CreatePublicKey(ctx *middleware.Context, form api.CreateKeyOption) {
+	createUserPublicKey(ctx, form, ctx.User.Id)
+}
+
+// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#delete-a-public-key
+func DeletePublicKey(ctx *middleware.Context) {
+	if err := models.DeletePublicKey(ctx.User, ctx.ParamsInt64(":id")); err != nil {
+		if models.IsErrKeyAccessDenied(err) {
+			ctx.APIError(403, "", "You do not have access to this key")
+		} else {
+			ctx.APIError(500, "DeletePublicKey", err)
+		}
+		return
+	}
+
+	ctx.Status(204)
+}

routers/api/v1/user/user.go

@@ -0,0 +1,71 @@
+// 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 (
+	"github.com/Unknwon/com"
+
+	api "github.com/gogits/go-gogs-client"
+
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/middleware"
+)
+
+// https://github.com/gogits/go-gogs-client/wiki/Users#search-users
+func Search(ctx *middleware.Context) {
+	opt := models.SearchOption{
+		Keyword: ctx.Query("q"),
+		Limit:   com.StrTo(ctx.Query("limit")).MustInt(),
+	}
+	if opt.Limit == 0 {
+		opt.Limit = 10
+	}
+
+	us, err := models.SearchUserByName(opt)
+	if err != nil {
+		ctx.JSON(500, map[string]interface{}{
+			"ok":    false,
+			"error": err.Error(),
+		})
+		return
+	}
+
+	results := make([]*api.User, len(us))
+	for i := range us {
+		results[i] = &api.User{
+			ID:        us[i].Id,
+			UserName:  us[i].Name,
+			AvatarUrl: us[i].AvatarLink(),
+			FullName:  us[i].FullName,
+		}
+		if ctx.IsSigned {
+			results[i].Email = us[i].Email
+		}
+	}
+
+	ctx.JSON(200, map[string]interface{}{
+		"ok":   true,
+		"data": results,
+	})
+}
+
+// https://github.com/gogits/go-gogs-client/wiki/Users#get-a-single-user
+func GetInfo(ctx *middleware.Context) {
+	u, err := models.GetUserByName(ctx.Params(":username"))
+	if err != nil {
+		if models.IsErrUserNotExist(err) {
+			ctx.Error(404)
+		} else {
+			ctx.APIError(500, "GetUserByName", err)
+		}
+		return
+	}
+
+	// Hide user e-mail when API caller isn't signed in.
+	if !ctx.IsSigned {
+		u.Email = ""
+	}
+	ctx.JSON(200, &api.User{u.Id, u.Name, u.FullName, u.Email, u.AvatarLink()})
+}