Bump EmbedIO from 2.2.7 to 2.7.4 (#344)

dependabot-preview[bot] · JohnnyCrazy · commit 94d84e1f9d60 · 2019-06-03T15:18:10.000+02:00
* Bump EmbedIO from 2.2.7 to 2.7.4 Bumps [EmbedIO](https://github.com/unosquare/embedio) from 2.2.7 to 2.7.4. - [Release notes](https://github.com/unosquare/embedio/releases) - [Commits](https://github.com/unosquare/embedio/commits/2.7.4) * Update SpotifyAPI.Web.Auth.csproj * Updated code to be compatible with EmbedIO 2.8
diff --git a/SpotifyAPI.Web.Auth/AuthorizationCodeAuth.cs b/SpotifyAPI.Web.Auth/AuthorizationCodeAuth.cs
@@ -108,13 +108,13 @@ public Task<bool> GetEmpty()
                 Error = error
             }));
             
-            return this.StringResponseAsync("OK - This window can be closed now");
+            return HttpContext.HtmlResponseAsync("<html><script type=\"text/javascript\">window.close();</script>OK - This window can be closed now</html>");
         }
 
         [WebApiHandler(HttpVerbs.Post, "/")]
         public async Task<bool> PostValues()
         {
-            Dictionary<string, object> formParams = await this.RequestFormDataDictionaryAsync();
+            Dictionary<string, object> formParams = await HttpContext.RequestFormDataDictionaryAsync();
 
             string state = (string) formParams["state"];
             AuthorizationCodeAuth.Instances.TryGetValue(state, out SpotifyAuthServer<AuthorizationCode> authServer);
@@ -124,7 +124,7 @@ public async Task<bool> PostValues()
             auth.SecretId = (string) formParams["secretId"];
 
             string uri = auth.GetUri();
-            return this.Redirect(uri, false);
+            return HttpContext.Redirect(uri, false);
         }
 
         public AuthorizationCodeAuthController(IHttpContext context) : base(context)
diff --git a/SpotifyAPI.Web.Auth/ImplicitGrantAuth.cs b/SpotifyAPI.Web.Auth/ImplicitGrantAuth.cs
@@ -29,7 +29,7 @@ public Task<bool> GetAuth()
             string state = Request.QueryString["state"];
             SpotifyAuthServer<Token> auth = ImplicitGrantAuth.GetByState(state);
             if (auth == null)
-                return this.StringResponseAsync(
+                return HttpContext.StringResponseAsync(
                     $"Failed - Unable to find auth request with state \"{state}\" - Please retry");
 
             Token token;
@@ -55,7 +55,7 @@ public Task<bool> GetAuth()
             }
 
             Task.Factory.StartNew(() => auth.TriggerAuth(token));
-            return this.StringResponseAsync("<html><script type=\"text/javascript\">window.close();</script>OK - This window can be closed now</html>");
+            return HttpContext.HtmlResponseAsync("<html><script type=\"text/javascript\">window.close();</script>OK - This window can be closed now</html>");
         }
 
         public ImplicitGrantAuthController(IHttpContext context) : base(context)
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>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EmbedIO" Version="2.2.7" />
+    <PackageReference Include="EmbedIO" Version="2.8.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SpotifyAPI.Web.Auth/TokenSwapAuth.cs b/SpotifyAPI.Web.Auth/TokenSwapAuth.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using SpotifyAPI.Web.Enums;
@@ -9,13 +8,7 @@
 using Unosquare.Labs.EmbedIO.Modules;
 using SpotifyAPI.Web.Models;
 using Newtonsoft.Json;
-#if NETSTANDARD2_0
 using System.Net.Http;
-#endif
-#if NET46
-using System.Net.Http;
-using HttpListenerContext = Unosquare.Net.HttpListenerContext;
-#endif
 
 namespace SpotifyAPI.Web.Auth
 {
@@ -211,7 +204,7 @@ public Task<bool> GetAuth()
                 Code = code,
                 Error = error
             }));
-            return this.HtmlResponseAsync(((TokenSwapAuth)auth).HtmlResponse);
+            return HttpContext.HtmlResponseAsync(((TokenSwapAuth)auth).HtmlResponse);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -108,13 +108,13 @@ public Task<bool> GetEmpty()`
`108`	`108`	`Error = error`
`109`	`109`	`}));`
`110`	`110`
`111`		`- return this.StringResponseAsync("OK - This window can be closed now");`
	`111`	`+ return HttpContext.HtmlResponseAsync("<html><script type=\"text/javascript\">window.close();</script>OK - This window can be closed now</html>");`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`[WebApiHandler(HttpVerbs.Post, "/")]`
`115`	`115`	`public async Task<bool> PostValues()`
`116`	`116`	`{`
`117`		`- Dictionary<string, object> formParams = await this.RequestFormDataDictionaryAsync();`
	`117`	`+ Dictionary<string, object> formParams = await HttpContext.RequestFormDataDictionaryAsync();`
`118`	`118`
`119`	`119`	`string state = (string) formParams["state"];`
`120`	`120`	`AuthorizationCodeAuth.Instances.TryGetValue(state, out SpotifyAuthServer<AuthorizationCode> authServer);`
`@@ -124,7 +124,7 @@ public async Task<bool> PostValues()`
`124`	`124`	`auth.SecretId = (string) formParams["secretId"];`
`125`	`125`
`126`	`126`	`string uri = auth.GetUri();`
`127`		`- return this.Redirect(uri, false);`
	`127`	`+ return HttpContext.Redirect(uri, false);`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`public AuthorizationCodeAuthController(IHttpContext context) : base(context)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public Task<bool> GetAuth()`
`29`	`29`	`string state = Request.QueryString["state"];`
`30`	`30`	`SpotifyAuthServer<Token> auth = ImplicitGrantAuth.GetByState(state);`
`31`	`31`	`if (auth == null)`
`32`		`- return this.StringResponseAsync(`
	`32`	`+ return HttpContext.StringResponseAsync(`
`33`	`33`	`$"Failed - Unable to find auth request with state \"{state}\" - Please retry");`
`34`	`34`
`35`	`35`	`Token token;`
`@@ -55,7 +55,7 @@ public Task<bool> GetAuth()`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`Task.Factory.StartNew(() => auth.TriggerAuth(token));`
`58`		`- return this.StringResponseAsync("<html><script type=\"text/javascript\">window.close();</script>OK - This window can be closed now</html>");`
	`58`	`+ return HttpContext.HtmlResponseAsync("<html><script type=\"text/javascript\">window.close();</script>OK - This window can be closed now</html>");`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public ImplicitGrantAuthController(IHttpContext context) : base(context)`