diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-14 13:25:46 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-14 13:25:46 -0400 |
| commit | 14bb0aa30c4f13e4093b5a80fcb964c0402feda0 (patch) | |
| tree | 9a0bb000c9925a7b790744c904d2c2fc61738ca9 | |
| parent | b12215b3f94dd7f7d5cff6a703b037e215090a98 (diff) | |
check if connect user is active
| -rw-r--r-- | MediaBrowser.Controller/Connect/ConnectUser.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Connect/ConnectManager.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Connect/Responses.cs | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Connect/ConnectUser.cs b/MediaBrowser.Controller/Connect/ConnectUser.cs index c640f9095..2cd14ec7c 100644 --- a/MediaBrowser.Controller/Connect/ConnectUser.cs +++ b/MediaBrowser.Controller/Connect/ConnectUser.cs @@ -11,6 +11,7 @@ namespace MediaBrowser.Controller.Connect public string Id { get; set; } public string Name { get; set; } public string Email { get; set; } + public bool IsActive { get; set; } } public class ConnectUserQuery diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index d0de64a6f..6a1c3f074 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -291,6 +291,11 @@ namespace MediaBrowser.Server.Implementations.Connect }, CancellationToken.None).ConfigureAwait(false); + if (!connectUser.IsActive) + { + throw new ArgumentException("The Media Browser account has been disabled."); + } + var user = GetUser(userId); if (!string.IsNullOrWhiteSpace(user.ConnectUserId)) @@ -422,7 +427,8 @@ namespace MediaBrowser.Server.Implementations.Connect { Email = response.Email, Id = response.Id, - Name = response.Name + Name = response.Name, + IsActive = response.IsActive }; } } diff --git a/MediaBrowser.Server.Implementations/Connect/Responses.cs b/MediaBrowser.Server.Implementations/Connect/Responses.cs index 7a80015d5..a3b0369ba 100644 --- a/MediaBrowser.Server.Implementations/Connect/Responses.cs +++ b/MediaBrowser.Server.Implementations/Connect/Responses.cs @@ -22,7 +22,7 @@ namespace MediaBrowser.Server.Implementations.Connect public string Name { get; set; } public string DisplayName { get; set; } public string Email { get; set; } - public string IsActive { get; set; } + public bool IsActive { get; set; } public string ImageUrl { get; set; } } |