Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit acda012

Browse files
EmyrkEmyrk
committed
Revert "fix: assign new oauth users to default org"
This reverts commit 872f4a2.
1 parent 872f4a2 commit acda012

25 files changed

+37
-191
lines changed

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,12 +1016,6 @@ func (q *querier) GetDERPMeshKey(ctx context.Context) (string, error) {
10161016
return q.db.GetDERPMeshKey(ctx)
10171017
}
10181018

1019-
func (q *querier) GetDefaultOrganization(ctx context.Context) (database.Organization, error) {
1020-
return fetch(q.log, q.auth, func(ctx context.Context, _ any) (database.Organization, error) {
1021-
return q.db.GetDefaultOrganization(ctx)
1022-
})(ctx, nil)
1023-
}
1024-
10251019
func (q *querier) GetDefaultProxyConfig(ctx context.Context) (database.GetDefaultProxyConfigRow, error) {
10261020
// No authz checks
10271021
return q.db.GetDefaultProxyConfig(ctx)

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -570,10 +570,6 @@ func (s *MethodTestSuite) TestOrganization() {
570570
o := dbgen.Organization(s.T(), db, database.Organization{})
571571
check.Args(o.ID).Asserts(o, rbac.ActionRead).Returns(o)
572572
}))
573-
s.Run("GetDefaultOrganization", s.Subtest(func(db database.Store, check *expects) {
574-
o := dbgen.Organization(s.T(), db, database.Organization{})
575-
check.Args().Asserts(o, rbac.ActionRead).Returns(o)
576-
}))
577573
s.Run("GetOrganizationByName", s.Subtest(func(db database.Store, check *expects) {
578574
o := dbgen.Organization(s.T(), db, database.Organization{})
579575
check.Args(o.Name).Asserts(o, rbac.ActionRead).Returns(o)

‎coderd/database/dbmem/dbmem.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,18 +1657,6 @@ func (q *FakeQuerier) GetDERPMeshKey(_ context.Context) (string, error) {
16571657
return q.derpMeshKey, nil
16581658
}
16591659

1660-
func (q *FakeQuerier) GetDefaultOrganization(_ context.Context) (database.Organization, error) {
1661-
q.mutex.RLock()
1662-
defer q.mutex.RUnlock()
1663-
1664-
for _, org := range q.organizations {
1665-
if org.IsDefault {
1666-
return org, nil
1667-
}
1668-
}
1669-
return database.Organization{}, sql.ErrNoRows
1670-
}
1671-
16721660
func (q *FakeQuerier) GetDefaultProxyConfig(_ context.Context) (database.GetDefaultProxyConfigRow, error) {
16731661
return database.GetDefaultProxyConfigRow{
16741662
DisplayName: q.defaultProxyDisplayName,
@@ -5297,7 +5285,6 @@ func (q *FakeQuerier) InsertOrganization(_ context.Context, arg database.InsertO
52975285
Name: arg.Name,
52985286
CreatedAt: arg.CreatedAt,
52995287
UpdatedAt: arg.UpdatedAt,
5300-
IsDefault: len(q.organizations) == 0,
53015288
}
53025289
q.organizations = append(q.organizations, organization)
53035290
return organization, nil

‎coderd/database/dbmetrics/dbmetrics.go

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dump.sql

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/models.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/querier.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)