feat: add gitlab oauth, cleanup code

This commit is contained in:
2024-11-17 19:49:42 +07:00
parent a6cc450ea7
commit 83d0ed380d
29 changed files with 297 additions and 89 deletions
+2 -2
View File
@@ -4,13 +4,13 @@ import (
"gorm.io/gorm"
"gorm.io/gorm/clause"
"rul.sh/vaulterm/server/db"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
type TeamMembers struct {
db *gorm.DB
User *utils.UserContext
User *lib.UserContext
}
func NewRepository(r *TeamMembers) *TeamMembers {
+5 -4
View File
@@ -6,6 +6,7 @@ import (
"github.com/gofiber/fiber/v2"
"rul.sh/vaulterm/server/app/teams"
"rul.sh/vaulterm/server/app/users"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
@@ -20,7 +21,7 @@ func Router(app fiber.Router) {
}
// func getAll(c *fiber.Ctx) error {
// user := utils.GetUser(c)
// user := lib.GetUser(c)
// repo := NewRepository(&TeamMembers{User: user})
// rows, err := repo.GetAll()
@@ -37,7 +38,7 @@ func invite(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
teamRepo := teams.NewRepository(&teams.Teams{User: user})
repo := NewRepository(&TeamMembers{User: user})
@@ -70,7 +71,7 @@ func setRole(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
teamRepo := teams.NewRepository(&teams.Teams{User: user})
repo := NewRepository(&TeamMembers{User: user})
@@ -103,7 +104,7 @@ func setRole(c *fiber.Ctx) error {
}
func remove(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
teamRepo := teams.NewRepository(&teams.Teams{User: user})
repo := NewRepository(&TeamMembers{User: user})
+2 -2
View File
@@ -3,13 +3,13 @@ package teams
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 Teams struct {
db *gorm.DB
User *utils.UserContext
User *lib.UserContext
}
func NewRepository(r *Teams) *Teams {
+6 -5
View File
@@ -5,6 +5,7 @@ import (
"net/http"
"github.com/gofiber/fiber/v2"
"rul.sh/vaulterm/server/lib"
"rul.sh/vaulterm/server/models"
"rul.sh/vaulterm/server/utils"
)
@@ -22,7 +23,7 @@ func Router(app fiber.Router) fiber.Router {
}
func getAll(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Teams{User: user})
rows, err := repo.GetAll()
@@ -34,7 +35,7 @@ func getAll(c *fiber.Ctx) error {
}
func getById(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Teams{User: user})
id := c.Params("id")
@@ -52,7 +53,7 @@ func create(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Teams{User: user})
item := &models.Team{
@@ -73,7 +74,7 @@ func update(c *fiber.Ctx) error {
return utils.ResponseError(c, err, 500)
}
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Teams{User: user})
id := c.Params("id")
@@ -98,7 +99,7 @@ func update(c *fiber.Ctx) error {
}
func delete(c *fiber.Ctx) error {
user := utils.GetUser(c)
user := lib.GetUser(c)
repo := NewRepository(&Teams{User: user})
id := c.Params("id")