pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve connect error messages

This commit is contained in:
Luke Pulverenti 2016-04-10 17:11:06 -04:00
parent 4f8764ee5a
commit 3d1c950de8
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
View File

@ -24,6 +24,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using CommonIO;
using MediaBrowser.Common.Extensions;
namespace MediaBrowser.Server.Implementations.Connect
{
@ -555,9 +556,22 @@ namespace MediaBrowser.Server.Implementations.Connect
}
catch (HttpException ex)
{
if (!ex.StatusCode.HasValue ||
ex.StatusCode.Value != HttpStatusCode.NotFound ||
!Validator.EmailIsValid(connectUsername))
if (!ex.StatusCode.HasValue)
{
throw;
}
// If they entered a username, then whatever the error is just throw it, for example, user not found
if (!Validator.EmailIsValid(connectUsername))
{
if (ex.StatusCode.Value == HttpStatusCode.NotFound)
{
throw new ResourceNotFoundException();
}
throw;
}
if (ex.StatusCode.Value != HttpStatusCode.NotFound)
{
throw;
}

3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -1688,9 +1688,6 @@
<Content Include="dashboard-ui\strings\ru.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\strings\server.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\strings\sl-SI.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>