From 27e668d5f7c30a3940e8a63329a6ad1cbc2d237e Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 11 Sep 2024 23:19:13 -0400 Subject: [PATCH] Move API specific `IAuthorityInvoker`s out of Core namespace --- .../{Core => }/IGraphQLAuthorityInvoker{TAuthority}.cs | 3 ++- .../Authority/{Core => }/IRestAuthorityInvoker{TAuthority}.cs | 4 +++- src/Tgstation.Server.Host/Controllers/ApiRootController.cs | 1 - src/Tgstation.Server.Host/Controllers/UserController.cs | 1 - src/Tgstation.Server.Host/GraphQL/Mutation.cs | 3 +-- src/Tgstation.Server.Host/GraphQL/Types/User.cs | 1 - src/Tgstation.Server.Host/GraphQL/Types/UserName.cs | 1 - src/Tgstation.Server.Host/GraphQL/Types/Users.cs | 1 - 8 files changed, 6 insertions(+), 9 deletions(-) rename src/Tgstation.Server.Host/Authority/{Core => }/IGraphQLAuthorityInvoker{TAuthority}.cs (97%) rename src/Tgstation.Server.Host/Authority/{Core => }/IRestAuthorityInvoker{TAuthority}.cs (97%) diff --git a/src/Tgstation.Server.Host/Authority/Core/IGraphQLAuthorityInvoker{TAuthority}.cs b/src/Tgstation.Server.Host/Authority/IGraphQLAuthorityInvoker{TAuthority}.cs similarity index 97% rename from src/Tgstation.Server.Host/Authority/Core/IGraphQLAuthorityInvoker{TAuthority}.cs rename to src/Tgstation.Server.Host/Authority/IGraphQLAuthorityInvoker{TAuthority}.cs index 24102d8a01..eb179caf9b 100644 --- a/src/Tgstation.Server.Host/Authority/Core/IGraphQLAuthorityInvoker{TAuthority}.cs +++ b/src/Tgstation.Server.Host/Authority/IGraphQLAuthorityInvoker{TAuthority}.cs @@ -1,9 +1,10 @@ using System; using System.Threading.Tasks; +using Tgstation.Server.Host.Authority.Core; using Tgstation.Server.Host.Models; -namespace Tgstation.Server.Host.Authority.Core +namespace Tgstation.Server.Host.Authority { /// /// Invokes s from GraphQL endpoints. diff --git a/src/Tgstation.Server.Host/Authority/Core/IRestAuthorityInvoker{TAuthority}.cs b/src/Tgstation.Server.Host/Authority/IRestAuthorityInvoker{TAuthority}.cs similarity index 97% rename from src/Tgstation.Server.Host/Authority/Core/IRestAuthorityInvoker{TAuthority}.cs rename to src/Tgstation.Server.Host/Authority/IRestAuthorityInvoker{TAuthority}.cs index 564de05c2a..2cb05a2b9a 100644 --- a/src/Tgstation.Server.Host/Authority/Core/IRestAuthorityInvoker{TAuthority}.cs +++ b/src/Tgstation.Server.Host/Authority/IRestAuthorityInvoker{TAuthority}.cs @@ -2,10 +2,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; + +using Tgstation.Server.Host.Authority.Core; using Tgstation.Server.Host.Controllers; using Tgstation.Server.Host.Models; -namespace Tgstation.Server.Host.Authority.Core +namespace Tgstation.Server.Host.Authority { /// /// Invokes methods and generates responses. diff --git a/src/Tgstation.Server.Host/Controllers/ApiRootController.cs b/src/Tgstation.Server.Host/Controllers/ApiRootController.cs index 2ac52cf28c..893357064b 100644 --- a/src/Tgstation.Server.Host/Controllers/ApiRootController.cs +++ b/src/Tgstation.Server.Host/Controllers/ApiRootController.cs @@ -15,7 +15,6 @@ using Octokit; using Tgstation.Server.Api; using Tgstation.Server.Api.Models.Response; using Tgstation.Server.Host.Authority; -using Tgstation.Server.Host.Authority.Core; using Tgstation.Server.Host.Components.Interop; using Tgstation.Server.Host.Configuration; using Tgstation.Server.Host.Core; diff --git a/src/Tgstation.Server.Host/Controllers/UserController.cs b/src/Tgstation.Server.Host/Controllers/UserController.cs index 0965ad26b5..2bb16eeffd 100644 --- a/src/Tgstation.Server.Host/Controllers/UserController.cs +++ b/src/Tgstation.Server.Host/Controllers/UserController.cs @@ -15,7 +15,6 @@ using Tgstation.Server.Api.Models.Request; using Tgstation.Server.Api.Models.Response; using Tgstation.Server.Api.Rights; using Tgstation.Server.Host.Authority; -using Tgstation.Server.Host.Authority.Core; using Tgstation.Server.Host.Configuration; using Tgstation.Server.Host.Controllers.Results; using Tgstation.Server.Host.Database; diff --git a/src/Tgstation.Server.Host/GraphQL/Mutation.cs b/src/Tgstation.Server.Host/GraphQL/Mutation.cs index 972612f885..eabb2f2ed6 100644 --- a/src/Tgstation.Server.Host/GraphQL/Mutation.cs +++ b/src/Tgstation.Server.Host/GraphQL/Mutation.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading; using System.Threading.Tasks; @@ -7,7 +7,6 @@ using HotChocolate.Types; using Tgstation.Server.Api.Models.Response; using Tgstation.Server.Host.Authority; -using Tgstation.Server.Host.Authority.Core; namespace Tgstation.Server.Host.GraphQL { diff --git a/src/Tgstation.Server.Host/GraphQL/Types/User.cs b/src/Tgstation.Server.Host/GraphQL/Types/User.cs index 794f68c60a..ab5df09a79 100644 --- a/src/Tgstation.Server.Host/GraphQL/Types/User.cs +++ b/src/Tgstation.Server.Host/GraphQL/Types/User.cs @@ -7,7 +7,6 @@ using HotChocolate; using HotChocolate.Types.Relay; using Tgstation.Server.Host.Authority; -using Tgstation.Server.Host.Authority.Core; using Tgstation.Server.Host.GraphQL.Interfaces; using Tgstation.Server.Host.Models.Transformers; diff --git a/src/Tgstation.Server.Host/GraphQL/Types/UserName.cs b/src/Tgstation.Server.Host/GraphQL/Types/UserName.cs index 555fbc4ad8..3d02b0f42f 100644 --- a/src/Tgstation.Server.Host/GraphQL/Types/UserName.cs +++ b/src/Tgstation.Server.Host/GraphQL/Types/UserName.cs @@ -7,7 +7,6 @@ using HotChocolate; using HotChocolate.Types.Relay; using Tgstation.Server.Host.Authority; -using Tgstation.Server.Host.Authority.Core; using Tgstation.Server.Host.GraphQL.Interfaces; using Tgstation.Server.Host.Models.Transformers; diff --git a/src/Tgstation.Server.Host/GraphQL/Types/Users.cs b/src/Tgstation.Server.Host/GraphQL/Types/Users.cs index f4d718e43f..db0a333f53 100644 --- a/src/Tgstation.Server.Host/GraphQL/Types/Users.cs +++ b/src/Tgstation.Server.Host/GraphQL/Types/Users.cs @@ -9,7 +9,6 @@ using HotChocolate.Types; using HotChocolate.Types.Relay; using Tgstation.Server.Host.Authority; -using Tgstation.Server.Host.Authority.Core; using Tgstation.Server.Host.Models.Transformers; using Tgstation.Server.Host.Security;