Added support for .net 4.6

JohnnyCrazy · JohnnyCrazy · commit 2f8bf6877ff6 · 2018-09-04T14:39:07.000+02:00
diff --git a/SpotifyAPI.Web.Auth/AuthUtil.cs b/SpotifyAPI.Web.Auth/AuthUtil.cs
@@ -7,6 +7,7 @@ internal static class AuthUtil
     {
         public static void OpenBrowser(string url)
         {
+#if NETSTANDARD2_0
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 url = url.Replace("&", "^&");
@@ -24,6 +25,10 @@ public static void OpenBrowser(string url)
             {
                 // throw 
             }
+#else
+            url = url.Replace("&", "^&");
+            Process.Start(new ProcessStartInfo("cmd", $"/c start {url}"));
+#endif
         }
     }
 }
diff --git a/SpotifyAPI.Web.Auth/AuthorizationCodeAuth.cs b/SpotifyAPI.Web.Auth/AuthorizationCodeAuth.cs
@@ -1,17 +1,21 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using SpotifyAPI.Web.Enums;
 using SpotifyAPI.Web.Models;
 using Unosquare.Labs.EmbedIO;
 using Unosquare.Labs.EmbedIO.Constants;
 using Unosquare.Labs.EmbedIO.Modules;
+#if NETSTANDARD2_0
+using System.Net.Http;
+#endif
+#if NET46
+using System.Net.Http;
+using HttpListenerContext = Unosquare.Net.HttpListenerContext;
+#endif
 
 namespace SpotifyAPI.Web.Auth
 {
@@ -91,7 +95,11 @@ public Task<bool> GetEmpty(WebServer server, HttpListenerContext context)
                 Error = error
             }));
 
+#if NETSTANDARD2_0
             return context.StringResponseAsync("OK - This window can be closed now");
+#else
+            return context.StringResponseAsync("OK - This window can be closed now");
+#endif
         }
 
         [WebApiHandler(HttpVerbs.Post, "/")]
@@ -107,9 +115,7 @@ public bool PostValues(WebServer server, HttpListenerContext context)
             auth.SecretId = (string) formParams["secretId"];
 
             string uri = auth.GetUri();
-            context.Response.Redirect(uri);
-
-            return true;
+            return context.Redirect(uri, false);
         }
     }
-}
+}
diff --git a/SpotifyAPI.Web.Auth/ImplictGrantAuth.cs b/SpotifyAPI.Web.Auth/ImplictGrantAuth.cs
@@ -1,4 +1,5 @@
-﻿using System.Net;
+using System;
+using System.Net;
 using System.Threading.Tasks;
 using SpotifyAPI.Web.Enums;
 using SpotifyAPI.Web.Models;
@@ -18,20 +19,22 @@ public ImplictGrantAuth(string clientId, string redirectUri, string serverUri, S
 
         protected override WebServer AdaptWebServer(WebServer webServer)
         {
-            return webServer.WithWebApiController<ImplictGrantAuthController>();
+            Console.WriteLine("Hello");
+            webServer.Module<WebApiModule>().RegisterController<ImplictGrantAuthController>();
+            return webServer;
         }
     }
 
     public class ImplictGrantAuthController : WebApiController
     {
-        [WebApiHandler(HttpVerbs.Get, "/auth")]
-        public Task<bool> GetAuth(WebServer server, HttpListenerContext context)
+        [WebApiHandler(HttpVerbs.Get, "/authe")]
+        public bool GetAuth(WebServer server, HttpListenerContext context)
         {
             string state = context.Request.QueryString["state"];
             SpotifyAuthServer<Token> auth = ImplictGrantAuth.GetByState(state);
             if (auth == null)
-                return context.StringResponseAsync(
-                    $"Failed - Unable to find auth request with state \"{state}\" - Please retry");
+                return true; /*context.StringResponseAsync(
+                    $"Failed - Unable to find auth request with state \"{state}\" - Please retry");*/
 
             Token token;
             string error = context.Request.QueryString["error"];
@@ -56,7 +59,8 @@ public Task<bool> GetAuth(WebServer server, HttpListenerContext context)
             }
 
             Task.Factory.StartNew(() => auth?.TriggerAuth(token));
-            return context.StringResponseAsync("OK - This window can be closed now");
+            return true;
+            // return context.StringResponseAsync("OK - This window can be closed now");
         }
     }
-}
+}
diff --git a/SpotifyAPI.Web.Auth/SpotifyAPI.Web.Auth.csproj b/SpotifyAPI.Web.Auth/SpotifyAPI.Web.Auth.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EmbedIO" Version="1.15.0" />
+    <PackageReference Include="EmbedIO" Version="1.16.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -30,4 +30,9 @@
     <Folder Include="Properties\" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+
 </Project>
diff --git a/SpotifyAPI.Web.Auth/SpotifyAPI.Web.Auth.nuspec b/SpotifyAPI.Web.Auth/SpotifyAPI.Web.Auth.nuspec
@@ -23,7 +23,9 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="bin\Release\netstandard2.0\SpotifyAPI.Web.Auth.dll" target="lib\SpotifyAPI.Web.Auth.dll" />
-    <file src="bin\Release\netstandard2.0\SpotifyAPI.Web.Auth.xml" target="lib\SpotifyAPI.Web.Auth.xml" />
+    <file src="bin\Release\netstandard2.0\SpotifyAPI.Web.Auth.dll" target="lib\netstandard2.0\SpotifyAPI.Web.Auth.dll" />
+    <file src="bin\Release\netstandard2.0\SpotifyAPI.Web.Auth.xml" target="lib\netstandard2.0\SpotifyAPI.Web.Auth.xml" />
+    <file src="bin\Release\net46\SpotifyAPI.Web.Auth.dll" target="lib\net46\SpotifyAPI.Web.Auth.dll" />
+    <file src="bin\Release\net46\SpotifyAPI.Web.Auth.xml" target="lib\net46\SpotifyAPI.Web.Auth.xml" />
   </files>
 </package>
diff --git a/SpotifyAPI.Web.Auth/SpotifyAuthServer.cs b/SpotifyAPI.Web.Auth/SpotifyAuthServer.cs
@@ -5,6 +5,7 @@
 using System.Threading;
 using SpotifyAPI.Web.Enums;
 using Unosquare.Labs.EmbedIO;
+using Unosquare.Labs.EmbedIO.Constants;
 using Unosquare.Labs.EmbedIO.Modules;
 
 namespace SpotifyAPI.Web.Auth
@@ -20,6 +21,7 @@ public abstract class SpotifyAuthServer<T>
 
         private readonly string _folder;
         private readonly string _type;
+        private WebServer _server;
         protected CancellationTokenSource _serverSource;
 
         public delegate void OnAuthReceived(object sender, T payload);
@@ -41,10 +43,13 @@ public void Start()
         {
             Instances.Add(State, this);
             _serverSource = new CancellationTokenSource();
-            WebServer server = AdaptWebServer(WebServer.Create(ServerUri));
-            server.RegisterModule(new ResourceFilesModule(typeof(ImplictGrantAuth).Assembly, $"SpotifyAPI.Web.Auth.Resources.{_folder}"));
+
+            _server = WebServer.Create(ServerUri, RoutingStrategy.Regex);
+            _server.RegisterModule(new WebApiModule());
+            AdaptWebServer(_server);
+            _server.RegisterModule(new ResourceFilesModule(typeof(ImplictGrantAuth).Assembly, $"SpotifyAPI.Web.Auth.Resources.{_folder}"));
 #pragma warning disable 4014
-            server.RunAsync(_serverSource.Token);
+            _server.RunAsync(_serverSource.Token);
 #pragma warning restore 4014
         }
 
diff --git a/SpotifyAPI.Web.Example/Program.cs b/SpotifyAPI.Web.Example/Program.cs
@@ -27,14 +27,19 @@ static void Main(string[] args)
                 "Tip: If you want to supply your ClientID and SecretId beforehand, use env variables (SPOTIFY_CLIENT_ID and SPOTIFY_SECRET_ID)");
 
 
-            AuthorizationCodeAuth auth =
-                new AuthorizationCodeAuth(_clientId, _secretId, "http://localhost:4002", "http://localhost:4002",
-                    Scope.PlaylistReadPrivate | Scope.PlaylistReadCollaborative);
-            auth.AuthReceived += AuthOnAuthReceived;
+                        AuthorizationCodeAuth auth =
+                            new AuthorizationCodeAuth(_clientId, _secretId, "http://localhost:4002", "http://localhost:4002",
+                                Scope.PlaylistReadPrivate | Scope.PlaylistReadCollaborative);
+                        auth.AuthReceived += AuthOnAuthReceived;
+                        auth.Start();
+                        auth.OpenBrowser();
+
+/*            ImplictGrantAuth auth = new ImplictGrantAuth("26d287105e31491889f3cd293d85bfea", "http://localhost:4002", "http://localhost:4002");
             auth.Start();
-            auth.OpenBrowser();
+            auth.OpenBrowser();*/
 
             Console.ReadLine();
+            auth.Stop(0);
         }
 
         private static async void AuthOnAuthReceived(object sender, AuthorizationCode payload)
diff --git a/SpotifyAPI.Web/SpotifyAPI.Web.csproj b/SpotifyAPI.Web/SpotifyAPI.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -18,4 +18,9 @@
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+
 </Project>
diff --git a/SpotifyAPI.Web/SpotifyAPI.Web.nuspec b/SpotifyAPI.Web/SpotifyAPI.Web.nuspec
@@ -22,7 +22,9 @@
     </dependencies>
   </metadata>
   <files>
-      <file src="bin\Release\netstandard2.0\SpotifyAPI.Web.dll" target="lib\SpotifyAPI.Web.dll" />
-      <file src="bin\Release\netstandard2.0\SpotifyAPI.Web.xml" target="lib\SpotifyAPI.Web.xml" />
+    <file src="bin\Release\netstandard2.0\SpotifyAPI.Web.dll" target="lib\netstandard2.0\SpotifyAPI.Web.dll" />
+    <file src="bin\Release\netstandard2.0\SpotifyAPI.Web.xml" target="lib\netstandard2.0\SpotifyAPI.Web.xml" />
+    <file src="bin\Release\net46\SpotifyAPI.Web.dll" target="lib\net46\SpotifyAPI.Web.dll" />
+    <file src="bin\Release\net46\SpotifyAPI.Web.xml" target="lib\net46\SpotifyAPI.Web.xml" />
   </files>
 </package>

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ internal static class AuthUtil`
`7`	`7`	`{`
`8`	`8`	`public static void OpenBrowser(string url)`
`9`	`9`	`{`
	`10`	`+#if NETSTANDARD2_0`
`10`	`11`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
`11`	`12`	`{`
`12`	`13`	`url = url.Replace("&", "^&");`
`@@ -24,6 +25,10 @@ public static void OpenBrowser(string url)`
`24`	`25`	`{`
`25`	`26`	`// throw`
`26`	`27`	`}`
	`28`	`+#else`
	`29`	`+ url = url.Replace("&", "^&");`
	`30`	`+ Process.Start(new ProcessStartInfo("cmd", $"/c start {url}"));`
	`31`	`+#endif`
`27`	`32`	`}`
`28`	`33`	`}`
`29`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Net;`
	`1`	`+using System;`
	`2`	`+using System.Net;`
`2`	`3`	`using System.Threading.Tasks;`
`3`	`4`	`using SpotifyAPI.Web.Enums;`
`4`	`5`	`using SpotifyAPI.Web.Models;`
`@@ -18,20 +19,22 @@ public ImplictGrantAuth(string clientId, string redirectUri, string serverUri, S`
`18`	`19`
`19`	`20`	`protected override WebServer AdaptWebServer(WebServer webServer)`
`20`	`21`	`{`
`21`		`- return webServer.WithWebApiController<ImplictGrantAuthController>();`
	`22`	`+ Console.WriteLine("Hello");`
	`23`	`+ webServer.Module<WebApiModule>().RegisterController<ImplictGrantAuthController>();`
	`24`	`+ return webServer;`
`22`	`25`	`}`
`23`	`26`	`}`
`24`	`27`
`25`	`28`	`public class ImplictGrantAuthController : WebApiController`
`26`	`29`	`{`
`27`		`- [WebApiHandler(HttpVerbs.Get, "/auth")]`
`28`		`- public Task<bool> GetAuth(WebServer server, HttpListenerContext context)`
	`30`	`+ [WebApiHandler(HttpVerbs.Get, "/authe")]`
	`31`	`+ public bool GetAuth(WebServer server, HttpListenerContext context)`
`29`	`32`	`{`
`30`	`33`	`string state = context.Request.QueryString["state"];`
`31`	`34`	`SpotifyAuthServer<Token> auth = ImplictGrantAuth.GetByState(state);`
`32`	`35`	`if (auth == null)`
`33`		`- return context.StringResponseAsync(`
`34`		`- $"Failed - Unable to find auth request with state \"{state}\" - Please retry");`
	`36`	`+ return true; /*context.StringResponseAsync(`
	`37`	`+ $"Failed - Unable to find auth request with state \"{state}\" - Please retry");*/`
`35`	`38`
`36`	`39`	`Token token;`
`37`	`40`	`string error = context.Request.QueryString["error"];`
`@@ -56,7 +59,8 @@ public Task<bool> GetAuth(WebServer server, HttpListenerContext context)`
`56`	`59`	`}`
`57`	`60`
`58`	`61`	`Task.Factory.StartNew(() => auth?.TriggerAuth(token));`
`59`		`- return context.StringResponseAsync("OK - This window can be closed now");`
	`62`	`+ return true;`
	`63`	`+ // return context.StringResponseAsync("OK - This window can be closed now");`
`60`	`64`	`}`
`61`	`65`	`}`
`62`		`-}`
	`66`	`+}`