feat: PAT principal in audit records and auth context

cmd/serve.go

@@ -420,8 +420,6 @@ func buildAPIDependencies(
 	organizationService := organization.NewService(organizationRepository, relationService, userService,
 		authnService, policyService, preferenceService, auditRecordRepository, roleService)
 
-	auditRecordService := auditrecord.NewService(auditRecordRepository, userService, serviceUserService, sessionService)
-
 	orgKycRepository := postgres.NewOrgKycRepository(dbc)
 	orgKycService := kyc.NewService(orgKycRepository)
 
@@ -465,6 +463,7 @@ func buildAPIDependencies(
 		authnService, serviceUserService, groupService, roleService)
 
 	userPATService := userpat.NewService(logger, userPATRepo, cfg.App.PAT, organizationService, roleService, policyService, projectService, auditRecordRepository)
+	auditRecordService := auditrecord.NewService(auditRecordRepository, userService, serviceUserService, sessionService, userPATService)
 
 	orgPATsRepository := postgres.NewOrgPATsRepository(dbc)
 	orgPATsService := orgpats.NewService(orgPATsRepository, projectService)

core/auditrecord/service.go

@@ -13,6 +13,8 @@ import (
 	frontiersession "github.com/raystack/frontier/core/authenticate/session"
 	"github.com/raystack/frontier/core/serviceuser"
 	userpkg "github.com/raystack/frontier/core/user"
+	paterrors "github.com/raystack/frontier/core/userpat/errors"
+	patModels "github.com/raystack/frontier/core/userpat/models"
 	"github.com/raystack/frontier/internal/bootstrap/schema"
 	"github.com/raystack/frontier/pkg/auditrecord"
 	"github.com/raystack/frontier/pkg/server/consts"
@@ -39,19 +41,25 @@ type ServiceUserService interface {
 	Get(ctx context.Context, id string) (serviceuser.ServiceUser, error)
 }
 
+type UserPATService interface {
+	GetByID(ctx context.Context, id string) (patModels.PAT, error)
+}
+
 type Service struct {
 	repository     Repository
 	userService    UserService
 	serviceUser    ServiceUserService
 	sessionService SessionService
+	userPATService UserPATService
 }
 
-func NewService(repository Repository, userService UserService, serviceUserService ServiceUserService, sessionService SessionService) *Service {
+func NewService(repository Repository, userService UserService, serviceUserService ServiceUserService, sessionService SessionService, userPATService UserPATService) *Service {
 	return &Service{
 		repository:     repository,
 		userService:    userService,
 		serviceUser:    serviceUserService,
 		sessionService: sessionService,
+		userPATService: userPATService,
 	}
 }
 
@@ -125,6 +133,34 @@ func (s *Service) Create(ctx context.Context, auditRecord AuditRecord) (AuditRec
 			return AuditRecord{}, false, err
 		}
 		auditRecord.Actor.Title = serviceUser.Title
+
+	case auditRecord.Actor.Type == schema.PATPrincipal:
+		pat, err := s.userPATService.GetByID(ctx, auditRecord.Actor.ID)
+		if err != nil {
+			if errors.Is(err, paterrors.ErrNotFound) {
+				return AuditRecord{}, false, ErrActorNotFound
+			}
+			return AuditRecord{}, false, err
+		}
+		auditRecord.Actor.Name = pat.Title
+		auditRecord.Actor.Title = pat.Title
+
+		user, err := s.userService.GetByID(ctx, pat.UserID)
+		if err != nil {
+			if errors.Is(err, userpkg.ErrNotExist) {
+				return AuditRecord{}, false, ErrActorNotFound
+			}
+			return AuditRecord{}, false, err
+		}
+		if auditRecord.Actor.Metadata == nil {
+			auditRecord.Actor.Metadata = make(map[string]any)
+		}
+		auditRecord.Actor.Metadata["user"] = map[string]any{
+			"id":    user.ID,
+			"name":  user.Name,
+			"title": user.Title,
+			"email": user.Email,
+		}
 	}
 
 	createdRecord, err := s.repository.Create(ctx, auditRecord)
@@ -169,12 +205,19 @@ func computeHash(auditRecord AuditRecord) string {
 // SetAuditRecordActorContext sets the audit record actor in context
 // It accepts an Actor struct but stores it as a map to avoid layer violations in repositories
 func SetAuditRecordActorContext(ctx context.Context, actor Actor) context.Context {
+	var metadataMap map[string]interface{}
+	if actor.Metadata != nil {
+		metadataMap = make(map[string]interface{}, len(actor.Metadata))
+		for k, v := range actor.Metadata {
+			metadataMap[k] = v
+		}
+	}
 	actorMap := map[string]interface{}{
 		"id":       actor.ID,
 		"type":     actor.Type,
 		"name":     actor.Name,
 		"title":    actor.Title,
-		"metadata": actor.Metadata,
+		"metadata": metadataMap,
 	}
 	return context.WithValue(ctx, consts.AuditRecordActorContextKey, actorMap)
 }