more APIs on #12

3 files changed, 75 insertions, 3 deletions

diff --git a/routers/api/v1/repo_hooks.go b/routers/api/v1/repo_hooks.go
index 49bf8e4679..5dddbc5a3d 100644
--- a/routers/api/v1/repo_hooks.go
+++ b/routers/api/v1/repo_hooks.go
@@ -107,9 +107,21 @@ func CreateRepoHook(ctx *middleware.Context, form CreateRepoHookForm) {
 		return
 	}
 
-	ctx.JSON(201, map[string]interface{}{
-		"ok": true,
-	})
+	apiHook := &api.Hook{
+		Id:     w.Id,
+		Type:   w.HookTaskType.Name(),
+		Events: []string{"push"},
+		Active: w.IsActive,
+		Config: map[string]string{
+			"url":          w.Url,
+			"content_type": w.ContentType.Name(),
+		},
+	}
+	if w.HookTaskType == models.SLACK {
+		s := w.GetSlackHook()
+		apiHook.Config["channel"] = s.Channel
+	}
+	ctx.JSON(201, apiHook)
 }
 
 type EditRepoHookForm struct {
diff --git a/routers/api/v1/users.go b/routers/api/v1/user.go
index e0f51ca847..2b41adaeac 100644
--- a/routers/api/v1/users.go
+++ b/routers/api/v1/user.go
@@ -10,6 +10,7 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/middleware"
 )
 
@@ -44,3 +45,17 @@ func SearchUsers(ctx *middleware.Context) {
 		"data": results,
 	})
 }
+
+// GET /users/:username
+func GetUserInfo(ctx *middleware.Context) {
+	u, err := models.GetUserByName(ctx.Params(":username"))
+	if err != nil {
+		if err == models.ErrUserNotExist {
+			ctx.Error(404)
+		} else {
+			ctx.JSON(500, &base.ApiJsonErr{"GetUserByName: " + err.Error(), base.DOC_URL})
+		}
+		return
+	}
+	ctx.JSON(200, &api.User{u.Id, u.Name, u.FullName, u.Email, u.AvatarLink()})
+}
diff --git a/routers/api/v1/user_app.go b/routers/api/v1/user_app.go
new file mode 100644
index 0000000000..31da8a3eef
--- /dev/null
+++ b/routers/api/v1/user_app.go
@@ -0,0 +1,45 @@
+// 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 v1
+
+import (
+	api "github.com/gogits/go-gogs-client"
+
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/modules/middleware"
+)
+
+// GET /users/:username/tokens
+func ListAccessTokens(ctx *middleware.Context) {
+	tokens, err := models.ListAccessTokens(ctx.User.Id)
+	if err != nil {
+		ctx.JSON(500, &base.ApiJsonErr{"ListAccessTokens: " + err.Error(), base.DOC_URL})
+		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)
+}
+
+type CreateAccessTokenForm struct {
+	Name string `json:"name" binding:"Required"`
+}
+
+// POST /users/:username/tokens
+func CreateAccessToken(ctx *middleware.Context, form CreateAccessTokenForm) {
+	t := &models.AccessToken{
+		Uid:  ctx.User.Id,
+		Name: form.Name,
+	}
+	if err := models.NewAccessToken(t); err != nil {
+		ctx.JSON(500, &base.ApiJsonErr{"NewAccessToken: " + err.Error(), base.DOC_URL})
+		return
+	}
+	ctx.JSON(201, &api.AccessToken{t.Name, t.Sha1})
+}