coder
diff --git a/‎coderd/database/dbauthz/dbauthz.go
Lines changed: 1 addition & 1 deletion b/‎coderd/database/dbauthz/dbauthz.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/database/queries.sql.go
Lines changed: 1 addition & 1 deletion b/‎coderd/database/queries.sql.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/database/queries/users.sql
Lines changed: 1 addition & 1 deletion b/‎coderd/database/queries/users.sql
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/httpmw/loggermw/logger.go
Lines changed: 13 additions & 20 deletions b/‎coderd/httpmw/loggermw/logger.go
Lines changed: 13 additions & 20 deletions
diff --git a/‎coderd/httpmw/loggermw/loggermock/loggermock.go
Lines changed: 4 additions & 4 deletions b/‎coderd/httpmw/loggermw/loggermock/loggermock.go
Lines changed: 4 additions & 4 deletions
@@ -474,7 +474,7 @@ func As(ctx context.Context, actor rbac.Subject) context.Context {
 
 func InjectActorToContext(ctx context.Context, actor rbac.Subject) context.Context {
 	if rlogger := loggermw.RequestLoggerFromContext(ctx); rlogger != nil {
-		rlogger.WithAuthContext(actor.ID, actor.FriendlyName, actor.Email, actor.Type)
+		rlogger.WithAuthContext(actor)
 	}
 	return context.WithValue(ctx, authContextKey{}, actor)
 }
 
@@ -300,7 +300,7 @@ WHERE
 -- This function returns roles for authorization purposes. Implied member roles
 -- are included.
 SELECT
-	-- username is returned just to help for logging purposes
+	-- username and email are returned just to help for logging purposes
 	-- status is used to enforce 'suspended' users, as all roles are ignored
 	--	when suspended.
 	id, username, status, email,
 
@@ -63,22 +63,15 @@ func Logger(log slog.Logger) func(next http.Handler) http.Handler {
 type RequestLogger interface {
 	WithFields(fields ...slog.Field)
 	WriteLog(ctx context.Context, status int)
-	WithAuthContext(id string, name string, email string, subjectType rbac.SubjectType)
+	WithAuthContext(actor rbac.Subject)
 }
 
 type SlogRequestLogger struct {
 	log     slog.Logger
 	written bool
 	message string
 	start   time.Time
-	authCtx map[rbac.SubjectType]authContext
-}
-
-type authContext struct {
-	id          string
-	name        string
-	email       string
-	subjectType rbac.SubjectType
+	actors  map[rbac.SubjectType]rbac.Subject
 }
 
 var _ RequestLogger = &SlogRequestLogger{}
@@ -89,30 +82,30 @@ func NewRequestLogger(log slog.Logger, message string, start time.Time) RequestL
 		written: false,
 		message: message,
 		start:   start,
-		authCtx: make(map[rbac.SubjectType]authContext),
+		actors:  make(map[rbac.SubjectType]rbac.Subject),
 	}
 }
 
 func (c *SlogRequestLogger) WithFields(fields ...slog.Field) {
 	c.log = c.log.With(fields...)
 }
 
-func (c *SlogRequestLogger) WithAuthContext(id string, name string, email string, subjectType rbac.SubjectType) {
-	c.authCtx[subjectType] = authContext{id, name, email, subjectType}
+func (c *SlogRequestLogger) WithAuthContext(actor rbac.Subject) {
+	c.actors[actor.Type] = actor
 }
 
 func (c *SlogRequestLogger) addAuthContextFields() {
-	usr, ok := c.authCtx[rbac.SubjectTypeUser]
+	usr, ok := c.actors[rbac.SubjectTypeUser]
 	if ok {
 		c.log = c.log.With(
-			slog.F("requestor_id", usr.id),
-			slog.F("requestor_name", usr.name),
-			slog.F("requestor_email", usr.email),
+			slog.F("requestor_id", usr.ID),
+			slog.F("requestor_name", usr.FriendlyName),
+			slog.F("requestor_email", usr.Email),
 		)
-	} else if len(c.authCtx) > 0 {
-		for _, v := range c.authCtx {
+	} else if len(c.actors) > 0 {
+		for _, v := range c.actors {
 			c.log = c.log.With(
-				slog.F("requestor_name", v.name),
+				slog.F("requestor_name", v.FriendlyName),
 			)
 			break
 		}
@@ -126,7 +119,7 @@ func (c *SlogRequestLogger) WriteLog(ctx context.Context, status int) {
 	c.written = true
 	end := time.Now()
 
-	// Right before we write the log, we try to find the user in the authCtx
+	// Right before we write the log, we try to find the user in the actors
 	// and add the fields to the log.
 	c.addAuthContextFields()
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ func As(ctx context.Context, actor rbac.Subject) context.Context {`
`474`	`474`
`475`	`475`	`func InjectActorToContext(ctx context.Context, actor rbac.Subject) context.Context {`
`476`	`476`	`if rlogger := loggermw.RequestLoggerFromContext(ctx); rlogger != nil {`
`477`		`- rlogger.WithAuthContext(actor.ID, actor.FriendlyName, actor.Email, actor.Type)`
	`477`	`+ rlogger.WithAuthContext(actor)`
`478`	`478`	`}`
`479`	`479`	`return context.WithValue(ctx, authContextKey{}, actor)`
`480`	`480`	`}`