May 15, 2024 · May 15, 2024 · May 15, 2024 · May 15, 2024 · May 15, 2024 · May 16, 2024
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/audit.go b/coderd/audit.go
 CreatedAt: dblog.UserCreatedAt.Time,
 Status:    codersdk.UserStatus(dblog.UserStatus.UserStatus),
 },
 Roles: []codersdk.Role{},
 Roles: []codersdk.SlimRole{},
 }

 for _, roleName := range dblog.UserRoles {
 rbacRole, _ := rbac.RoleByName(roleName)
 user.Roles = append(user.Roles, db2sdk.Role(rbacRole))
 user.Roles = append(user.Roles, db2sdk.SlimRole(rbacRole))
 }
 }

diff --git a/coderd/coderd.go b/coderd/coderd.go
 "github.com/coder/coder/v2/coderd/provisionerdserver"
 "github.com/coder/coder/v2/coderd/rbac"
 "github.com/coder/coder/v2/coderd/rbac/policy"
 "github.com/coder/coder/v2/coderd/rbac/rolestore"
 "github.com/coder/coder/v2/coderd/schedule"
 "github.com/coder/coder/v2/coderd/telemetry"
 "github.com/coder/coder/v2/coderd/tracing"
 httpmw.AttachRequestID,
 httpmw.ExtractRealIP(api.RealIPConfig),
 httpmw.Logger(api.Logger),
 rolestore.CustomRoleMW,
 prometheusMW,
 // Build-Version is helpful for debugging.
 func(next http.Handler) http.Handler {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -196,12 +196,12 @@ func (api *API) convertAuditLog(ctx context.Context, dblog database.GetAuditLogs
		CreatedAt: dblog.UserCreatedAt.Time,
		Status: codersdk.UserStatus(dblog.UserStatus.UserStatus),
		},
		Roles: []codersdk.Role{},
		Roles: []codersdk.SlimRole{},
		}

		for _, roleName := range dblog.UserRoles {
		rbacRole, _ := rbac.RoleByName(roleName)
		user.Roles = append(user.Roles, db2sdk.Role(rbacRole))
		user.Roles = append(user.Roles, db2sdk.SlimRole(rbacRole))
		}
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,6 +61,7 @@ import (
		"github.com/coder/coder/v2/coderd/provisionerdserver"
		"github.com/coder/coder/v2/coderd/rbac"
		"github.com/coder/coder/v2/coderd/rbac/policy"
		"github.com/coder/coder/v2/coderd/rbac/rolestore"
		"github.com/coder/coder/v2/coderd/schedule"
		"github.com/coder/coder/v2/coderd/telemetry"
		"github.com/coder/coder/v2/coderd/tracing"
Expand DownExpand Up		@@ -631,6 +632,7 @@ func New(options Options) API {
		httpmw.AttachRequestID,
		httpmw.ExtractRealIP(api.RealIPConfig),
		httpmw.Logger(api.Logger),
		rolestore.CustomRoleMW,
		prometheusMW,
		// Build-Version is helpful for debugging.
		func(next http.Handler) http.Handler {
Expand Down