Skip to content

feat: implement organization role sync #14649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Sep 17, 2024
Merged

feat: implement organization role sync #14649

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9a73013
rolesync start
Emyrk Sep 10, 2024
c6080b5
chore: implement organization and site wide role sync in idpsync
Emyrk Sep 10, 2024
ca8e9b9
work on unit test for role sync
Emyrk Sep 10, 2024
b1ece73
chore: remove resetting user's roles on misconfigured
Emyrk Sep 11, 2024
5d0f729
Begin unit testing work
Emyrk Sep 11, 2024
601652c
test enterprise parse
Emyrk Sep 11, 2024
2a1e2d0
chore: remove old role sync, insert new idpsync package
Emyrk Sep 11, 2024
8967a42
fixup test
Emyrk Sep 11, 2024
f51fae7
linting
Emyrk Sep 11, 2024
12c7af7
rebase fixes
Emyrk Sep 16, 2024
8857660
extract method into it's own funciton
Emyrk Sep 16, 2024
7ff0bb0
linting
Emyrk Sep 16, 2024
d8b0d45
Trigger Build
Emyrk Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
linting
  • Loading branch information
@Emyrk
Emyrk committed Sep 16, 2024
commit f51fae7c99648c9959765c814618b169ba632066
1 change: 1 addition & 0 deletions coderd/idpsync/group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,7 @@ func (o orgGroupAssert) Assert(t *testing.T, orgID uuid.UUID, db database.Store,
}
}

//nolint:revive
func (o orgRoleAssert) Assert(t *testing.T, orgID uuid.UUID, db database.Store, notMember bool, user database.User) {
t.Helper()

Expand Down
5 changes: 3 additions & 2 deletions coderd/idpsync/role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ func (s AGPLIDPSync) SyncRoles(ctx context.Context, db database.Store, user data

// sync roles per organization
orgMemberships, err := tx.OrganizationMembers(ctx, database.OrganizationMembersParams{
UserID: user.ID,
OrganizationID: uuid.Nil,
UserID: user.ID,
})
if err != nil {
return xerrors.Errorf("get organizations by user id: %w", err)
Expand Down Expand Up @@ -241,7 +242,7 @@ func (s AGPLIDPSync) syncSiteWideRoles(ctx context.Context, tx database.Store, u
return nil
}

func (s AGPLIDPSync) RolesFromClaim(field string, claims jwt.MapClaims) ([]string, error) {
func (AGPLIDPSync) RolesFromClaim(field string, claims jwt.MapClaims) ([]string, error) {
rolesRow, ok := claims[field]
if !ok {
// If no claim is provided than we can assume the user is just
Expand Down
2 changes: 2 additions & 0 deletions coderd/idpsync/role_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,8 @@ func TestRoleSyncTable(t *testing.T) {
// per organization. This limits the number of db calls to O(1) if there
// are no changes. Which is the usual case, as user's roles do not change often.
func TestNoopNoDiff(t *testing.T) {
t.Parallel()

ctx := context.Background()
ctrl := gomock.NewController(t)
mDB := dbmock.NewMockStore(ctrl)
Expand Down