remove DexServer

This commit is contained in:
Bobby Rullo 2016-06-07 17:27:06 -07:00
parent e71c5086ba
commit 5939a15d10
2 changed files with 2 additions and 8 deletions

View file

@ -264,7 +264,7 @@ func renderLoginPage(w http.ResponseWriter, r *http.Request, srv OIDCServer, idp
execTemplate(w, tpl, td) execTemplate(w, tpl, td)
} }
func handleAuthFunc(srv DexServer, idpcs []connector.Connector, tpl *template.Template, registrationEnabled bool) http.HandlerFunc { func handleAuthFunc(srv OIDCServer, idpcs []connector.Connector, tpl *template.Template, registrationEnabled bool) http.HandlerFunc {
idx := makeConnectorMap(idpcs) idx := makeConnectorMap(idpcs)
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
if r.Method != "GET" { if r.Method != "GET" {
@ -390,7 +390,7 @@ func handleAuthFunc(srv DexServer, idpcs []connector.Connector, tpl *template.Te
} }
} }
func validateScopes(srv DexServer, clientID string, scopes []string) error { func validateScopes(srv OIDCServer, clientID string, scopes []string) error {
foundOpenIDScope := false foundOpenIDScope := false
for i, curScope := range scopes { for i, curScope := range scopes {
if i > 0 && curScope == scopes[i-1] { if i > 0 && curScope == scopes[i-1] {

View file

@ -56,13 +56,7 @@ type OIDCServer interface {
RefreshToken(creds oidc.ClientCredentials, token string) (*jose.JWT, error) RefreshToken(creds oidc.ClientCredentials, token string) (*jose.JWT, error)
KillSession(string) error KillSession(string) error
}
// DexServer is an OIDCServer that also has dex-specific features.
type DexServer interface {
OIDCServer
// CrossClientAuthAllowed
CrossClientAuthAllowed(requestingClientID, authorizingClientID string) (bool, error) CrossClientAuthAllowed(requestingClientID, authorizingClientID string) (bool, error)
} }