Skip to content

[v13] OktaAssignment and UserGroup in auth cache. #25066

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
mdwn merged 1 commit into from
Apr 24, 2023
Merged

[v13] OktaAssignment and UserGroup in auth cache. #25066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions lib/auth/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,16 @@ type Cache interface {
// GetSAMLIdPServiceProvider returns the specified SAML IdP service provider resources.
GetSAMLIdPServiceProvider(ctx context.Context, name string) (types.SAMLIdPServiceProvider, error)

// ListOktaAssignments returns a paginated list of all Okta assignment resources.
ListOktaAssignments(context.Context, int, string) ([]types.OktaAssignment, string, error)
// GetOktaAssignment returns the specified Okta assignment resources.
GetOktaAssignment(ctx context.Context, name string) (types.OktaAssignment, error)

// ListUserGroups returns a paginated list of all user group resources.
ListUserGroups(context.Context, int, string) ([]types.UserGroup, string, error)
// GetUserGroup returns the specified user group resources.
GetUserGroup(ctx context.Context, name string) (types.UserGroup, error)

// IntegrationsGetter defines read/list methods for integrations.
services.IntegrationsGetter
}
Expand Down
8 changes: 3 additions & 5 deletions lib/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,9 @@ func NewServer(cfg *InitConfig, opts ...ServerOption) (*Server, error) {
SessionTrackerService: cfg.SessionTrackerService,
ConnectionsDiagnostic: cfg.ConnectionsDiagnostic,
Integrations: cfg.Integrations,
Okta: cfg.Okta,
StatusInternal: cfg.Status,
UsageReporter: cfg.UsageReporter,

okta: cfg.Okta,
}

closeCtx, cancelFunc := context.WithCancel(context.TODO())
Expand Down Expand Up @@ -379,11 +378,10 @@ type Services struct {
services.ConnectionsDiagnostic
services.StatusInternal
services.Integrations
services.Okta
usagereporter.UsageReporter
types.Events
events.AuditLogSessionStreamer

okta services.Okta
}

// GetWebSession returns existing web session described by req.
Expand All @@ -400,7 +398,7 @@ func (r *Services) GetWebToken(ctx context.Context, req types.GetWebTokenRequest

// OktaClient returns the okta client.
func (r *Services) OktaClient() services.Okta {
return r.okta
return r
}

var (
Expand Down