alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-07 16:28:56 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

add connect error handling

Browse Source
This commit is contained in:
Luke Pulverenti
2014-09-14 13:12:47 -04:00
parent 31ed30d584
commit b12215b3f9
5 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,7 +295,7 @@ namespace MediaBrowser.Server.Implementations.Connect
if (!string.IsNullOrWhiteSpace(user.ConnectUserId))
{
await RemoveLink(user, connectUser).ConfigureAwait(false);
await RemoveLink(user, connectUser.Id).ConfigureAwait(false);
}
var url = GetConnectUrl("ServerAuthorizations");
@@ -323,6 +323,7 @@ namespace MediaBrowser.Server.Implementations.Connect
// No need to examine the response
using (var stream = (await _httpClient.Post(options).ConfigureAwait(false)).Content)
{
var response = _json.DeserializeFromStream<ServerUserAuthorizationResponse>(stream);
}
user.ConnectAccessKey = accessToken;
@@ -332,44 +333,55 @@ namespace MediaBrowser.Server.Implementations.Connect
await user.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
}
public async Task RemoveLink(string userId)
public Task RemoveLink(string userId)
{
var user = GetUser(userId);
var connectUser = await GetConnectUser(new ConnectUserQuery
{
Name = user.ConnectUserId
}, CancellationToken.None).ConfigureAwait(false);
await RemoveLink(user, connectUser).ConfigureAwait(false);
return RemoveLink(user, user.ConnectUserId);
}
public async Task RemoveLink(User user, ConnectUser connectUser)
private async Task RemoveLink(User user, string connectUserId)
{
var url = GetConnectUrl("ServerAuthorizations");
var options = new HttpRequestOptions
if (!string.IsNullOrWhiteSpace(connectUserId))
{
Url = url,
CancellationToken = CancellationToken.None
};
var url = GetConnectUrl("ServerAuthorizations");
var postData = new Dictionary<string, string>
{
{"serverId", ConnectServerId},
{"userId", connectUser.Id}
};
var options = new HttpRequestOptions
{
Url = url,
CancellationToken = CancellationToken.None
};
options.SetPostData(postData);
var postData = new Dictionary<string, string>
{
{"serverId", ConnectServerId},
{"userId", connectUserId}
};
SetServerAccessToken(options);
options.SetPostData(postData);
// No need to examine the response
using (var stream = (await _httpClient.SendAsync(options, "DELETE").ConfigureAwait(false)).Content)
{
SetServerAccessToken(options);
try
{
// No need to examine the response
using (var stream = (await _httpClient.SendAsync(options, "DELETE").ConfigureAwait(false)).Content)
{
}
}
catch (HttpException ex)
{
// If connect says the auth doesn't exist, we can handle that gracefully since this is a remove operation
if (!ex.StatusCode.HasValue || ex.StatusCode.Value != HttpStatusCode.NotFound)
{
throw;
}
_logger.Debug("Connect returned a 404 when removing a user auth link. Handling it.");
}
}
user.ConnectAccessKey = null;
user.ConnectUserName = null;
user.ConnectUserId = null;

5
MediaBrowser.Server.Implementations/Connect/Responses.cs
View File

@@ -25,4 +25,9 @@ namespace MediaBrowser.Server.Implementations.Connect
public string IsActive { get; set; }
public string ImageUrl { get; set; }
}
public class ServerUserAuthorizationResponse
{
}
}