diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-08 13:13:18 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-08 13:13:18 -0400 |
| commit | 1a0a50c8ab2a2ce8a9eb1601b4205899c5d6d073 (patch) | |
| tree | 22ee59705b8291bbf76a0e8648c49e0898a3134a | |
| parent | 56eea6a626c439e631433500357ced09f72a6fb2 (diff) | |
added /users/public endpoint
| -rw-r--r-- | MediaBrowser.Api/UserService.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.Common.Implementations/BaseApplicationHost.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/ApplicationHost.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/ApiClient.js | 11 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/packages.config | 2 |
5 files changed, 41 insertions, 10 deletions
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index 87e1630aa..b63bafbc0 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -27,6 +27,12 @@ namespace MediaBrowser.Api public bool? IsDisabled { get; set; } } + [Route("/Users/Public", "GET")] + [Api(Description = "Gets a list of publicly visible users for display on a login screen.")] + public class GetPublicUsers : IReturn<List<UserDto>> + { + } + /// <summary> /// Class GetUser /// </summary> @@ -187,6 +193,14 @@ namespace MediaBrowser.Api _libraryManager = libraryManager; } + public object Get(GetPublicUsers request) + { + return Get(new GetUsers + { + IsHidden = false + }); + } + /// <summary> /// Gets the specified request. /// </summary> diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs index 197142590..4d7743485 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs @@ -571,14 +571,8 @@ namespace MediaBrowser.Common.Implementations /// <param name="cancellationToken">The cancellation token.</param> /// <param name="progress">The progress.</param> /// <returns>Task{CheckForUpdateResult}.</returns> - public virtual async Task<CheckForUpdateResult> CheckForApplicationUpdate(CancellationToken cancellationToken, IProgress<double> progress) - { - var availablePackages = await PackageManager.GetAvailablePackagesWithoutRegistrationInfo(CancellationToken.None).ConfigureAwait(false); - var version = InstallationManager.GetLatestCompatibleVersion(availablePackages, Constants.Constants.MbServerPkgName, ConfigurationManager.CommonConfiguration.SystemUpdateLevel); - - return version != null ? new CheckForUpdateResult { AvailableVersion = version.version, IsUpdateAvailable = version.version > ApplicationVersion, Package = version } : - new CheckForUpdateResult { AvailableVersion = ApplicationVersion, IsUpdateAvailable = false }; - } + public abstract Task<CheckForUpdateResult> CheckForApplicationUpdate(CancellationToken cancellationToken, + IProgress<double> progress); /// <summary> /// Updates the application. diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 205db36b2..2f78f0d8f 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -1,6 +1,8 @@ -using MediaBrowser.Api; +using System.Threading; +using MediaBrowser.Api; using MediaBrowser.Common; using MediaBrowser.Common.Configuration; +using MediaBrowser.Common.Constants; using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Implementations; using MediaBrowser.Common.Implementations.ScheduledTasks; @@ -27,6 +29,7 @@ using MediaBrowser.IsoMounter; using MediaBrowser.Model.IO; using MediaBrowser.Model.MediaInfo; using MediaBrowser.Model.System; +using MediaBrowser.Model.Updates; using MediaBrowser.Providers; using MediaBrowser.Server.Implementations; using MediaBrowser.Server.Implementations.BdInfo; @@ -620,5 +623,14 @@ namespace MediaBrowser.ServerApplication process.WaitForExit(); } } + + public override async Task<CheckForUpdateResult> CheckForApplicationUpdate(CancellationToken cancellationToken, IProgress<double> progress) + { + var availablePackages = await PackageManager.GetAvailablePackagesWithoutRegistrationInfo(CancellationToken.None).ConfigureAwait(false); + var version = InstallationManager.GetLatestCompatibleVersion(availablePackages, Constants.MbServerPkgName, ConfigurationManager.CommonConfiguration.SystemUpdateLevel); + + return version != null ? new CheckForUpdateResult { AvailableVersion = version.version, IsUpdateAvailable = version.version > ApplicationVersion, Package = version } : + new CheckForUpdateResult { AvailableVersion = ApplicationVersion, IsUpdateAvailable = false }; + } } } diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js index 4a0222139..8b602610a 100644 --- a/MediaBrowser.WebDashboard/ApiClient.js +++ b/MediaBrowser.WebDashboard/ApiClient.js @@ -1429,6 +1429,17 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { }); }; + self.getPublicUsers = function () { + + var url = self.getUrl("users/public"); + + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; + /** * Gets all users from the server */ diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config index a8a737923..a1b6ec005 100644 --- a/MediaBrowser.WebDashboard/packages.config +++ b/MediaBrowser.WebDashboard/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="MediaBrowser.ApiClient.Javascript" version="3.0.138" targetFramework="net45" /> + <package id="MediaBrowser.ApiClient.Javascript" version="3.0.139" targetFramework="net45" /> <package id="ServiceStack.Common" version="3.9.54" targetFramework="net45" /> <package id="ServiceStack.Text" version="3.9.54" targetFramework="net45" /> </packages>
\ No newline at end of file |
