From 5939a15d10041de54e9263853a969a1acb72700a Mon Sep 17 00:00:00 2001
From: Bobby Rullo <bobby.rullo@coreos.com>
Date: Tue, 7 Jun 2016 17:27:06 -0700
Subject: [PATCH] remove DexServer

---
 server/http.go   | 4 ++--
 server/server.go | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/server/http.go b/server/http.go
index 98da6de5..542442ad 100644
--- a/server/http.go
+++ b/server/http.go
@@ -264,7 +264,7 @@ func renderLoginPage(w http.ResponseWriter, r *http.Request, srv OIDCServer, idp
 	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)
 	return func(w http.ResponseWriter, r *http.Request) {
 		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
 	for i, curScope := range scopes {
 		if i > 0 && curScope == scopes[i-1] {
diff --git a/server/server.go b/server/server.go
index 8cb8d8b6..8c7bd361 100644
--- a/server/server.go
+++ b/server/server.go
@@ -56,13 +56,7 @@ type OIDCServer interface {
 	RefreshToken(creds oidc.ClientCredentials, token string) (*jose.JWT, 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)
 }