🔀 Merge rolled back changes

This commit is contained in:
2024-10-31 00:23:53 +08:00
parent 2fcc784bc4
commit e6f6389eb0
20 changed files with 78 additions and 106 deletions

View File

@ -2,13 +2,13 @@ package exts
import (
"fmt"
"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
"github.com/gofiber/fiber/v2"
)
func EnsureAuthenticated(c *fiber.Ctx) error {
if _, ok := c.Locals("user").(models.Account); !ok {
if _, ok := c.Locals("nex_user").(*sec.UserInfo); !ok {
return fiber.NewError(fiber.StatusUnauthorized)
}
@ -19,7 +19,7 @@ func EnsureGrantedPerm(c *fiber.Ctx, key string, val any) error {
if err := EnsureAuthenticated(c); err != nil {
return err
}
perms := c.Locals("user").(*sec.UserInfo).PermNodes
perms := c.Locals("nex_user").(*sec.UserInfo).PermNodes
if !services.HasPermNode(perms, key, val) {
return fiber.NewError(fiber.StatusForbidden, fmt.Sprintf("missing permission: %s", key))
}