wip

Author: JakeDawkins

packages/apollo-language-server/src/engine/index.ts

@@ -272,10 +272,13 @@ export class ApolloEngineClient extends GraphQLDataSource {
       variables: {
         id: serviceID
       }
-    });
+    }).catch(e => e);
 
     if (!(data && data.service)) {
-      throw new Error();
+      if (errors) {
+        throw new Error(errors.map(error => error.message).join("\n"));
+      }
+      throw new Error("No service found. Check your service name and API key");
     }
 
     const schemaTags: string[] = data.service.schemaTags.map(

packages/apollo-language-server/src/providers/schema/engine.ts

@@ -4,6 +4,7 @@ import gql from "graphql-tag";
 import { GraphQLSchema, buildClientSchema } from "graphql";
 import { ApolloEngineClient, ClientIdentity } from "../../engine";
 import { ClientConfig, parseServiceSpecifier } from "../../config";
+import { getServiceFromKey } from "../../config/utils";
 import {
   GraphQLSchemaProvider,
   SchemaChangeUnsubscribeHandler,
@@ -44,6 +45,15 @@ export class EngineSchemaProvider implements GraphQLSchemaProvider {
     }
 
     const [id, tag = "current"] = parseServiceSpecifier(client.service);
+
+    // make sure the API key is valid for the service we're requesting a schema of.
+    const keyServiceName = getServiceFromKey(engine.apiKey);
+    if (id !== keyServiceName) {
+      throw new Error(
+        `API key service name (${keyServiceName}) does not match the service name in your config (${id}). Try changing the service name in your config to ${keyServiceName} or get a new key.`
+      );
+    }
+
     const { data, errors } = await this.client.execute<GetSchemaByTag>({
       query: SCHEMA_QUERY,
       variables: {