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

🐛 Fix leave member

Browse Source
This commit is contained in:
LittleSheep 2025-02-21 23:08:41 +08:00
parent e65713a5b2
commit e2e0cdc9b0
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,6 @@ func MapAPIs(app *fiber.App, baseURL string) {
realms.Put("/:realmId", editRealm) realms.Put("/:realmId", editRealm)
realms.Delete("/:realmId", deleteRealm) realms.Delete("/:realmId", deleteRealm)
realms.Post("/:realm/members", addRealmMember) realms.Post("/:realm/members", addRealmMember)
realms.Delete("/:realm/members/me", leaveRealm)
realms.Delete("/:realm/members/:memberId", removeRealmMember) realms.Delete("/:realm/members/:memberId", removeRealmMember)
} }

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

@ -7,6 +7,7 @@ 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 {
@ -92,7 +93,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.ParamsInt("memberId", 0) memberId := c.Params("memberId")
realm, err := services.GetRealmWithAlias(alias) realm, err := services.GetRealmWithAlias(alias)
if err != nil { if err != nil {
@ -100,11 +101,25 @@ func removeRealmMember(c *fiber.Ctx) error {
} }
var member models.RealmMember var member models.RealmMember
if err := database.C.Where(&models.RealmMember{ if strings.EqualFold(memberId, "me") {
BaseModel: models.BaseModel{ID: uint(memberId)}, if err := database.C.Where(&models.RealmMember{
RealmID: realm.ID, BaseModel: models.BaseModel{ID: user.ID},
}).First(&member).Error; err != nil { RealmID: realm.ID,
return fiber.NewError(fiber.StatusNotFound, err.Error()) }).First(&member).Error; err != nil {
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 {