uncoment auth middleware

This commit is contained in:
ragilap
2025-12-04 18:58:20 +07:00
parent 17269d701c
commit fc14f9a98f
+57 -58
View File
@@ -3,7 +3,7 @@ package middleware
import ( import (
"strings" "strings"
// "gitlab.com/mbugroup/lti-api.git/internal/config" "gitlab.com/mbugroup/lti-api.git/internal/config"
entity "gitlab.com/mbugroup/lti-api.git/internal/entities" entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
"gitlab.com/mbugroup/lti-api.git/internal/modules/sso/session" "gitlab.com/mbugroup/lti-api.git/internal/modules/sso/session"
service "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services" service "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
@@ -31,65 +31,65 @@ type AuthContext struct {
// fine-grained authorization using the SSO access token scopes. // fine-grained authorization using the SSO access token scopes.
func Auth(userService service.UserService, requiredScopes ...string) fiber.Handler { func Auth(userService service.UserService, requiredScopes ...string) fiber.Handler {
return func(c *fiber.Ctx) error { return func(c *fiber.Ctx) error {
// token := bearerToken(c) token := bearerToken(c)
// if token == "" { if token == "" {
// token = strings.TrimSpace(c.Cookies(config.SSOAccessCookieName)) token = strings.TrimSpace(c.Cookies(config.SSOAccessCookieName))
// } }
// if token == "" { if token == "" {
// return fiber.NewError(fiber.StatusUnauthorized, "Please authenticate") return fiber.NewError(fiber.StatusUnauthorized, "Please authenticate")
// } }
// verification, err := sso.VerifyAccessToken(token) verification, err := sso.VerifyAccessToken(token)
// if err != nil { if err != nil {
// utils.Log.WithError(err).Warn("auth: token verification failed") utils.Log.WithError(err).Warn("auth: token verification failed")
// return fiber.NewError(fiber.StatusUnauthorized, "Please authenticate") return fiber.NewError(fiber.StatusUnauthorized, "Please authenticate")
// } }
// if verification.UserID == 0 { if verification.UserID == 0 {
// return fiber.NewError(fiber.StatusForbidden, "Service authentication is not permitted for this endpoint") return fiber.NewError(fiber.StatusForbidden, "Service authentication is not permitted for this endpoint")
// } }
// if err := ensureNotRevoked(c, token, verification); err != nil { if err := ensureNotRevoked(c, token, verification); err != nil {
// return err return err
// } }
// user, err := userService.GetBySSOUserID(c, verification.UserID) user, err := userService.GetBySSOUserID(c, verification.UserID)
// if err != nil || user == nil { if err != nil || user == nil {
// utils.Log.WithError(err).Warn("auth: failed to resolve user from repository") utils.Log.WithError(err).Warn("auth: failed to resolve user from repository")
// return fiber.NewError(fiber.StatusUnauthorized, "Please authenticate") return fiber.NewError(fiber.StatusUnauthorized, "Please authenticate")
// } }
// if len(requiredScopes) > 0 { if len(requiredScopes) > 0 {
// if verification.Claims == nil || !hasAllScopes(verification.Claims.Scopes(), requiredScopes) { if verification.Claims == nil || !hasAllScopes(verification.Claims.Scopes(), requiredScopes) {
// return fiber.NewError(fiber.StatusForbidden, "Insufficient scope") return fiber.NewError(fiber.StatusForbidden, "Insufficient scope")
// } }
// } }
// var roles []sso.Role var roles []sso.Role
// permissions := make(map[string]struct{}) permissions := make(map[string]struct{})
// if verification.UserID != 0 { if verification.UserID != 0 {
// if profile, err := sso.FetchProfile(c.Context(), token, verification); err != nil { if profile, err := sso.FetchProfile(c.Context(), token, verification); err != nil {
// utils.Log.WithError(err).Warn("auth: failed to fetch sso profile") utils.Log.WithError(err).Warn("auth: failed to fetch sso profile")
// } else if profile != nil { } else if profile != nil {
// roles = profile.Roles roles = profile.Roles
// for _, perm := range profile.PermissionNames() { for _, perm := range profile.PermissionNames() {
// if perm != "" { if perm != "" {
// permissions[perm] = struct{}{} permissions[perm] = struct{}{}
// } }
// } }
// } }
// } }
// ctx := &AuthContext{ ctx := &AuthContext{
// Token: token, Token: token,
// Verification: verification, Verification: verification,
// User: user, User: user,
// Roles: roles, Roles: roles,
// Permissions: permissions, Permissions: permissions,
// } }
// c.Locals(authContextLocalsKey, ctx) c.Locals(authContextLocalsKey, ctx)
// c.Locals(authUserLocalsKey, user) c.Locals(authUserLocalsKey, user)
return c.Next() return c.Next()
} }
@@ -105,12 +105,11 @@ func AuthenticatedUser(c *fiber.Ctx) (*entity.User, bool) {
} }
func ActorIDFromContext(c *fiber.Ctx) (uint, error) { func ActorIDFromContext(c *fiber.Ctx) (uint, error) {
// user, ok := AuthenticatedUser(c) user, ok := AuthenticatedUser(c)
// if !ok || user == nil || user.Id == 0 { if !ok || user == nil || user.Id == 0 {
// return 0, fiber.NewError(fiber.StatusUnauthorized, "Please authenticate") return 0, fiber.NewError(fiber.StatusUnauthorized, "Please authenticate")
// } }
// return user.Id, nil return user.Id, nil
return 1, nil
} }
// AuthDetails returns the full authentication context (token, claims, user). // AuthDetails returns the full authentication context (token, claims, user).