khairul169/vaulterm
1
0
Fork 0
mirror of https://github.com/khairul169/vaulterm.git synced 2026-09-15 17:03:30 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add gitlab oauth, cleanup code

Browse Source
This commit is contained in:
khairul169
2024-11-17 19:49:42 +07:00
parent a6cc450ea7
commit 83d0ed380d
29 changed files with 297 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app/hosts/repository.go
+2 -2
View File
@@ -3,13 +3,13 @@ package hosts
import (
"gorm.io/gorm"
"rul.sh/vaulterm/server/db"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
type Hosts struct {
db *gorm.DB
User *utils.UserContext
User *lib.UserContext
}
func NewRepository(r *Hosts) *Hosts {
server/app/hosts/router.go
+6 -5
View File
@@ -7,6 +7,7 @@ import (
"strings"
"github.com/gofiber/fiber/v2"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
@@ -25,7 +26,7 @@ func getAll(c *fiber.Ctx) error {
teamId := c.Query("teamId")
parentId := c.Query("parentId")
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Hosts{User: user})
if teamId != "" && !user.IsInTeam(&teamId) {
@@ -48,7 +49,7 @@ func create(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Hosts{User: user})
if body.TeamID != nil && !user.TeamCanWrite(body.TeamID) {
@@ -87,7 +88,7 @@ func update(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Hosts{User: user})
id := c.Params("id")
@@ -126,7 +127,7 @@ func update(c *fiber.Ctx) error {
}
func delete(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Hosts{User: user})
id := c.Params("id")
@@ -149,7 +150,7 @@ func delete(c *fiber.Ctx) error {
}
func move(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Hosts{User: user})
// validate request
server/app/hosts/utils.go
+1 -2
View File
@@ -7,11 +7,10 @@ import (
"rul.sh/vaulterm/server/app/keychains"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
func tryConnect(c *fiber.Ctx, host *models.Host) (string, error) {
user := utils.GetUser(c)
user := lib.GetUser(c)
keyRepo := keychains.NewRepository(&keychains.Keychains{User: user})
var key map[string]interface{}