From 6a118171925c80fae9ca0d6012fab3aa9d29510c Mon Sep 17 00:00:00 2001
From: Walter Barbagallo <walter.barbagallo@satispay.com>
Date: Wed, 12 Jul 2017 15:23:48 +0200
Subject: [PATCH] Reverted. Simplified resolution

This reverts commit cbb7be90f830acf6a5f1f36d94077afa57188e7b.
---
 packages/graphql-server-micro/README.md       |  6 ------
 .../graphql-server-micro/src/microApollo.ts   | 20 +++++++------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/packages/graphql-server-micro/README.md b/packages/graphql-server-micro/README.md
index ea3a91d6..7cc6d50a 100644
--- a/packages/graphql-server-micro/README.md
+++ b/packages/graphql-server-micro/README.md
@@ -18,12 +18,6 @@ const server = micro(
     get("/graphql", graphqlHandler),
     post("/graphql", graphqlHandler),
     get("/graphiql", graphiqlHandler),
-    get("/noop", (req, res) => {
-      // Micro router requires at least one 200 route
-      // or you will always get a 404
-      return send(res, 200, "");
-    }),
-    
     (req, res) => send(res, 404, "not found"),
   ),
 );
diff --git a/packages/graphql-server-micro/src/microApollo.ts b/packages/graphql-server-micro/src/microApollo.ts
index ee1ef92d..bffedb99 100644
--- a/packages/graphql-server-micro/src/microApollo.ts
+++ b/packages/graphql-server-micro/src/microApollo.ts
@@ -61,22 +61,16 @@ export interface MicroGraphiQLOptionsFunction {
 }
 
 export function microGraphiql(options: GraphiQL.GraphiQLData | MicroGraphiQLOptionsFunction): RequestHandler {
-  return async (req: IncomingMessage, res: ServerResponse) => {
+  return (req: IncomingMessage, res: ServerResponse) => {
     const query = req.url && url.parse(req.url, true).query || {};
-    let graphiqlString;
-
-    try {
-      graphiqlString = await GraphiQL.resolveGraphiQLString(query, options, req);
-    } catch (error) {
+    return GraphiQL.resolveGraphiQLString(query, options, req).then(graphiqlString => {
+      res.setHeader('Content-Type', 'text/html');
+      res.write(graphiqlString);
+      res.end();
+    }, error => {
       res.statusCode = 500;
       res.write(error.message);
       res.end();
-      return;
-    }
-
-    res.setHeader('Content-Type', 'text/html');
-    res.write(graphiqlString);
-    res.end();
-    return;
+    });
   };
 }