Merge branch 'master' into graphql-operation-builder

hasura · May 3, 2023 · 80b93d0 · 80b93d0
2 parents 3e9dc3a + 1741410
commit 80b93d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,7 @@
 name: Unit tests
 
 on:
+  pull_request:
   push:
     paths:
       - "**.go"

diff --git a/subscriptions_transport_ws.go b/subscriptions_transport_ws.go
@@ -114,6 +114,16 @@ func (stw *subscriptionsTransportWS) OnMessage(ctx *SubscriptionContext, subscri
 	switch message.Type {
 	case GQLError:
 		ctx.Log(message, "server", GQLError)
+		var errs Errors
+		jsonErr := json.Unmarshal(message.Payload, &errs)
+		if jsonErr != nil {
+			subscription.handler(nil, fmt.Errorf("%s", string(message.Payload)))
+			return nil
+		}
+		if len(errs) > 0 {
+			subscription.handler(nil, errs)
+			return nil
+		}
 	case GQLData:
 		ctx.Log(message, "server", GQLData)
 		var out struct {