Mar 5, 2025 · Feb 13, 2025 · Feb 13, 2025 · Feb 14, 2025 · Feb 14, 2025 · Feb 14, 2025
diff --git a/cli/testdata/coder_users_list_--output_json.golden b/cli/testdata/coder_users_list_--output_json.golden
    "last_seen_at": "====[timestamp]=====",
    "status": "active",
    "login_type": "password",
    "theme_preference": "",
    "organization_ids": [
      "===========[first org ID]==========="
    ],
    "last_seen_at": "====[timestamp]=====",
    "status": "dormant",
    "login_type": "password",
    "theme_preference": "",
    "organization_ids": [
      "===========[first org ID]==========="
    ],
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
 Deleted:            dblog.UserDeleted.Bool,
 LastSeenAt:         dblog.UserLastSeenAt.Time,
 QuietHoursSchedule: dblog.UserQuietHoursSchedule.String,
 ThemePreference:    dblog.UserThemePreference.String,
 Name:               dblog.UserName.String,
 }, []uuid.UUID{})
 user = &sdkUser
diff --git a/coderd/coderd.go b/coderd/coderd.go
 r.Put("/suspend", api.putSuspendUserAccount())
 r.Put("/activate", api.putActivateUserAccount())
 })
 r.Get("/appearance", api.userAppearanceSettings)
 r.Put("/appearance", api.putUserAppearanceSettings)
 r.Route("/password", func(r chi.Router) {
 r.Use(httpmw.RateLimit(options.LoginRateLimit, time.Minute))
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
 Username:  user.Username,
 AvatarURL: user.AvatarURL,
 },
 Email:           user.Email,
 Name:            user.Name,
 CreatedAt:       user.CreatedAt,
 UpdatedAt:       user.UpdatedAt,
 LastSeenAt:      user.LastSeenAt,
 Status:          codersdk.UserStatus(user.Status),
 LoginType:       codersdk.LoginType(user.LoginType),
 ThemePreference: user.ThemePreference,
 Email:      user.Email,
 Name:       user.Name,
 CreatedAt:  user.CreatedAt,
 UpdatedAt:  user.UpdatedAt,
 LastSeenAt: user.LastSeenAt,
 Status:     codersdk.UserStatus(user.Status),
 LoginType:  codersdk.LoginType(user.LoginType),
 }
 }

 Deleted:            member.UserDeleted,
 LastSeenAt:         member.UserLastSeenAt,
 QuietHoursSchedule: member.UserQuietHoursSchedule,
 ThemePreference:    member.UserThemePreference,
 Name:               member.UserName,
 GithubComUserID:    member.UserGithubComUserID,
 }
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return q.db.GetUserActivityInsights(ctx, arg)
 }

 func (q *querier) GetUserAppearanceSettings(ctx context.Context, userID uuid.UUID) (string, error) {
 u, err := q.db.GetUserByID(ctx, userID)
 if err != nil {
 return "", err
 }
 if err := q.authorizeContext(ctx, policy.ActionReadPersonal, u); err != nil {
 return "", err
 }
 return q.db.GetUserAppearanceSettings(ctx, userID)
 }

 func (q *querier) GetUserByEmailOrUsername(ctx context.Context, arg database.GetUserByEmailOrUsernameParams) (database.User, error) {
 return fetch(q.log, q.auth, q.db.GetUserByEmailOrUsername)(ctx, arg)
 }
 return fetchAndExec(q.log, q.auth, policy.ActionUpdate, fetch, q.db.UpdateTemplateWorkspacesLastUsedAt)(ctx, arg)
 }

 func (q *querier) UpdateUserAppearanceSettings(ctx context.Context, arg database.UpdateUserAppearanceSettingsParams) (database.User, error) {
 u, err := q.db.GetUserByID(ctx, arg.ID)
 func (q *querier) UpdateUserAppearanceSettings(ctx context.Context, arg database.UpdateUserAppearanceSettingsParams) (database.UserConfig, error) {
 u, err := q.db.GetUserByID(ctx, arg.UserID)
 if err != nil {
 return database.User{}, err
 return database.UserConfig{}, err
 }
 if err := q.authorizeContext(ctx, policy.ActionUpdatePersonal, u); err != nil {
 return database.User{}, err
 return database.UserConfig{}, err
 }
 return q.db.UpdateUserAppearanceSettings(ctx, arg)
 }
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 []database.GetUserWorkspaceBuildParametersRow{},
 )
 }))
 s.Run("GetUserAppearanceSettings", s.Subtest(func(db database.Store, check *expects) {
 ctx := context.Background()
 u := dbgen.User(s.T(), db, database.User{})
 db.UpdateUserAppearanceSettings(ctx, database.UpdateUserAppearanceSettingsParams{
 UserID:          u.ID,
 ThemePreference: "light",
 })
 check.Args(u.ID).Asserts(u, policy.ActionReadPersonal).Returns("light")
 }))
 s.Run("UpdateUserAppearanceSettings", s.Subtest(func(db database.Store, check *expects) {
 u := dbgen.User(s.T(), db, database.User{})
 uc := database.UserConfig{
 UserID: u.ID,
 Key:    "theme_preference",
 Value:  "dark",
 }
 check.Args(database.UpdateUserAppearanceSettingsParams{
 ID:              u.ID,
 ThemePreference: u.ThemePreference,
 UpdatedAt:       u.UpdatedAt,
 }).Asserts(u, policy.ActionUpdatePersonal).Returns(u)
 UserID:          u.ID,
 ThemePreference: uc.Value,
 }).Asserts(u, policy.ActionUpdatePersonal).Returns(uc)
 }))
 s.Run("UpdateUserStatus", s.Subtest(func(db database.Store, check *expects) {
 u := dbgen.User(s.T(), db, database.User{})
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
 UserDeleted:            user.Deleted,
 UserLastSeenAt:         user.LastSeenAt,
 UserQuietHoursSchedule: user.QuietHoursSchedule,
 UserThemePreference:    user.ThemePreference,
 UserName:               user.Name,
 UserGithubComUserID:    user.GithubComUserID,
 OrganizationID:         group.OrganizationID,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,7 +10,6 @@
		"last_seen_at": "====[timestamp]=====",
		"status": "active",
		"login_type": "password",
		"theme_preference": "",
		"organization_ids": [
		"===========[first org ID]==========="
		],
Expand All		@@ -32,7 +31,6 @@
		"last_seen_at": "====[timestamp]=====",
		"status": "dormant",
		"login_type": "password",
		"theme_preference": "",
		"organization_ids": [
		"===========[first org ID]==========="
		],
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -204,7 +204,6 @@ func (api *API) convertAuditLog(ctx context.Context, dblog database.GetAuditLogs
		Deleted: dblog.UserDeleted.Bool,
		LastSeenAt: dblog.UserLastSeenAt.Time,
		QuietHoursSchedule: dblog.UserQuietHoursSchedule.String,
		ThemePreference: dblog.UserThemePreference.String,
aslilac marked this conversation as resolved. Show resolvedHide resolved
		Name: dblog.UserName.String,
		}, []uuid.UUID{})
		user = &sdkUser
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1145,6 +1145,7 @@ func New(options Options) API {
		r.Put("/suspend", api.putSuspendUserAccount())
		r.Put("/activate", api.putActivateUserAccount())
		})
		r.Get("/appearance", api.userAppearanceSettings)
		r.Put("/appearance", api.putUserAppearanceSettings)
		r.Route("/password", func(r chi.Router) {
		r.Use(httpmw.RateLimit(options.LoginRateLimit, time.Minute))
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -150,14 +150,13 @@ func ReducedUser(user database.User) codersdk.ReducedUser {
		Username: user.Username,
		AvatarURL: user.AvatarURL,
		},
		Email: user.Email,
		Name: user.Name,
		CreatedAt: user.CreatedAt,
		UpdatedAt: user.UpdatedAt,
		LastSeenAt: user.LastSeenAt,
		Status: codersdk.UserStatus(user.Status),
		LoginType: codersdk.LoginType(user.LoginType),
		ThemePreference: user.ThemePreference,
		Email: user.Email,
		Name: user.Name,
		CreatedAt: user.CreatedAt,
		UpdatedAt: user.UpdatedAt,
		LastSeenAt: user.LastSeenAt,
		Status: codersdk.UserStatus(user.Status),
		LoginType: codersdk.LoginType(user.LoginType),
		}
		}

Expand All		@@ -176,7 +175,6 @@ func UserFromGroupMember(member database.GroupMember) database.User {
		Deleted: member.UserDeleted,
		LastSeenAt: member.UserLastSeenAt,
		QuietHoursSchedule: member.UserQuietHoursSchedule,
		ThemePreference: member.UserThemePreference,
		Name: member.UserName,
		GithubComUserID: member.UserGithubComUserID,
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2510,6 +2510,17 @@ func (q *querier) GetUserActivityInsights(ctx context.Context, arg database.GetU
		return q.db.GetUserActivityInsights(ctx, arg)
		}

		func (q *querier) GetUserAppearanceSettings(ctx context.Context, userID uuid.UUID) (string, error) {
		u, err := q.db.GetUserByID(ctx, userID)
		if err != nil {
		return "", err
		}
		if err := q.authorizeContext(ctx, policy.ActionReadPersonal, u); err != nil {
		return "", err
		}
		return q.db.GetUserAppearanceSettings(ctx, userID)
		}

		func (q *querier) GetUserByEmailOrUsername(ctx context.Context, arg database.GetUserByEmailOrUsernameParams) (database.User, error) {
		return fetch(q.log, q.auth, q.db.GetUserByEmailOrUsername)(ctx, arg)
		}
Expand DownExpand Up		@@ -4021,13 +4032,13 @@ func (q *querier) UpdateTemplateWorkspacesLastUsedAt(ctx context.Context, arg da
		return fetchAndExec(q.log, q.auth, policy.ActionUpdate, fetch, q.db.UpdateTemplateWorkspacesLastUsedAt)(ctx, arg)
		}

		func (q *querier) UpdateUserAppearanceSettings(ctx context.Context, arg database.UpdateUserAppearanceSettingsParams) (database.User, error) {
		u, err := q.db.GetUserByID(ctx, arg.ID)
		func (q *querier) UpdateUserAppearanceSettings(ctx context.Context, arg database.UpdateUserAppearanceSettingsParams) (database.UserConfig, error) {
		u, err := q.db.GetUserByID(ctx, arg.UserID)
		if err != nil {
		return database.User{}, err
		return database.UserConfig{}, err
		}
		if err := q.authorizeContext(ctx, policy.ActionUpdatePersonal, u); err != nil {
		return database.User{}, err
		return database.UserConfig{}, err
		}
		return q.db.UpdateUserAppearanceSettings(ctx, arg)
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1522,13 +1522,26 @@ func (s *MethodTestSuite) TestUser() {
		[]database.GetUserWorkspaceBuildParametersRow{},
		)
		}))
		s.Run("GetUserAppearanceSettings", s.Subtest(func(db database.Store, check *expects) {
		ctx := context.Background()
		u := dbgen.User(s.T(), db, database.User{})
		db.UpdateUserAppearanceSettings(ctx, database.UpdateUserAppearanceSettingsParams{
		UserID: u.ID,
		ThemePreference: "light",
		})
		check.Args(u.ID).Asserts(u, policy.ActionReadPersonal).Returns("light")
		}))
		s.Run("UpdateUserAppearanceSettings", s.Subtest(func(db database.Store, check *expects) {
		u := dbgen.User(s.T(), db, database.User{})
		uc := database.UserConfig{
		UserID: u.ID,
		Key: "theme_preference",
		Value: "dark",
		}
		check.Args(database.UpdateUserAppearanceSettingsParams{
		ID: u.ID,
		ThemePreference: u.ThemePreference,
		UpdatedAt: u.UpdatedAt,
		}).Asserts(u, policy.ActionUpdatePersonal).Returns(u)
		UserID: u.ID,
		ThemePreference: uc.Value,
		}).Asserts(u, policy.ActionUpdatePersonal).Returns(uc)
		}))
		s.Run("UpdateUserStatus", s.Subtest(func(db database.Store, check *expects) {
		u := dbgen.User(s.T(), db, database.User{})
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -528,7 +528,6 @@ func GroupMember(t testing.TB, db database.Store, member database.GroupMemberTab
		UserDeleted: user.Deleted,
		UserLastSeenAt: user.LastSeenAt,
		UserQuietHoursSchedule: user.QuietHoursSchedule,
		UserThemePreference: user.ThemePreference,
		UserName: user.Name,
		UserGithubComUserID: user.GithubComUserID,
		OrganizationID: group.OrganizationID,
Expand Down