✨ Realm permission check
This commit is contained in:
parent
798e78ff8e
commit
012ee55c3a
@ -8,18 +8,19 @@ import "time"
|
|||||||
type Account struct {
|
type Account struct {
|
||||||
BaseModel
|
BaseModel
|
||||||
|
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Nick string `json:"nick"`
|
Nick string `json:"nick"`
|
||||||
Avatar string `json:"avatar"`
|
Avatar string `json:"avatar"`
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
EmailAddress string `json:"email_address"`
|
EmailAddress string `json:"email_address"`
|
||||||
PowerLevel int `json:"power_level"`
|
PowerLevel int `json:"power_level"`
|
||||||
Posts []Post `json:"posts" gorm:"foreignKey:AuthorID"`
|
Posts []Post `json:"posts" gorm:"foreignKey:AuthorID"`
|
||||||
Attachments []Attachment `json:"attachments" gorm:"foreignKey:AuthorID"`
|
Attachments []Attachment `json:"attachments" gorm:"foreignKey:AuthorID"`
|
||||||
LikedPosts []PostLike `json:"liked_posts"`
|
LikedPosts []PostLike `json:"liked_posts"`
|
||||||
DislikedPosts []PostDislike `json:"disliked_posts"`
|
DislikedPosts []PostDislike `json:"disliked_posts"`
|
||||||
Realms []Realm `json:"realms"`
|
RealmIdentities []RealmMember `json:"identities"`
|
||||||
ExternalID uint `json:"external_id"`
|
Realms []Realm `json:"realms"`
|
||||||
|
ExternalID uint `json:"external_id"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AccountMembership struct {
|
type AccountMembership struct {
|
||||||
|
@ -3,8 +3,17 @@ package models
|
|||||||
type Realm struct {
|
type Realm struct {
|
||||||
BaseModel
|
BaseModel
|
||||||
|
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
Posts []Post `json:"posts"`
|
Posts []Post `json:"posts"`
|
||||||
AccountID uint `json:"account_id"`
|
Members []RealmMember `json:"members"`
|
||||||
|
IsPublic bool `json:"is_public"`
|
||||||
|
AccountID uint `json:"account_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type RealmMember struct {
|
||||||
|
BaseModel
|
||||||
|
|
||||||
|
RealmID uint `json:"realm_id"`
|
||||||
|
AccountID uint `json:"account_id"`
|
||||||
}
|
}
|
||||||
|
@ -49,13 +49,14 @@ func createRealm(c *fiber.Ctx) error {
|
|||||||
var data struct {
|
var data struct {
|
||||||
Name string `json:"name" validate:"required"`
|
Name string `json:"name" validate:"required"`
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
|
IsPublic bool `json:"is_public"`
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := BindAndValidate(c, &data); err != nil {
|
if err := BindAndValidate(c, &data); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
realm, err := services.NewRealm(user, data.Name, data.Description)
|
realm, err := services.NewRealm(user, data.Name, data.Description, data.IsPublic)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fiber.NewError(fiber.StatusBadRequest, err.Error())
|
return fiber.NewError(fiber.StatusBadRequest, err.Error())
|
||||||
}
|
}
|
||||||
@ -63,6 +64,40 @@ func createRealm(c *fiber.Ctx) error {
|
|||||||
return c.JSON(realm)
|
return c.JSON(realm)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func inviteRealm(c *fiber.Ctx) error {
|
||||||
|
user := c.Locals("principal").(models.Account)
|
||||||
|
realmId, _ := c.ParamsInt("realmId", 0)
|
||||||
|
|
||||||
|
var data struct {
|
||||||
|
AccountID uint `json:"account_id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := BindAndValidate(c, &data); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
var realm models.Realm
|
||||||
|
if err := database.C.Where(&models.Realm{
|
||||||
|
BaseModel: models.BaseModel{ID: uint(realmId)},
|
||||||
|
AccountID: user.ID,
|
||||||
|
}).First(&realm).Error; err != nil {
|
||||||
|
return fiber.NewError(fiber.StatusNotFound, err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
var account models.Account
|
||||||
|
if err := database.C.Where(&models.Account{
|
||||||
|
BaseModel: models.BaseModel{ID: uint(realmId)},
|
||||||
|
}).First(&account).Error; err != nil {
|
||||||
|
return fiber.NewError(fiber.StatusNotFound, err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := services.InviteRealmMember(account, realm); err != nil {
|
||||||
|
return fiber.NewError(fiber.StatusBadRequest, err.Error())
|
||||||
|
} else {
|
||||||
|
return c.SendStatus(fiber.StatusOK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func editRealm(c *fiber.Ctx) error {
|
func editRealm(c *fiber.Ctx) error {
|
||||||
user := c.Locals("principal").(models.Account)
|
user := c.Locals("principal").(models.Account)
|
||||||
id, _ := c.ParamsInt("realmId", 0)
|
id, _ := c.ParamsInt("realmId", 0)
|
||||||
@ -70,6 +105,7 @@ func editRealm(c *fiber.Ctx) error {
|
|||||||
var data struct {
|
var data struct {
|
||||||
Name string `json:"name" validate:"required"`
|
Name string `json:"name" validate:"required"`
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
|
IsPublic bool `json:"is_public"`
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := BindAndValidate(c, &data); err != nil {
|
if err := BindAndValidate(c, &data); err != nil {
|
||||||
@ -84,7 +120,7 @@ func editRealm(c *fiber.Ctx) error {
|
|||||||
return fiber.NewError(fiber.StatusNotFound, err.Error())
|
return fiber.NewError(fiber.StatusNotFound, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
realm, err := services.EditRealm(realm, data.Name, data.Description)
|
realm, err := services.EditRealm(realm, data.Name, data.Description, data.IsPublic)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fiber.NewError(fiber.StatusBadRequest, err.Error())
|
return fiber.NewError(fiber.StatusBadRequest, err.Error())
|
||||||
}
|
}
|
||||||
|
@ -80,6 +80,7 @@ func NewServer() {
|
|||||||
api.Get("/realms/me", auth, listOwnedRealm)
|
api.Get("/realms/me", auth, listOwnedRealm)
|
||||||
api.Get("/realms/:realmId", getRealm)
|
api.Get("/realms/:realmId", getRealm)
|
||||||
api.Post("/realms", auth, createRealm)
|
api.Post("/realms", auth, createRealm)
|
||||||
|
api.Post("/realms/:realmId/invite", auth, inviteRealm)
|
||||||
api.Put("/realms/:realmId", auth, editRealm)
|
api.Put("/realms/:realmId", auth, editRealm)
|
||||||
api.Delete("/realms/:realmId", auth, deleteRealm)
|
api.Delete("/realms/:realmId", auth, deleteRealm)
|
||||||
}
|
}
|
||||||
|
@ -151,6 +151,15 @@ func NewPost(
|
|||||||
|
|
||||||
var realmId *uint
|
var realmId *uint
|
||||||
if realm != nil {
|
if realm != nil {
|
||||||
|
if !realm.IsPublic {
|
||||||
|
var member models.RealmMember
|
||||||
|
if err := database.C.Where(&models.RealmMember{
|
||||||
|
RealmID: *realmId,
|
||||||
|
AccountID: user.ID,
|
||||||
|
}).First(&member).Error; err != nil {
|
||||||
|
return post, fmt.Errorf("you aren't a part of that realm")
|
||||||
|
}
|
||||||
|
}
|
||||||
realmId = &realm.ID
|
realmId = &realm.ID
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,11 +23,15 @@ func ListRealmWithUser(user models.Account) ([]models.Realm, error) {
|
|||||||
return realms, nil
|
return realms, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewRealm(user models.Account, name, description string) (models.Realm, error) {
|
func NewRealm(user models.Account, name, description string, isPublic bool) (models.Realm, error) {
|
||||||
realm := models.Realm{
|
realm := models.Realm{
|
||||||
Name: name,
|
Name: name,
|
||||||
Description: description,
|
Description: description,
|
||||||
AccountID: user.ID,
|
AccountID: user.ID,
|
||||||
|
IsPublic: isPublic,
|
||||||
|
Members: []models.RealmMember{
|
||||||
|
{AccountID: user.ID},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
err := database.C.Save(&realm).Error
|
err := database.C.Save(&realm).Error
|
||||||
@ -35,9 +39,21 @@ func NewRealm(user models.Account, name, description string) (models.Realm, erro
|
|||||||
return realm, err
|
return realm, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func EditRealm(realm models.Realm, name, description string) (models.Realm, error) {
|
func InviteRealmMember(user models.Account, target models.Realm) error {
|
||||||
|
member := models.RealmMember{
|
||||||
|
RealmID: target.ID,
|
||||||
|
AccountID: user.ID,
|
||||||
|
}
|
||||||
|
|
||||||
|
err := database.C.Save(&member).Error
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func EditRealm(realm models.Realm, name, description string, isPublic bool) (models.Realm, error) {
|
||||||
realm.Name = name
|
realm.Name = name
|
||||||
realm.Description = description
|
realm.Description = description
|
||||||
|
realm.IsPublic = isPublic
|
||||||
|
|
||||||
err := database.C.Save(&realm).Error
|
err := database.C.Save(&realm).Error
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user