|
@@ -2,33 +2,36 @@
|
|
|
// Use of this source code is governed by a MIT-style
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
-package v1
|
|
|
+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"
|
|
|
"github.com/gogits/gogs/modules/setting"
|
|
|
+ "github.com/gogits/gogs/routers/api/v1/repo"
|
|
|
+ to "github.com/gogits/gogs/routers/api/v1/utils"
|
|
|
)
|
|
|
|
|
|
-func ToApiPublicKey(apiLink string, key *models.PublicKey) *api.PublicKey {
|
|
|
- return &api.PublicKey{
|
|
|
- ID: key.ID,
|
|
|
- Key: key.Content,
|
|
|
- URL: apiLink + com.ToStr(key.ID),
|
|
|
- Title: key.Name,
|
|
|
- Created: key.Created,
|
|
|
+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 listUserPublicKeys(ctx *middleware.Context, uid int64) {
|
|
|
+func listPublicKeys(ctx *middleware.Context, uid int64) {
|
|
|
keys, err := models.ListPublicKeys(uid)
|
|
|
if err != nil {
|
|
|
ctx.APIError(500, "ListPublicKeys", err)
|
|
@@ -38,33 +41,28 @@ func listUserPublicKeys(ctx *middleware.Context, uid int64) {
|
|
|
apiLink := composePublicKeysAPILink()
|
|
|
apiKeys := make([]*api.PublicKey, len(keys))
|
|
|
for i := range keys {
|
|
|
- apiKeys[i] = ToApiPublicKey(apiLink, keys[i])
|
|
|
+ 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 ListUserPublicKeys(ctx *middleware.Context) {
|
|
|
- user, err := models.GetUserByName(ctx.Params(":username"))
|
|
|
- if err != nil {
|
|
|
- if models.IsErrUserNotExist(err) {
|
|
|
- ctx.Error(404)
|
|
|
- } else {
|
|
|
- ctx.APIError(500, "GetUserByName", err)
|
|
|
- }
|
|
|
+func ListPublicKeys(ctx *middleware.Context) {
|
|
|
+ user := getUserByParams(ctx)
|
|
|
+ if ctx.Written() {
|
|
|
return
|
|
|
}
|
|
|
- listUserPublicKeys(ctx, user.Id)
|
|
|
-}
|
|
|
-
|
|
|
-// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#list-your-public-keys
|
|
|
-func ListMyPublicKeys(ctx *middleware.Context) {
|
|
|
- listUserPublicKeys(ctx, ctx.User.Id)
|
|
|
+ listPublicKeys(ctx, user.Id)
|
|
|
}
|
|
|
|
|
|
// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#get-a-single-public-key
|
|
|
-func GetUserPublicKey(ctx *middleware.Context) {
|
|
|
+func GetPublicKey(ctx *middleware.Context) {
|
|
|
key, err := models.GetPublicKeyByID(ctx.ParamsInt64(":id"))
|
|
|
if err != nil {
|
|
|
if models.IsErrKeyNotExist(err) {
|
|
@@ -76,28 +74,41 @@ func GetUserPublicKey(ctx *middleware.Context) {
|
|
|
}
|
|
|
|
|
|
apiLink := composePublicKeysAPILink()
|
|
|
- ctx.JSON(200, ToApiPublicKey(apiLink, key))
|
|
|
+ ctx.JSON(200, to.ApiPublicKey(apiLink, key))
|
|
|
}
|
|
|
|
|
|
-// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#create-a-public-key
|
|
|
-func CreateUserPublicKey(ctx *middleware.Context, form api.CreateKeyOption) {
|
|
|
+func createUserPublicKey(ctx *middleware.Context, form api.CreateKeyOption, uid int64) {
|
|
|
content, err := models.CheckPublicKeyString(form.Key)
|
|
|
if err != nil {
|
|
|
- handleCheckKeyStringError(ctx, err)
|
|
|
+ repo.HandleCheckKeyStringError(ctx, err)
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- key, err := models.AddPublicKey(ctx.User.Id, form.Title, content)
|
|
|
+ key, err := models.AddPublicKey(uid, form.Title, content)
|
|
|
if err != nil {
|
|
|
- handleAddKeyError(ctx, err)
|
|
|
+ repo.HandleAddKeyError(ctx, err)
|
|
|
return
|
|
|
}
|
|
|
apiLink := composePublicKeysAPILink()
|
|
|
- ctx.JSON(201, ToApiPublicKey(apiLink, key))
|
|
|
+ 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 DeleteUserPublicKey(ctx *middleware.Context) {
|
|
|
+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")
|