From 762063ed8fbcd344018500220d9939b3c47057ff Mon Sep 17 00:00:00 2001
From: Colin Adler <colin1adler@gmail.com>
Date: Wed, 7 Sep 2022 14:22:04 -0500
Subject: [PATCH] fix: add `avatar_url` to user object in audit log response
 (#3939)

---
 coderd/audit.go                       | 1 +
 coderd/audit/request.go               | 1 +
 coderd/database/queries.sql.go        | 5 ++++-
 coderd/database/queries/auditlogs.sql | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/coderd/audit.go b/coderd/audit.go
index 2c86c8ce78..986ba97504 100644
--- a/coderd/audit.go
+++ b/coderd/audit.go
@@ -143,6 +143,7 @@ func convertAuditLog(dblog database.GetAuditLogsOffsetRow) codersdk.AuditLog {
 			CreatedAt: dblog.UserCreatedAt.Time,
 			Status:    codersdk.UserStatus(dblog.UserStatus),
 			Roles:     []codersdk.Role{},
+			AvatarURL: dblog.UserAvatarUrl.String,
 		}
 
 		for _, roleName := range dblog.UserRoles {
diff --git a/coderd/audit/request.go b/coderd/audit/request.go
index 7fcd383287..d4f1b05feb 100644
--- a/coderd/audit/request.go
+++ b/coderd/audit/request.go
@@ -74,6 +74,7 @@ func InitRequest[T Auditable](w http.ResponseWriter, p *RequestParams) (*Request
 		})
 		if err != nil {
 			p.Log.Error(ctx, "export audit log", slog.Error(err))
+			return
 		}
 	}
 }
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
index 9792595b0f..b7d574e96b 100644
--- a/coderd/database/queries.sql.go
+++ b/coderd/database/queries.sql.go
@@ -308,7 +308,8 @@ SELECT
     users.email AS user_email,
     users.created_at AS user_created_at,
     users.status AS user_status,
-    users.rbac_roles AS user_roles
+    users.rbac_roles AS user_roles,
+    users.avatar_url AS user_avatar_url
 FROM
 	audit_logs
 LEFT JOIN
@@ -347,6 +348,7 @@ type GetAuditLogsOffsetRow struct {
 	UserCreatedAt    sql.NullTime    `db:"user_created_at" json:"user_created_at"`
 	UserStatus       UserStatus      `db:"user_status" json:"user_status"`
 	UserRoles        []string        `db:"user_roles" json:"user_roles"`
+	UserAvatarUrl    sql.NullString  `db:"user_avatar_url" json:"user_avatar_url"`
 }
 
 // GetAuditLogsBefore retrieves `row_limit` number of audit logs before the provided
@@ -381,6 +383,7 @@ func (q *sqlQuerier) GetAuditLogsOffset(ctx context.Context, arg GetAuditLogsOff
 			&i.UserCreatedAt,
 			&i.UserStatus,
 			pq.Array(&i.UserRoles),
+			&i.UserAvatarUrl,
 		); err != nil {
 			return nil, err
 		}
diff --git a/coderd/database/queries/auditlogs.sql b/coderd/database/queries/auditlogs.sql
index b7b6c93020..0c2364f828 100644
--- a/coderd/database/queries/auditlogs.sql
+++ b/coderd/database/queries/auditlogs.sql
@@ -7,7 +7,8 @@ SELECT
     users.email AS user_email,
     users.created_at AS user_created_at,
     users.status AS user_status,
-    users.rbac_roles AS user_roles
+    users.rbac_roles AS user_roles,
+    users.avatar_url AS user_avatar_url
 FROM
 	audit_logs
 LEFT JOIN