HyperNet/Passport
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix leave realm

Browse Source
This commit is contained in:
LittleSheep 2025-02-22 00:27:26 +08:00
parent 701d9b1929
commit e737d31fd9
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/internal/http/api/index.go
View File

@ -152,6 +152,7 @@ func MapAPIs(app *fiber.App, baseURL string) {
realms.Delete("/:realmId", deleteRealm) realms.Delete("/:realmId", deleteRealm)
realms.Post("/:realm/members", addRealmMember) realms.Post("/:realm/members", addRealmMember)
realms.Delete("/:realm/members/:memberId", removeRealmMember) realms.Delete("/:realm/members/:memberId", removeRealmMember)
realms.Delete("/:realm/me", leaveRealm)
} }
developers := api.Group("/dev").Name("Developers API") developers := api.Group("/dev").Name("Developers API")

27
pkg/internal/http/api/realm_members_api.go
View File

@ -7,7 +7,6 @@ import (
"git.solsynth.dev/hypernet/passport/pkg/internal/services" "git.solsynth.dev/hypernet/passport/pkg/internal/services"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
"strconv" "strconv"
"strings"
) )
func listRealmMembers(c *fiber.Ctx) error { func listRealmMembers(c *fiber.Ctx) error {
@ -93,7 +92,7 @@ func removeRealmMember(c *fiber.Ctx) error {
} }
user := c.Locals("user").(models.Account) user := c.Locals("user").(models.Account)
alias := c.Params("realm") alias := c.Params("realm")
memberId := c.Params("memberId") memberId, _ := c.ParamsInt("memberId", 0)
realm, err := services.GetRealmWithAlias(alias) realm, err := services.GetRealmWithAlias(alias)
if err != nil { if err != nil {
@ -101,25 +100,11 @@ func removeRealmMember(c *fiber.Ctx) error {
} }
var member models.RealmMember var member models.RealmMember
if strings.EqualFold(memberId, "me") { if err := database.C.Where(&models.RealmMember{
if err := database.C.Where(&models.RealmMember{ BaseModel: models.BaseModel{ID: uint(memberId)},
BaseModel: models.BaseModel{ID: user.ID}, RealmID: realm.ID,
RealmID: realm.ID, }).First(&member).Error; err != nil {
}).First(&member).Error; err != nil { return fiber.NewError(fiber.StatusNotFound, err.Error())
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
} else {
numericId, err := strconv.Atoi(memberId)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, "invalid member id")
}
if err := database.C.Where(&models.RealmMember{
BaseModel: models.BaseModel{ID: uint(numericId)},
RealmID: realm.ID,
}).First(&member).Error; err != nil {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
} }
if err := services.RemoveRealmMember(user, member, realm); err != nil { if err := services.RemoveRealmMember(user, member, realm); err != nil {