Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 3 additions & 23 deletions config/v1/types_oauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,6 @@ type IdentityProvider struct {
// Ref: https://godoc.org/github.com/openshift/origin/pkg/user/apis/user/validation#ValidateIdentityProviderName
Name string `json:"name"`

// challenge indicates whether to issue WWW-Authenticate challenges for this provider
UseAsChallenger bool `json:"challenge"`

// login indicates whether to use this identity provider for unauthenticated browsers to login against
UseAsLogin bool `json:"login"`

// mappingMethod determines how identities from this provider are mapped to users
// Defaults to "claim"
// +optional
Expand Down Expand Up @@ -517,28 +511,14 @@ type OpenIDIdentityProvider struct {
// +optional
ExtraAuthorizeParameters map[string]string `json:"extraAuthorizeParameters,omitempty"`

// urls to use to authenticate
URLs OpenIDURLs `json:"urls"`
// issuer is the URL that the OpenID Provider asserts as its Issuer Identifier.
// It must use the https scheme with no query or fragment component.
Issuer string `json:"issuer"`

// claims mappings
Claims OpenIDClaims `json:"claims"`
}

// OpenIDURLs are URLs to use when authenticating with an OpenID identity provider
type OpenIDURLs struct {
// authorize is the oauth authorization URL
Authorize string `json:"authorize"`

// token is the oauth token granting URL
Token string `json:"token"`

// userInfo is the optional userinfo URL.
// If present, a granted access_token is used to request claims
// If empty, a granted id_token is parsed for claims
// +optional
UserInfo string `json:"userInfo"`
}

// UserIDClaim is the claim used to provide a stable identifier for OIDC identities.
// Per http://openid.net/specs/openid-connect-core-1_0.html#ClaimStability
// "The sub (subject) and iss (issuer) Claims, used together, are the only Claims that an RP can
Expand Down
17 changes: 0 additions & 17 deletions config/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 2 additions & 15 deletions config/v1/zz_generated.swagger_doc_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.