evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善指令的授权

Browse Source
This commit is contained in:
dushixiang
2021-01-16 01:27:24 +08:00
parent 1a3f7acd1e
commit 44110722b2
13 changed files with 440 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/api/asset.go
View File

@ -15,6 +15,8 @@ func AssetCreateEndpoint(c echo.Context) error {
return err
}
account, _ := GetCurrentAccount(c)
item.Owner = account.ID
item.ID = utils.UUID()
item.Created = utils.NowJsonTime()
@ -32,17 +34,8 @@ func AssetPagingEndpoint(c echo.Context) error {
protocol := c.QueryParam("protocol")
tags := c.QueryParam("tags")
var (
total int64
items []model.AssetVo
)
account, _ := GetCurrentAccount(c)
if account.Role == model.RoleUser {
items, total, _ = model.FindPageAsset(pageIndex, pageSize, name, protocol, tags, account.ID)
} else {
items, total, _ = model.FindPageAsset(pageIndex, pageSize, name, protocol, tags, "")
}
items, total, _ := model.FindPageAsset(pageIndex, pageSize, name, protocol, tags, account)
return Success(c, H{
"total": total,
@ -52,7 +45,8 @@ func AssetPagingEndpoint(c echo.Context) error {
func AssetAllEndpoint(c echo.Context) error {
protocol := c.QueryParam("protocol")
items, _ := model.FindAssetByConditions(protocol)
account, _ := GetCurrentAccount(c)
items, _ := model.FindAssetByConditions(protocol, account)
return Success(c, items)
}

30
pkg/api/command.go
View File

@ -1,6 +1,7 @@
package api
import (
"errors"
"github.com/labstack/echo/v4"
"next-terminal/pkg/model"
"next-terminal/pkg/utils"
@ -14,6 +15,8 @@ func CommandCreateEndpoint(c echo.Context) error {
return err
}
account, _ := GetCurrentAccount(c)
item.Owner = account.ID
item.ID = utils.UUID()
item.Created = utils.NowJsonTime()
@ -29,8 +32,9 @@ func CommandPagingEndpoint(c echo.Context) error {
pageSize, _ := strconv.Atoi(c.QueryParam("pageSize"))
name := c.QueryParam("name")
content := c.QueryParam("content")
account, _ := GetCurrentAccount(c)
items, total, _ := model.FindPageCommand(pageIndex, pageSize, name, content)
items, total, _ := model.FindPageCommand(pageIndex, pageSize, name, content, account)
return Success(c, H{
"total": total,
@ -68,3 +72,27 @@ func CommandGetEndpoint(c echo.Context) (err error) {
}
return Success(c, item)
}
func CommandChangeOwnerEndpoint(c echo.Context) (err error) {
id := c.Param("id")
if err := PreCheckCommandPermission(c, id); err != nil {
return err
}
owner := c.QueryParam("owner")
model.UpdateCommandById(&model.Command{Owner: owner}, id)
return Success(c, "")
}
func PreCheckCommandPermission(c echo.Context, id string) error {
item, err := model.FindCommandById(id)
if err != nil {
return err
}
if !HasPermission(c, item.Owner) {
return errors.New("permission denied")
}
return nil
}

16
pkg/api/credential.go
View File

@ -10,7 +10,8 @@ import (
)
func CredentialAllEndpoint(c echo.Context) error {
items, _ := model.FindAllCredential()
account, _ := GetCurrentAccount(c)
items, _ := model.FindAllCredential(account)
return Success(c, items)
}
func CredentialCreateEndpoint(c echo.Context) error {
@ -19,6 +20,8 @@ func CredentialCreateEndpoint(c echo.Context) error {
return err
}
account, _ := GetCurrentAccount(c)
item.Owner = account.ID
item.ID = utils.UUID()
item.Created = utils.NowJsonTime()
@ -59,17 +62,8 @@ func CredentialPagingEndpoint(c echo.Context) error {
pageSize, _ := strconv.Atoi(c.QueryParam("pageSize"))
name := c.QueryParam("name")
var (
total int64
items []model.CredentialVo
)
account, _ := GetCurrentAccount(c)
if account.Role == model.RoleUser {
items, total, _ = model.FindPageCredential(pageIndex, pageSize, name, account.ID)
} else {
items, total, _ = model.FindPageCredential(pageIndex, pageSize, name, "")
}
items, total, _ := model.FindPageCredential(pageIndex, pageSize, name, account)
return Success(c, H{
"total": total,

1
pkg/api/routes.go
View File

@ -72,6 +72,7 @@ func SetupRoutes() *echo.Echo {
commands.PUT("/:id", CommandUpdateEndpoint)
commands.DELETE("/:id", CommandDeleteEndpoint)
commands.GET("/:id", CommandGetEndpoint)
commands.POST("/:id/change-owner", CommandChangeOwnerEndpoint)
}
credentials := e.Group("/credentials")