glenux-archive/cloutier--bird.makeup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added user is gone exception

Browse source
This commit is contained in:
Nicolas Constant 2022-02-09 01:15:48 -05:00
parent e78bc262ed
commit 0e9938b712
No known key found for this signature in database
GPG key ID: 1E9F677FB01A5688
3 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/BirdsiteLive.Domain/ActivityPubService.cs
View file

@ -11,7 +11,6 @@ using BirdsiteLive.ActivityPub.Models;
using BirdsiteLive.Common.Settings; using BirdsiteLive.Common.Settings;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Newtonsoft.Json; using Newtonsoft.Json;
using Org.BouncyCastle.Bcpg;
namespace BirdsiteLive.Domain namespace BirdsiteLive.Domain
{ {
@ -45,6 +44,12 @@ namespace BirdsiteLive.Domain
var httpClient = _httpClientFactory.CreateClient(); var httpClient = _httpClientFactory.CreateClient();
httpClient.DefaultRequestHeaders.Add("Accept", "application/activity+json"); httpClient.DefaultRequestHeaders.Add("Accept", "application/activity+json");
var result = await httpClient.GetAsync(objectId); var result = await httpClient.GetAsync(objectId);
if (result.StatusCode == HttpStatusCode.Gone)
throw new UserIsGoneException();
result.EnsureSuccessStatusCode();
var content = await result.Content.ReadAsStringAsync(); var content = await result.Content.ReadAsStringAsync();
var actor = JsonConvert.DeserializeObject<Actor>(content); var actor = JsonConvert.DeserializeObject<Actor>(content);

8
src/BirdsiteLive.Domain/Exceptions/UserIsGoneException.cs Normal file
View file

@ -0,0 +1,8 @@
using System;
namespace BirdsiteLive.Domain
{
public class UserIsGoneException : Exception
{
}
}

34
src/BirdsiteLive/Controllers/UsersController.cs
View file

@ -183,33 +183,41 @@ namespace BirdsiteLive.Controllers
switch (activity?.type) switch (activity?.type)
{ {
case "Follow": case "Follow":
{ {
var succeeded = await _userService.FollowRequestedAsync(signature, r.Method, r.Path, var succeeded = await _userService.FollowRequestedAsync(signature, r.Method, r.Path,
r.QueryString.ToString(), HeaderHandler.RequestHeaders(r.Headers), activity as ActivityFollow, body); r.QueryString.ToString(), HeaderHandler.RequestHeaders(r.Headers),
if (succeeded) return Accepted(); activity as ActivityFollow, body);
else return Unauthorized(); if (succeeded) return Accepted();
} else return Unauthorized();
}
case "Undo": case "Undo":
if (activity is ActivityUndoFollow) if (activity is ActivityUndoFollow)
{ {
var succeeded = await _userService.UndoFollowRequestedAsync(signature, r.Method, r.Path, var succeeded = await _userService.UndoFollowRequestedAsync(signature, r.Method, r.Path,
r.QueryString.ToString(), HeaderHandler.RequestHeaders(r.Headers), activity as ActivityUndoFollow, body); r.QueryString.ToString(), HeaderHandler.RequestHeaders(r.Headers),
activity as ActivityUndoFollow, body);
if (succeeded) return Accepted(); if (succeeded) return Accepted();
else return Unauthorized(); else return Unauthorized();
} }
return Accepted(); return Accepted();
case "Delete": case "Delete":
{ {
var succeeded = await _userService.DeleteRequestedAsync(signature, r.Method, r.Path, var succeeded = await _userService.DeleteRequestedAsync(signature, r.Method, r.Path,
r.QueryString.ToString(), HeaderHandler.RequestHeaders(r.Headers), activity as ActivityDelete, body); r.QueryString.ToString(), HeaderHandler.RequestHeaders(r.Headers),
if (succeeded) return Accepted(); activity as ActivityDelete, body);
else return Unauthorized(); if (succeeded) return Accepted();
} else return Unauthorized();
}
default: default:
return Accepted(); return Accepted();
} }
} }
} }
catch (UserIsGoneException)
{
return Accepted();
}
catch (UserNotFoundException) catch (UserNotFoundException)
{ {
return NotFound(); return NotFound();