fixup some comments

Emyrk · Emyrk · commit 9702243b5bc2 · 2024-08-28T09:39:25.000-05:00
diff --git a/cli/server_createadminuser.go b/cli/server_createadminuser.go
@@ -176,7 +176,7 @@ func (r *RootCmd) newCreateAdminUserCommand() *serpent.Command {
 			// Create the user.
 			var newUser database.User
 			err = db.InTx(func(tx database.Store) error {
-				orgs, err := tx.GetOrganizations(ctx)
+				orgs, err := tx.GetOrganizations(ctx, database.GetOrganizationsParams{})
 				if err != nil {
 					return xerrors.Errorf("get organizations: %w", err)
 				}
diff --git a/coderd/idpsync/organization.go b/coderd/idpsync/organization.go
@@ -36,6 +36,8 @@ type OrganizationParams struct {
 	Organizations []uuid.UUID
 }
 
+// SyncOrganizations if enabled will ensure the user is a member of the provided
+// organizations. It will add and remove their membership to match the expected set.
 func (s AGPLIDPSync) SyncOrganizations(ctx context.Context, tx database.Store, user database.User, params OrganizationParams) error {
 	// Nothing happens if sync is not enabled
 	if !params.SyncEnabled {
diff --git a/enterprise/coderd/enidpsync/organizations.go b/enterprise/coderd/enidpsync/organizations.go
@@ -58,7 +58,8 @@ func (e EnterpriseIDPSync) ParseOrganizationClaims(ctx context.Context, mergedCl
 	}
 
 	return idpsync.OrganizationParams{
-		SyncEnabled:    true,
+		// If the field is not set, then sync is not enabled.
+		SyncEnabled:    e.OrganizationField != "",
 		IncludeDefault: e.OrganizationAssignDefault,
 		Organizations:  userOrganizations,
 	}, nil

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ func (r RootCmd) newCreateAdminUserCommand() serpent.Command {`
`176`	`176`	`// Create the user.`
`177`	`177`	`var newUser database.User`
`178`	`178`	`err = db.InTx(func(tx database.Store) error {`
`179`		`- orgs, err := tx.GetOrganizations(ctx)`
	`179`	`+ orgs, err := tx.GetOrganizations(ctx, database.GetOrganizationsParams{})`
`180`	`180`	`if err != nil {`
`181`	`181`	`return xerrors.Errorf("get organizations: %w", err)`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ type OrganizationParams struct {`
`36`	`36`	`Organizations []uuid.UUID`
`37`	`37`	`}`
`38`	`38`
	`39`	`+// SyncOrganizations if enabled will ensure the user is a member of the provided`
	`40`	`+// organizations. It will add and remove their membership to match the expected set.`
`39`	`41`	`func (s AGPLIDPSync) SyncOrganizations(ctx context.Context, tx database.Store, user database.User, params OrganizationParams) error {`
`40`	`42`	`// Nothing happens if sync is not enabled`
`41`	`43`	`if !params.SyncEnabled {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@ func (e EnterpriseIDPSync) ParseOrganizationClaims(ctx context.Context, mergedCl`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`return idpsync.OrganizationParams{`
`61`		`- SyncEnabled: true,`
	`61`	`+ // If the field is not set, then sync is not enabled.`
	`62`	`+ SyncEnabled: e.OrganizationField != "",`
`62`	`63`	`IncludeDefault: e.OrganizationAssignDefault,`
`63`	`64`	`Organizations: userOrganizations,`
`64`	`65`	`}, nil`