Revert 1595 (#1658)

Signed-off-by: Steve Coffman <steve@khanacademy.org>
99designs · Oct 13, 2021 · 41c8676 · 41c8676
1 parent 8359f97
commit 41c8676
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/docs/content/recipes/cors.md b/docs/content/recipes/cors.md
@@ -40,7 +40,7 @@ func main() {
 
     srv := handler.NewDefaultServer(starwars.NewExecutableSchema(starwars.NewResolver()))
     srv.AddTransport(&transport.Websocket{
-        Upgrader: &websocket.Upgrader{
+        Upgrader: websocket.Upgrader{
             CheckOrigin: func(r *http.Request) bool {
                 // Check against your desired domains here
                  return r.Host == "example.org"

diff --git a/example/chat/server/server.go b/example/chat/server/server.go
@@ -34,7 +34,7 @@ func main() {
 	srv.AddTransport(transport.POST{})
 	srv.AddTransport(transport.Websocket{
 		KeepAlivePingInterval: 10 * time.Second,
-		Upgrader: &websocket.Upgrader{
+		Upgrader: websocket.Upgrader{
 			CheckOrigin: func(r *http.Request) bool {
 				return true
 			},

diff --git a/graphql/handler/transport/websocket.go b/graphql/handler/transport/websocket.go
@@ -32,7 +32,7 @@ const (
 
 type (
 	Websocket struct {
-		Upgrader              WebsocketUpgrader
+		Upgrader              websocket.Upgrader
 		InitFunc              WebsocketInitFunc
 		KeepAlivePingInterval time.Duration
 	}
@@ -52,16 +52,10 @@ type (
 		ID      string          `json:"id,omitempty"`
 		Type    string          `json:"type"`
 	}
-	WebsocketUpgrader interface {
-		Upgrade(w http.ResponseWriter, r *http.Request, responseHeader http.Header) (*websocket.Conn, error)
-	}
 	WebsocketInitFunc func(ctx context.Context, initPayload InitPayload) (context.Context, error)
 )
 
-var (
-	_ graphql.Transport = Websocket{}
-	_ WebsocketUpgrader = &websocket.Upgrader{}
-)
+var _ graphql.Transport = Websocket{}
 
 func (t Websocket) Supports(r *http.Request) bool {
 	return r.Header.Get("Upgrade") != ""

diff --git a/handler/handler.go b/handler/handler.go
@@ -11,6 +11,7 @@ import (
 	"github.com/99designs/gqlgen/graphql/handler/lru"
 	"github.com/99designs/gqlgen/graphql/handler/transport"
 	"github.com/99designs/gqlgen/graphql/playground"
+	"github.com/gorilla/websocket"
 )
 
 // Deprecated: switch to graphql/handler.New
@@ -73,7 +74,7 @@ func GraphQL(exec graphql.ExecutableSchema, options ...Option) http.HandlerFunc
 // Deprecated: switch to graphql/handler.New
 type Config struct {
 	cacheSize                       int
-	upgrader                        transport.WebsocketUpgrader
+	upgrader                        websocket.Upgrader
 	websocketInitFunc               transport.WebsocketInitFunc
 	connectionKeepAlivePingInterval time.Duration
 	recover                         graphql.RecoverFunc
@@ -92,7 +93,7 @@ type Config struct {
 type Option func(cfg *Config)
 
 // Deprecated: switch to graphql/handler.New
-func WebsocketUpgrader(upgrader transport.WebsocketUpgrader) Option {
+func WebsocketUpgrader(upgrader websocket.Upgrader) Option {
 	return func(cfg *Config) {
 		cfg.upgrader = upgrader
 	}