Merge pull request #25 from JosephWoodward/ChangePath

Few tweaks

README.md

@@ -63,3 +63,18 @@ By default GraphiQL lives on the aforementioned `/graphql` endpoint, however it
 ```csharp
 app.UseGraphiQl('/whatever/graphiql');
 ```
+
+You can also specify GraphiQl endpoint independent of your GraphQL API, this is especially useful if you're hosting in IIS in a virtual application (ie `myapp.com/1.0/...`) or hosting API and documentation separately.
+
+```csharp
+public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+{
+    app.UseGraphiQl("/graphql", "/v1/yourapi");
+
+    app.UseMvc();
+}
+```
+
+Now navigating to `/graphql` will display the GraphiQL UI, but your GraphQL API will live under the `/v1/yourapi` route.
+
+

src/graphiql.example/Controllers/GraphQlController.cs

@@ -15,7 +15,7 @@ public class GraphQlController : Controller
         public async Task<IActionResult> Post([FromBody] GraphQlQuery query)
         {
             var schema = new Schema {Query = new StarWarsQuery()};
-
+            
             var result = await new DocumentExecuter().ExecuteAsync(x =>
             {
                 x.Schema = schema;

src/graphiql.example/Startup.cs

@@ -27,6 +27,7 @@ public void ConfigureServices(IServiceCollection services)
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
             app.UseGraphiQl(GraphQlPath);
+            /*app.UseGraphiQl(GraphQlPath, "/v1/something");*/
             app.UseMvc();
         }
     }

src/graphiql/GraphiQlExtensions.cs

@@ -14,21 +14,25 @@ public static class GraphiQlExtensions
         public static IApplicationBuilder UseGraphiQl(this IApplicationBuilder app)
             => UseGraphiQl(app, DefaultPath);
 
+        public static IApplicationBuilder UseGraphiQl(this IApplicationBuilder app, string path)
+            => UseGraphiQl(app, path, null);
+
+        /// <param name="path"></param>
         /// <param name="apiPath">In some scenarios it makes sense to specify the API path and file server path independently
         /// Examples: hosting in IIS in a virtual application (myapp.com/1.0/...) or hosting API and documentation separately</param>
-        public static IApplicationBuilder UseGraphiQl(this IApplicationBuilder app, string fileServerPath, string apiPath = null)
+        public static IApplicationBuilder UseGraphiQl(this IApplicationBuilder app, string path, string apiPath)
         {
-            if (string.IsNullOrWhiteSpace(fileServerPath))
-                throw new ArgumentException(nameof(fileServerPath));
+            if (string.IsNullOrWhiteSpace(path))
+                throw new ArgumentException(nameof(path));
 
-            var p = fileServerPath.EndsWith("/") ? fileServerPath : $"{fileServerPath}/" + "graphql-path.js";
-            app.Map(p, x => WritePathJavaScript(x, apiPath ?? fileServerPath));
+            var filePath = path.EndsWith("/") ? path : $"{path}/" + "graphql-path.js";
+            var uri = !string.IsNullOrWhiteSpace(apiPath) ? apiPath : path; 
+            app.Map(filePath, x => WritePathJavaScript(x, uri));
 
-            return UseGraphiQlImp(app, x => x.SetPath(fileServerPath));
+            return UseGraphiQlImp(app, x => x.SetPath(path));
         }
 
-        private static IApplicationBuilder UseGraphiQlImp(this IApplicationBuilder app,
-            Action<GraphiQlConfig> setConfig)
+        private static IApplicationBuilder UseGraphiQlImp(this IApplicationBuilder app, Action<GraphiQlConfig> setConfig)
         {
             if (app == null)
                 throw new ArgumentNullException(nameof(app));

src/graphiql/graphiql.csproj

@@ -5,7 +5,7 @@
     <PackageTags>graphql;graphiql;asp.net core;.net core</PackageTags>
     <title>GraphiQL ASP.NET Core Middleware</title>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0-beta-2</VersionPrefix>
     <Authors>Joseph Woodward</Authors>
     <Description>GraphiQL available as middleware for ASP.NET Core</Description>
     <PackageIconUrl>https://raw.githubusercontent.com/JosephWoodward/graphiql-dotnet/master/assets/logo_128_128.png</PackageIconUrl>
@@ -21,4 +21,4 @@
   <ItemGroup>
     <EmbeddedResource Include="./assets/**/*.*" />
   </ItemGroup>
-</Project>
+</Project>