From e83a3e710be75da138ef7b79d7351a4075151efc Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 3 Oct 2014 23:18:57 -0400
Subject: [PATCH] update connection manager

---
 MediaBrowser.Model/ApiClient/IApiClient.cs    | 10 +++++--
 .../ApiClient/IConnectionManager.cs           | 26 ++++---------------
 Nuget/MediaBrowser.Common.Internal.nuspec     |  4 +--
 Nuget/MediaBrowser.Common.nuspec              |  2 +-
 Nuget/MediaBrowser.Model.Signed.nuspec        |  2 +-
 Nuget/MediaBrowser.Server.Core.nuspec         |  4 +--
 6 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 3efdea70d4..6fb72d507f 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.Notifications;
@@ -28,10 +29,15 @@ namespace MediaBrowser.Model.ApiClient
     public interface IApiClient : IServerEvents, IDisposable
     {
         /// <summary>
-        /// Occurs when [HTTP response received].
+        /// Occurs when [remote logged out].
         /// </summary>
-        event EventHandler<HttpResponseEventArgs> HttpResponseReceived;
+        event EventHandler<EventArgs> RemoteLoggedOut;
 
+        /// <summary>
+        /// Occurs when [authenticated].
+        /// </summary>
+        event EventHandler<GenericEventArgs<AuthenticationResult>> Authenticated;
+        
         /// <summary>
         /// Gets the API URL.
         /// </summary>
diff --git a/MediaBrowser.Model/ApiClient/IConnectionManager.cs b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
index 67bc80e5a8..03d3472d25 100644
--- a/MediaBrowser.Model/ApiClient/IConnectionManager.cs
+++ b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Events;
-using MediaBrowser.Model.Users;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,6 +13,11 @@ namespace MediaBrowser.Model.ApiClient
         /// </summary>
         event EventHandler<GenericEventArgs<ConnectionResult>> Connected;
 
+        /// <summary>
+        /// Occurs when [remote logged out].
+        /// </summary>
+        event EventHandler<EventArgs> RemoteLoggedOut;
+        
         /// <summary>
         /// Gets the API client.
         /// </summary>
@@ -49,25 +53,5 @@ namespace MediaBrowser.Model.ApiClient
         /// </summary>
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
         Task<ConnectionResult> Logout();
-
-        /// <summary>
-        /// Authenticates with a specific server
-        /// </summary>
-        /// <param name="server">The server.</param>
-        /// <param name="username">The username.</param>
-        /// <param name="hash">The hash.</param>
-        /// <param name="rememberLogin">if set to <c>true</c> [remember login].</param>
-        /// <returns>Task.</returns>
-        Task<AuthenticationResult> Authenticate(ServerInfo server, string username, byte[] hash, bool rememberLogin);
-
-        /// <summary>
-        /// Authenticates with a specific server
-        /// </summary>
-        /// <param name="apiClient">The API client.</param>
-        /// <param name="username">The username.</param>
-        /// <param name="hash">The hash.</param>
-        /// <param name="rememberLogin">if set to <c>true</c> [remember login].</param>
-        /// <returns>Task.</returns>
-        Task<AuthenticationResult> Authenticate(IApiClient apiClient, string username, byte[] hash, bool rememberLogin);
     }
 }
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index faf1f48b2e..ef6502a7a1 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.460</version>
+        <version>3.0.462</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.460" />
+            <dependency id="MediaBrowser.Common" version="3.0.462" />
             <dependency id="NLog" version="3.1.0.0" />
             <dependency id="SimpleInjector" version="2.5.2" />
             <dependency id="sharpcompress" version="0.10.2" />
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index d3f8ccc6f4..75c7439b2d 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.460</version>
+        <version>3.0.462</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec
index df18dc9e58..027d23a210 100644
--- a/Nuget/MediaBrowser.Model.Signed.nuspec
+++ b/Nuget/MediaBrowser.Model.Signed.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Model.Signed</id>
-        <version>3.0.460</version>
+        <version>3.0.462</version>
         <title>MediaBrowser.Model - Signed Edition</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index da7f371f14..326d8214ea 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.460</version>
+        <version>3.0.462</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.460" />
+            <dependency id="MediaBrowser.Common" version="3.0.462" />
         </dependencies>
     </metadata>
     <files>