diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Connect/ConnectManager.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/UserManager.cs | 9 |
2 files changed, 6 insertions, 15 deletions
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index 6a1c3f0746..3933b180e2 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -261,18 +261,6 @@ namespace MediaBrowser.Server.Implementations.Connect return user; } - public ConnectUserLink GetUserInfo(string userId) - { - var user = GetUser(userId); - - return new ConnectUserLink - { - LocalUserId = user.Id.ToString("N"), - Username = user.ConnectUserName, - UserId = user.ConnectUserId - }; - } - private string GetConnectUrl(string handler) { return "https://connect.mediabrowser.tv/service/" + handler; diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs index 47d6b17f0c..16a1dc516b 100644 --- a/MediaBrowser.Server.Implementations/Library/UserManager.cs +++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs @@ -86,7 +86,7 @@ namespace MediaBrowser.Server.Implementations.Library /// </summary> public event EventHandler<GenericEventArgs<User>> UserUpdated; public event EventHandler<GenericEventArgs<User>> UserConfigurationUpdated; - + /// <summary> /// Called when [user updated]. /// </summary> @@ -137,7 +137,7 @@ namespace MediaBrowser.Server.Implementations.Library { return GetUserById(new Guid(id)); } - + public async Task Initialize() { Users = await LoadUsers().ConfigureAwait(false); @@ -260,7 +260,10 @@ namespace MediaBrowser.Server.Implementations.Library HasConfiguredPassword = hasConfiguredDefaultPassword, LastActivityDate = user.LastActivityDate, LastLoginDate = user.LastLoginDate, - Configuration = user.Configuration + Configuration = user.Configuration, + ConnectLinkType = user.ConnectLinkType, + ConnectUserId = user.ConnectUserId, + ConnectUserName = user.ConnectUserName }; var image = user.GetImageInfo(ImageType.Primary, 0); |
