Skip to content

feat: synchronize oidc user roles #8595

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 22 commits into from
Jul 24, 2023
Merged

feat: synchronize oidc user roles #8595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
81feea5
feat: oidc user role sync
Emyrk Jul 19, 2023
1e6bd37
allow mapping 1:many
Emyrk Jul 19, 2023
aad5744
Expose user login type via api
Emyrk Jul 19, 2023
f9c7cc5
make gen
Emyrk Jul 19, 2023
a7614e3
Adjust users page to not allow editing roles when they cannot
Emyrk Jul 19, 2023
3fcb55d
Add TOD
Emyrk Jul 19, 2023
89b1b69
Add unit test to test manual role assign
Emyrk Jul 19, 2023
b64e372
Add swagger docs as generated
Emyrk Jul 19, 2023
9fddd5e
add cli generated files as generated
Emyrk Jul 19, 2023
882f93c
Fix import
Emyrk Jul 19, 2023
f092c50
Remove comment
Emyrk Jul 19, 2023
5e3b6f8
Add new entitlement to control this feature
Emyrk Jul 20, 2023
4bf31c0
Linting
Emyrk Jul 20, 2023
3ad152f
not sure what feature enablements are, but required for tests
Emyrk Jul 20, 2023
293a9b0
Merge remote-tracking branch 'origin/main' into stevenmasley/oidc_rol…
Emyrk Jul 20, 2023
b0ae795
Fix merge error
Emyrk Jul 20, 2023
231e47b
Fix unit test
Emyrk Jul 20, 2023
40e362c
Update golden files
Emyrk Jul 20, 2023
bac7743
raise a FE prop field up the stack
Emyrk Jul 20, 2023
6cf15e7
Fix ts type
Emyrk Jul 20, 2023
a2208bb
fixup! Fix ts type
Emyrk Jul 20, 2023
a5227e8
Fix comment
Emyrk Jul 21, 2023
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
Fix merge error
  • Loading branch information
@Emyrk
Emyrk committed Jul 20, 2023
commit b0ae7952c49b1effc8c50068a80255e34ef7149c
4 changes: 2 additions & 2 deletions coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ type Options struct {
DERPMap *tailcfg.DERPMap
SwaggerEndpoint bool
SetUserGroups func(ctx context.Context, tx database.Store, userID uuid.UUID, groupNames []string) error
SetUserSiteRoles func(ctx context.Context, tx database.Store, userID uuid.UUID, roles []string) error
SetUserSiteRoles func(ctx context.Context, tx database.Store, userID uuid.UUID, roles []string) error
TemplateScheduleStore *atomic.Pointer[schedule.TemplateScheduleStore]
UserQuietHoursScheduleStore *atomic.Pointer[schedule.UserQuietHoursScheduleStore]
// AppSecurityKey is the crypto key used to sign and encrypt tokens related to
Expand Down Expand Up @@ -1106,7 +1106,7 @@ func (api *API) CreateInMemoryProvisionerDaemon(ctx context.Context, debounce ti
}

// nolint:revive
func initExperiments(log slog.Logger, raw []string) codersdk.Experiments {
func ReadExperiments(log slog.Logger, raw []string) codersdk.Experiments {
exps := make([]codersdk.Experiment, 0, len(raw))
for _, v := range raw {
switch v {
Expand Down
2 changes: 2 additions & 0 deletions site/src/api/typesGenerated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1497,6 +1497,7 @@ export type FeatureName =
| "template_rbac"
| "template_restart_requirement"
| "user_limit"
| "user_role_management"
| "workspace_proxy"
export const FeatureNames: FeatureName[] = [
"advanced_template_scheduling",
Expand All @@ -1510,6 +1511,7 @@ export const FeatureNames: FeatureName[] = [
"template_rbac",
"template_restart_requirement",
"user_limit",
"user_role_management",
"workspace_proxy",
]

Expand Down