fix circle, fix websockets

Author: timsuchanek

.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
       - run: sudo npm i -g yarn
       - run: yarn show-versions
       - run: yarn install
-      - run: cd packages/graphql-playground-react && yarn build
+      - run: cd packages/graphql-playground-react && yarn && yarn build
 
   electron-build:
     macos:

packages/graphql-playground-react/src/components/MiddlewareApp.tsx

@@ -93,7 +93,7 @@ export default class MiddlewareApp extends React.Component<Props, State> {
       getParameterByName('endpoint') ||
       location.href
 
-    let subscriptionEndpoint: string | undefined | null =
+    let subscriptionEndpoint: any =
       props.subscriptionEndpoint || getParameterByName('subscriptionEndpoint')
 
     if (props.configString && props.config && activeEnv) {
@@ -105,15 +105,16 @@ export default class MiddlewareApp extends React.Component<Props, State> {
       subscriptionEndpoint = this.getGraphcoolSubscriptionEndpoint(endpoint)
     }
 
+    subscriptionEndpoint =
+      this.normalizeSubscriptionUrl(endpoint, subscriptionEndpoint) || undefined
+
     this.state = {
       endpoint: this.absolutizeUrl(endpoint),
       platformToken:
         props.platformToken ||
         localStorage.getItem('platform-token') ||
         undefined,
-      subscriptionEndpoint: subscriptionEndpoint
-        ? this.normalizeSubscriptionUrl(endpoint, subscriptionEndpoint)
-        : '',
+      subscriptionEndpoint,
       settingsString,
       settings: this.getSettings(settingsString),
       configIsYaml,

packages/graphql-playground-react/src/components/Playground/GraphQLEditor.tsx

@@ -350,6 +350,23 @@ export class GraphQLEditor extends React.PureComponent<
     return ''
   }
 
+  tokenInvalid() {
+    if (this.state.responses.length === 1) {
+      const response = this.state.responses[0].date
+      if (response) {
+        try {
+          const data = JSON.parse(response)
+          if (data && data.errors && data.errors[0].code === 3015) {
+            return true
+          }
+        } catch (e) {
+          //
+        }
+      }
+    }
+    return false
+  }
+
   render() {
     const children = React.Children.toArray(this.props.children)
     const footer = find(children, child => child.type === GraphQLEditor.Footer)

packages/graphql-playground-react/src/components/Playground/SchemaFetcher.ts

@@ -38,7 +38,11 @@ export class SchemaFetcher {
     })
     const schemaData = await response.json()
 
-    if (!schemaData || schemaData.error || !schemaData.data) {
+    if (schemaData && (schemaData.errors || !schemaData.data)) {
+      throw new Error(JSON.stringify(schemaData, null, 2))
+    }
+
+    if (!schemaData) {
       throw new NoSchemaError(endpoint)
     }
 

packages/graphql-playground-react/src/components/Playground/TokenTooltip.tsx

@@ -0,0 +1,22 @@
+import * as React from 'react'
+import Tooltip from '../Tooltip'
+
+export default class TokenTooltip extends React.Component {
+  render() {
+    return (
+      <Tooltip
+        open={true}
+        onClose={this.handleToggle}
+        anchorOrigin={{
+          vertical: 'top',
+          horizontal: 'left',
+        }}
+      >
+        <h1>This is the tooltip</h1>
+      </Tooltip>
+    )
+  }
+  handleToggle = () => {
+    //
+  }
+}