diff options
Diffstat (limited to 'MediaBrowser.Controller')
4 files changed, 2 insertions, 18 deletions
diff --git a/MediaBrowser.Controller/Connect/ConnectUserLink.cs b/MediaBrowser.Controller/Connect/ConnectUserLink.cs deleted file mode 100644 index 93de6d8b4e..0000000000 --- a/MediaBrowser.Controller/Connect/ConnectUserLink.cs +++ /dev/null @@ -1,10 +0,0 @@ - -namespace MediaBrowser.Controller.Connect -{ - public class ConnectUserLink - { - public string Username { get; set; } - public string UserId { get; set; } - public string LocalUserId { get; set; } - } -} diff --git a/MediaBrowser.Controller/Connect/IConnectManager.cs b/MediaBrowser.Controller/Connect/IConnectManager.cs index 6c2128cd3f..8bdb76ea41 100644 --- a/MediaBrowser.Controller/Connect/IConnectManager.cs +++ b/MediaBrowser.Controller/Connect/IConnectManager.cs @@ -11,13 +11,6 @@ namespace MediaBrowser.Controller.Connect string WanApiAddress { get; } /// <summary> - /// Gets the user information. - /// </summary> - /// <param name="userId">The user identifier.</param> - /// <returns>ConnectUserInfo.</returns> - ConnectUserLink GetUserInfo(string userId); - - /// <summary> /// Links the user. /// </summary> /// <param name="userId">The user identifier.</param> diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs index c0c7a6c531..e0682c9ee9 100644 --- a/MediaBrowser.Controller/Entities/User.cs +++ b/MediaBrowser.Controller/Entities/User.cs @@ -2,6 +2,7 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Configuration; +using MediaBrowser.Model.Connect; using MediaBrowser.Model.Serialization; using System; using System.IO; @@ -34,6 +35,7 @@ namespace MediaBrowser.Controller.Entities public string ConnectUserName { get; set; } public string ConnectUserId { get; set; } + public UserLinkType ConnectLinkType { get; set; } public string ConnectAccessKey { get; set; } /// <summary> diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 1d23a82a9e..fa10642324 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -101,7 +101,6 @@ <Compile Include="Collections\ICollectionManager.cs" /> <Compile Include="Connect\ConnectInvitationRequest.cs" /> <Compile Include="Connect\ConnectUser.cs" /> - <Compile Include="Connect\ConnectUserLink.cs" /> <Compile Include="Connect\IConnectManager.cs" /> <Compile Include="Dlna\ControlRequest.cs" /> <Compile Include="Dlna\ControlResponse.cs" /> |