44"context"
55"encoding/json"
66"fmt"
7- "regexp"
87
98"github.com/golang-jwt/jwt/v4"
109"github.com/google/uuid"
@@ -16,6 +15,7 @@ import (
1615"github.com/coder/coder/v2/coderd/database/dbauthz"
1716"github.com/coder/coder/v2/coderd/runtimeconfig"
1817"github.com/coder/coder/v2/coderd/util/slice"
18+ "github.com/coder/coder/v2/codersdk"
1919)
2020
2121type GroupParams struct {
@@ -94,10 +94,12 @@ func (s AGPLIDPSync) SyncGroups(ctx context.Context, db database.Store, user dat
9494// Legacy deployment settings will override empty settings.
9595if orgID == defaultOrgID && settings .Field == "" {
9696settings = & GroupSyncSettings {
97- Field :s .Legacy .GroupField ,
98- LegacyNameMapping :s .Legacy .GroupMapping ,
99- RegexFilter :s .Legacy .GroupFilter ,
100- AutoCreateMissing :s .Legacy .CreateMissingGroups ,
97+ GroupSyncSettings : codersdk.GroupSyncSettings {
98+ Field :s .Legacy .GroupField ,
99+ LegacyNameMapping :s .Legacy .GroupMapping ,
100+ RegexFilter :s .Legacy .GroupFilter ,
101+ AutoCreateMissing :s .Legacy .CreateMissingGroups ,
102+ },
101103}
102104}
103105orgSettings [orgID ]= * settings
@@ -240,25 +242,7 @@ func (s AGPLIDPSync) ApplyGroupDifference(ctx context.Context, tx database.Store
240242}
241243
242244type GroupSyncSettings struct {
243- // Field selects the claim field to be used as the created user's
244- // groups. If the group field is the empty string, then no group updates
245- // will ever come from the OIDC provider.
246- Field string `json:"field"`
247- // Mapping maps from an OIDC group --> Coder group ID
248- Mapping map [string ][]uuid.UUID `json:"mapping"`
249- // RegexFilter is a regular expression that filters the groups returned by
250- // the OIDC provider. Any group not matched by this regex will be ignored.
251- // If the group filter is nil, then no group filtering will occur.
252- RegexFilter * regexp.Regexp `json:"regex_filter"`
253- // AutoCreateMissing controls whether groups returned by the OIDC provider
254- // are automatically created in Coder if they are missing.
255- AutoCreateMissing bool `json:"auto_create_missing_groups"`
256- // LegacyNameMapping is deprecated. It remaps an IDP group name to
257- // a Coder group name. Since configuration is now done at runtime,
258- // group IDs are used to account for group renames.
259- // For legacy configurations, this config option has to remain.
260- // Deprecated: Use Mapping instead.
261- LegacyNameMapping map [string ]string `json:"legacy_group_name_mapping,omitempty"`
245+ codersdk.GroupSyncSettings
262246}
263247
264248func (s * GroupSyncSettings )Set (v string )error {