Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

2 files changed, 34 insertions, 14 deletions

diff --git a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
index 39dd41356..ec3613298 100644
--- a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
+++ b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
@@ -158,9 +158,14 @@ namespace MediaBrowser.Common.Implementations.Security
                 return new SupporterInfo();
             }
 
-            var url = MbAdmin.HttpsUrl + "/service/supporter/retrieve?key=" + key;
+            var data = new Dictionary<string, string>
+                {
+                    { "key", key }, 
+                };
+
+            var url = MbAdmin.HttpsUrl + "/service/supporter/retrieve";
 
-            using (var stream = await _httpClient.Get(url, CancellationToken.None).ConfigureAwait(false))
+            using (var stream = await _httpClient.Post(url, data, CancellationToken.None).ConfigureAwait(false))
             {
                 var response = _jsonSerializer.DeserializeFromStream<SuppporterInfoResponse>(stream);
 
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index aab3a2121..f6e91528d 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -1079,20 +1079,25 @@ namespace MediaBrowser.Server.Implementations.Connect
 
             var url = GetConnectUrl("keyAssociation");
 
-            url += "?serverId=" + ConnectServerId;
-            url += "&supporterKey=" + _securityManager.SupporterKey;
-
             var options = new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = CancellationToken.None
             };
 
+            var postData = new Dictionary<string, string>
+                {
+                    {"serverId", ConnectServerId},
+                    {"supporterKey", _securityManager.SupporterKey}
+                };
+
+            options.SetPostData(postData);
+
             SetServerAccessToken(options);
             SetApplicationHeader(options);
 
             // No need to examine the response
-            using (var stream = (await _httpClient.SendAsync(options, "GET").ConfigureAwait(false)).Content)
+            using (var stream = (await _httpClient.SendAsync(options, "POST").ConfigureAwait(false)).Content)
             {
                 return _json.DeserializeFromStream<ConnectSupporterSummary>(stream);
             }
@@ -1107,16 +1112,21 @@ namespace MediaBrowser.Server.Implementations.Connect
 
             var url = GetConnectUrl("keyAssociation");
 
-            url += "?serverId=" + ConnectServerId;
-            url += "&supporterKey=" + _securityManager.SupporterKey;
-            url += "&userId=" + id;
-
             var options = new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = CancellationToken.None
             };
 
+            var postData = new Dictionary<string, string>
+                {
+                    {"serverId", ConnectServerId},
+                    {"supporterKey", _securityManager.SupporterKey},
+                    {"userId", id}
+                };
+
+            options.SetPostData(postData);
+
             SetServerAccessToken(options);
             SetApplicationHeader(options);
 
@@ -1135,16 +1145,21 @@ namespace MediaBrowser.Server.Implementations.Connect
 
             var url = GetConnectUrl("keyAssociation");
 
-            url += "?serverId=" + ConnectServerId;
-            url += "&supporterKey=" + _securityManager.SupporterKey;
-            url += "&userId=" + id;
-
             var options = new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = CancellationToken.None
             };
 
+            var postData = new Dictionary<string, string>
+                {
+                    {"serverId", ConnectServerId},
+                    {"supporterKey", _securityManager.SupporterKey},
+                    {"userId", id}
+                };
+
+            options.SetPostData(postData);
+
             SetServerAccessToken(options);
             SetApplicationHeader(options);