Aug 2, 2024 · Jul 29, 2024 · Jul 29, 2024 · Jul 29, 2024 · Jul 29, 2024 · Jul 29, 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/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return deleteQ(q.log, q.auth, q.db.GetUserByID, q.db.UpdateUserDeletedByID)(ctx, id)
 }

 func (q *querier) UpdateUserGithubComUserID(ctx context.Context, arg database.UpdateUserGithubComUserIDParams) error {
 user, err := q.db.GetUserByID(ctx, arg.ID)
 if err != nil {
 return err
 }

 err = q.authorizeContext(ctx, policy.ActionUpdatePersonal, user)
 if err != nil {
 // System user can also update
 err = q.authorizeContext(ctx, policy.ActionUpdate, user)
 if err != nil {
 return err
 }
 }
 return q.db.UpdateUserGithubComUserID(ctx, arg)
 }

 func (q *querier) UpdateUserHashedPassword(ctx context.Context, arg database.UpdateUserHashedPasswordParams) error {
 user, err := q.db.GetUserByID(ctx, arg.ID)
 if err != nil {
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 u := dbgen.User(s.T(), db, database.User{})
 check.Args(u.ID).Asserts(u, policy.ActionDelete).Returns()
 }))
 s.Run("UpdateUserGithubComUserID", s.Subtest(func(db database.Store, check *expects) {
 u := dbgen.User(s.T(), db, database.User{})
 check.Args(database.UpdateUserGithubComUserIDParams{
 ID: u.ID,
 }).Asserts(u, policy.ActionUpdatePersonal)
 }))
 s.Run("UpdateUserHashedPassword", s.Subtest(func(db database.Store, check *expects) {
 u := dbgen.User(s.T(), db, database.User{})
 check.Args(database.UpdateUserHashedPasswordParams{
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 return sql.ErrNoRows
 }

 func (q *FakeQuerier) UpdateUserGithubComUserID(_ context.Context, arg database.UpdateUserGithubComUserIDParams) error {
 err := validateDatabaseType(arg)
 if err != nil {
 return err
 }

 q.mutex.Lock()
 defer q.mutex.Unlock()

 for i, user := range q.users {
 if user.ID != arg.ID {
 continue
 }
 user.GithubComUserID = arg.GithubComUserID
 q.users[i] = user
 return nil
 }
 return sql.ErrNoRows
 }

 func (q *FakeQuerier) UpdateUserHashedPassword(_ context.Context, arg database.UpdateUserHashedPasswordParams) error {
 if err := validateDatabaseType(arg); err != nil {
 return err
diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000237_github_com_user_id.down.sql b/coderd/database/migrations/000237_github_com_user_id.down.sql
 ALTER TABLE users DROP COLUMN github_com_user_id;
diff --git a/coderd/database/migrations/000237_github_com_user_id.up.sql b/coderd/database/migrations/000237_github_com_user_id.up.sql
 ALTER TABLE users ADD COLUMN github_com_user_id BIGINT;

 COMMENT ON COLUMN users.github_com_user_id IS 'The GitHub.com numerical user ID. At time of implementation, this is used to check if the user has starred the Coder repository.';
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
 &i.QuietHoursSchedule,
 &i.ThemePreference,
 &i.Name,
 &i.GithubComUserID,
 &i.Count,
 ); err != nil {
 return nil, err
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3260,6 +3260,23 @@ func (q *querier) UpdateUserDeletedByID(ctx context.Context, id uuid.UUID) error
		return deleteQ(q.log, q.auth, q.db.GetUserByID, q.db.UpdateUserDeletedByID)(ctx, id)
		}

		func (q *querier) UpdateUserGithubComUserID(ctx context.Context, arg database.UpdateUserGithubComUserIDParams) error {
		user, err := q.db.GetUserByID(ctx, arg.ID)
		if err != nil {
		return err
		}

		err = q.authorizeContext(ctx, policy.ActionUpdatePersonal, user)
		if err != nil {
		// System user can also update
		err = q.authorizeContext(ctx, policy.ActionUpdate, user)
		if err != nil {
		return err
		}
		}
		return q.db.UpdateUserGithubComUserID(ctx, arg)
		}

		func (q *querier) UpdateUserHashedPassword(ctx context.Context, arg database.UpdateUserHashedPasswordParams) error {
		user, err := q.db.GetUserByID(ctx, arg.ID)
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1105,6 +1105,12 @@ func (s *MethodTestSuite) TestUser() {
		u := dbgen.User(s.T(), db, database.User{})
		check.Args(u.ID).Asserts(u, policy.ActionDelete).Returns()
		}))
		s.Run("UpdateUserGithubComUserID", s.Subtest(func(db database.Store, check *expects) {
		u := dbgen.User(s.T(), db, database.User{})
		check.Args(database.UpdateUserGithubComUserIDParams{
		ID: u.ID,
		}).Asserts(u, policy.ActionUpdatePersonal)
		}))
		s.Run("UpdateUserHashedPassword", s.Subtest(func(db database.Store, check *expects) {
		u := dbgen.User(s.T(), db, database.User{})
		check.Args(database.UpdateUserHashedPasswordParams{
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7985,6 +7985,26 @@ func (q *FakeQuerier) UpdateUserDeletedByID(_ context.Context, id uuid.UUID) err
		return sql.ErrNoRows
		}

		func (q *FakeQuerier) UpdateUserGithubComUserID(_ context.Context, arg database.UpdateUserGithubComUserIDParams) error {
		err := validateDatabaseType(arg)
		if err != nil {
		return err
		}

		q.mutex.Lock()
		defer q.mutex.Unlock()

		for i, user := range q.users {
		if user.ID != arg.ID {
		continue
		}
		user.GithubComUserID = arg.GithubComUserID
		q.users[i] = user
		return nil
		}
		return sql.ErrNoRows
		}

		func (q *FakeQuerier) UpdateUserHashedPassword(_ context.Context, arg database.UpdateUserHashedPasswordParams) error {
		if err := validateDatabaseType(arg); err != nil {
		return err
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE users DROP COLUMN github_com_user_id;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		ALTER TABLE users ADD COLUMN github_com_user_id BIGINT;

		COMMENT ON COLUMN users.github_com_user_id IS 'The GitHub.com numerical user ID. At time of implementation, this is used to check if the user has starred the Coder repository.';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -361,6 +361,7 @@ func (q *sqlQuerier) GetAuthorizedUsers(ctx context.Context, arg GetUsersParams,
		&i.QuietHoursSchedule,
		&i.ThemePreference,
		&i.Name,
		&i.GithubComUserID,
		&i.Count,
		); err != nil {
		return nil, err
Expand Down