House rules: primary constructors, a cancellation token on every async call, and the rules fail the build
Build / Build (push) Successful in 30s
Build / Build (push) Successful in 30s
- Services, controllers and jobs take their dependencies through primary constructors and use them directly; where a method already named a local after a dependency, the dependency takes its type's name. - Every async method takes a CancellationToken last and passes it down to MongoDB, HTTP and the job queue. The setup claim is still given back when a request is cancelled. - The federation and media options are read through IOptionsMonitor. - The Mastodon entities keep sending "" for empty strings, and every model field where null means something says so. - The inbox's 503 with Retry-After, which other servers retry, is the one server error left, and says why. - Arasaka.HouseRules.Analyzers checks all of this in every build, here and in PrivaPub.ClientModels as decePubClient builds it. Checked against GoToSocial in the pasture: 64 passed, 0 failed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01W4YtEJrgxG12Pc39Fai8Bd
This commit is contained in:
1 parent
f0a14c737f
commit
0f73f69239
176 files changed
+2789
-3974
No files matched your search
@@ -13,17 +13,10 @@ using static OpenIddict.Abstractions.OpenIddictConstants;
|
||||
|
||||
namespace PrivaPub.Api.Mastodon.Controllers
|
||||
{
|
||||
public class AppsController : MastodonController
|
||||
public class AppsController(
|
||||
IOpenIddictApplicationManager applications,
|
||||
PrivaPub.Infrastructure.Push.IVapid vapid) : MastodonController
|
||||
{
|
||||
readonly IOpenIddictApplicationManager _applications;
|
||||
readonly PrivaPub.Infrastructure.Push.IVapid _vapid;
|
||||
|
||||
public AppsController(IOpenIddictApplicationManager applications, PrivaPub.Infrastructure.Push.IVapid vapid)
|
||||
{
|
||||
_applications = applications;
|
||||
_vapid = vapid;
|
||||
}
|
||||
|
||||
[HttpPost("/api/v1/apps"), AllowAnonymous]
|
||||
public async Task<IActionResult> Create(CancellationToken token)
|
||||
{
|
||||
@@ -61,10 +54,10 @@ namespace PrivaPub.Api.Mastodon.Controllers
|
||||
if (Uri.TryCreate(website, UriKind.Absolute, out var site) && site.Scheme is "https" or "http")
|
||||
descriptor.Properties["website"] = System.Text.Json.JsonSerializer.SerializeToElement(website);
|
||||
|
||||
var application = await _applications.CreateAsync(descriptor, token);
|
||||
var application = await applications.CreateAsync(descriptor, token);
|
||||
return Json(new Application
|
||||
{
|
||||
Id = await _applications.GetIdAsync(application, token),
|
||||
Id = await applications.GetIdAsync(application, token),
|
||||
Name = name,
|
||||
Website = website,
|
||||
Scopes = scopes.ToList(),
|
||||
@@ -72,7 +65,7 @@ namespace PrivaPub.Api.Mastodon.Controllers
|
||||
RedirectUri = string.Join("\n", redirects),
|
||||
ClientId = descriptor.ClientId,
|
||||
ClientSecret = descriptor.ClientSecret,
|
||||
VapidKey = (await _vapid.Key(token)).ForApi//Web Push's server key, as Mastodon still gives it here
|
||||
VapidKey = (await vapid.Key(token)).ForApi//Web Push's server key, as Mastodon still gives it here
|
||||
});
|
||||
}
|
||||
|
||||
@@ -80,18 +73,18 @@ namespace PrivaPub.Api.Mastodon.Controllers
|
||||
public async Task<IActionResult> Verify(CancellationToken token)
|
||||
{
|
||||
var clientId = User.GetPresenters().FirstOrDefault() ?? User.GetClaim(Claims.ClientId);
|
||||
var application = clientId == default ? default : await _applications.FindByClientIdAsync(clientId, token);
|
||||
var application = clientId == default ? default : await applications.FindByClientIdAsync(clientId, token);
|
||||
if (application == default)
|
||||
return Error(StatusCodes.Status401Unauthorized, "The access token is invalid");
|
||||
var properties = await _applications.GetPropertiesAsync(application, token);
|
||||
var properties = await applications.GetPropertiesAsync(application, token);
|
||||
return Json(new
|
||||
{
|
||||
id = await _applications.GetIdAsync(application, token),
|
||||
name = await _applications.GetDisplayNameAsync(application, token),
|
||||
id = await applications.GetIdAsync(application, token),
|
||||
name = await applications.GetDisplayNameAsync(application, token),
|
||||
website = properties.TryGetValue("website", out var website) ? website.GetString() : default,
|
||||
scopes = User.GetScopes().ToList(),
|
||||
redirect_uris = (await _applications.GetRedirectUrisAsync(application, token)).ToList(),
|
||||
vapid_key = (await _vapid.Key(token)).ForApi
|
||||
redirect_uris = (await applications.GetRedirectUrisAsync(application, token)).ToList(),
|
||||
vapid_key = (await vapid.Key(token)).ForApi
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user