Commit4e3ea79

committed

PR comments

1 parent6695e64 commit4e3ea79Copy full SHA for 4e3ea79

File tree

+17

-13

lines changed

+17

-13

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -275,8 +275,6 @@ func New(options Options) API {`
`275`	`275`	`options.Entitlements=entitlements.New()`
`276`	`276`	`}`
`277`	`277`	`ifoptions.IDPSync==nil {`
`278`		`-// If this is set in the options, it is probably the enterprise`
`279`		`-// version of the code.`
`280`	`278`	`options.IDPSync=idpsync.NewAGPLSync(options.Logger, idpsync.SyncSettings{`
`281`	`279`	`OrganizationField:options.DeploymentValues.OIDC.OrganizationField.Value(),`
`282`	`280`	`OrganizationMapping:options.DeploymentValues.OIDC.OrganizationMapping.Value,`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,18 @@ type SyncSettings struct {`
`52`	`52`	`OrganizationAssignDefaultbool`
`53`	`53`	`}`
`54`	`54`
	`55`	`+typeOrganizationParamsstruct {`
	`56`	`+// SyncEnabled if false will skip syncing the user's organizations.`
	`57`	`+SyncEnabledbool`
	`58`	`+// IncludeDefault is primarily for single org deployments. It will ensure`
	`59`	`+// a user is always inserted into the default org.`
	`60`	`+IncludeDefaultbool`
	`61`	`+// Organizations is the list of organizations the user should be a member of`
	`62`	`+// assuming syncing is turned on.`
	`63`	`+Organizations []uuid.UUID`
	`64`	`+}`
	`65`	`+`
	`66`	`+`
`55`	`67`	`funcNewAGPLSync(logger slog.Logger,settingsSyncSettings)*AGPLIDPSync {`
`56`	`68`	`return&AGPLIDPSync{`
`57`	`69`	`Logger:logger.Named("idp-sync"),`

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,17 +30,6 @@ func (s AGPLIDPSync) ParseOrganizationClaims(_ context.Context, _ jwt.MapClaims)`
`30`	`30`	`},nil`
`31`	`31`	`}`
`32`	`32`
`33`		`-typeOrganizationParamsstruct {`
`34`		`-// SyncEnabled if false will skip syncing the user's organizations.`
`35`		`-SyncEnabledbool`
`36`		`-// IncludeDefault is primarily for single org deployments. It will ensure`
`37`		`-// a user is always inserted into the default org.`
`38`		`-IncludeDefaultbool`
`39`		`-// Organizations is the list of organizations the user should be a member of`
`40`		`-// assuming syncing is turned on.`
`41`		`-Organizations []uuid.UUID`
`42`		`-}`
`43`		`-`
`44`	`33`	`// SyncOrganizations if enabled will ensure the user is a member of the provided`
`45`	`34`	`// organizations. It will add and remove their membership to match the expected set.`
`46`	`35`	`func (sAGPLIDPSync)SyncOrganizations(ctx context.Context,tx database.Store,user database.User,paramsOrganizationParams)error {`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,11 @@ import (`
`7`	`7`	`"github.com/coder/coder/v2/coderd/idpsync"`
`8`	`8`	`)`
`9`	`9`
	`10`	`+// EnterpriseIDPSync enabled syncing user information from an external IDP.`
	`11`	`+// The sync is an enterprise feature, so this struct wraps the AGPL implementation`
	`12`	`+// and extends it with enterprise capabilities. These capabilities can entirely`
	`13`	`+// be changed in the Parsing, and leaving the "syncing" part (which holds the`
	`14`	`+// more complex logic) to the shared AGPL implementation.`
`10`	`15`	`typeEnterpriseIDPSyncstruct {`
`11`	`16`	`entitlements*entitlements.Set`
`12`	`17`	`*idpsync.AGPLIDPSync`

Comments

(0)