liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: remove asp.net versioning

Browse Source
This commit is contained in:
spiral 2022-01-19 19:25:04 -05:00
parent 1626e0f548
commit eb4f53c69e
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
14 changed files with 119 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PluralKit.API/Controllers/v1/AccountController.cs
View File

@ -7,8 +7,7 @@ using PluralKit.Core;
namespace PluralKit.API;
[ApiController]
[ApiVersion("1.0")]
[Route("v{version:apiVersion}/a")]
[Route("v1/a")]
public class AccountController: ControllerBase
{
private readonly IDatabase _db;

3
PluralKit.API/Controllers/v1/MemberController.cs
View File

@ -10,8 +10,7 @@ using PluralKit.Core;
namespace PluralKit.API;
[ApiController]
[ApiVersion("1.0")]
[Route("v{version:apiVersion}/m")]
[Route("v1/m")]
public class MemberController: ControllerBase
{
private readonly IDatabase _db;

5
PluralKit.API/Controllers/v1/MessageController.cs
View File

@ -7,8 +7,7 @@ using PluralKit.Core;
namespace PluralKit.API;
[ApiController]
[ApiVersion("1.0")]
[Route("v{version:apiVersion}/msg")]
[Route("v1")]
public class MessageController: ControllerBase
{
private readonly IDatabase _db;
@ -20,7 +19,7 @@ public class MessageController: ControllerBase
_db = db;
}
[HttpGet("{mid}")]
[HttpGet("msg/{mid}")]
public async Task<ActionResult<JObject>> GetMessage(ulong mid)
{
var msg = await _db.Execute(c => _repo.GetMessage(c, mid));

3
PluralKit.API/Controllers/v1/MetaController.cs
View File

@ -7,8 +7,7 @@ using PluralKit.Core;
namespace PluralKit.API;
[ApiController]
[ApiVersion("1.0")]
[Route("v{version:apiVersion}")]
[Route("v1")]
public class MetaController: ControllerBase
{
private readonly IDatabase _db;

3
PluralKit.API/Controllers/v1/SystemController.cs
View File

@ -31,8 +31,7 @@ public struct PostSwitchParams
}
[ApiController]
[ApiVersion("1.0")]
[Route("v{version:apiVersion}/s")]
[Route("v1/s")]
public class SystemController: ControllerBase
{
private readonly IDatabase _db;

3
PluralKit.API/Controllers/v2/DiscordControllerV2.cs
View File

@ -7,8 +7,7 @@ using PluralKit.Core;
namespace PluralKit.API;
[ApiController]
[ApiVersion("2.0")]
[Route("v{version:apiVersion}")]
[Route("v2")]
public class DiscordControllerV2: PKControllerBase
{
public DiscordControllerV2(IServiceProvider svc) : base(svc) { }

3
PluralKit.API/Controllers/v2/GroupControllerV2.cs
View File

@ -7,8 +7,7 @@ using PluralKit.Core;
namespace PluralKit.API;
[ApiController]
[ApiVersion("2.0")]
[Route("v{version:apiVersion}")]
[Route("v2")]
public class GroupControllerV2: PKControllerBase
{
public GroupControllerV2(IServiceProvider svc) : base(svc) { }

3
PluralKit.API/Controllers/v2/GroupMemberControllerV2.cs
View File

@ -7,8 +7,7 @@ using PluralKit.Core;
namespace PluralKit.API;
[ApiController]
[ApiVersion("2.0")]
[Route("v{version:apiVersion}")]
[Route("v2")]
public class GroupMemberControllerV2: PKControllerBase
{
public GroupMemberControllerV2(IServiceProvider svc) : base(svc) { }

3
PluralKit.API/Controllers/v2/MemberControllerV2.cs
View File

@ -7,8 +7,7 @@ using PluralKit.Core;
namespace PluralKit.API;
[ApiController]
[ApiVersion("2.0")]
[Route("v{version:apiVersion}")]
[Route("v2")]
public class MemberControllerV2: PKControllerBase
{
public MemberControllerV2(IServiceProvider svc) : base(svc) { }

3
PluralKit.API/Controllers/v2/PrivateControllerV2.cs
View File

@ -5,8 +5,7 @@ using Newtonsoft.Json.Linq;
namespace PluralKit.API;
[ApiController]
[ApiVersion("2.0")]
[Route("v{version:apiVersion}")]
[Route("v2")]
public class PrivateControllerV2: PKControllerBase
{
public PrivateControllerV2(IServiceProvider svc) : base(svc) { }

3
PluralKit.API/Controllers/v2/SwitchControllerV2.cs
View File

@ -11,8 +11,7 @@ using PluralKit.Core;
namespace PluralKit.API;
[ApiController]
[ApiVersion("2.0")]
[Route("v{version:apiVersion}")]
[Route("v2")]
public class SwitchControllerV2: PKControllerBase
{
public SwitchControllerV2(IServiceProvider svc) : base(svc) { }

3
PluralKit.API/Controllers/v2/SystemControllerV2.cs
View File

@ -7,8 +7,7 @@ using PluralKit.Core;
namespace PluralKit.API;
[ApiController]
[ApiVersion("2.0")]
[Route("v{version:apiVersion}/systems")]
[Route("v2/systems")]
public class SystemControllerV2: PKControllerBase
{
public SystemControllerV2(IServiceProvider svc) : base(svc) { }

9
PluralKit.API/Startup.cs
View File

@ -64,15 +64,6 @@ public class Startup
throw Errors.GenericBadRequest
);
services.AddApiVersioning();
services.AddVersionedApiExplorer(c =>
{
c.GroupNameFormat = "'v'VV";
c.ApiVersionParameterSource = new UrlSegmentApiVersionReader();
c.SubstituteApiVersionInUrl = true;
});
services.AddSwaggerGen(c =>
{
c.SwaggerDoc("v1.0", new OpenApiInfo { Title = "PluralKit", Version = "1.0" });

108
PluralKit.API/packages.lock.json
View File

@ -444,8 +444,8 @@
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "1.1.0",
"contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
"resolved": "5.0.0",
"contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ=="
},
"Microsoft.NETCore.Targets": {
"type": "Transitive",
@ -467,6 +467,23 @@
"System.Runtime": "4.3.0"
}
},
"Microsoft.Win32.Registry": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==",
"dependencies": {
"System.Security.AccessControl": "5.0.0",
"System.Security.Principal.Windows": "5.0.0"
}
},
"Microsoft.Win32.SystemEvents": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "Bh6blKG8VAKvXiLe2L+sEsn62nc1Ij34MrNxepD2OCrS5cpCwQa9MeLyhVQPQ/R4Wlzwuy6wMK8hLb11QPDRsQ==",
"dependencies": {
"Microsoft.NETCore.Platforms": "5.0.0"
}
},
"NETStandard.Library": {
"type": "Transitive",
"resolved": "1.6.1",
@ -565,6 +582,14 @@
"Npgsql": "4.1.5"
}
},
"Pipelines.Sockets.Unofficial": {
"type": "Transitive",
"resolved": "2.2.0",
"contentHash": "7hzHplEIVOGBl5zOQZGX/DiJDHjq+RVRVrYgDiqXb6RriqWAdacXxp+XO9WSrATCEXyNOUOQg9aqQArsjase/A==",
"dependencies": {
"System.IO.Pipelines": "5.0.0"
}
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
"type": "Transitive",
"resolved": "4.3.0",
@ -824,6 +849,15 @@
"dapper": "1.50.5"
}
},
"StackExchange.Redis": {
"type": "Transitive",
"resolved": "2.2.88",
"contentHash": "JJi1jcO3/ZiamBhlsC/TR8aZmYf+nqpGzMi0HRRCy5wJkUPmMnRp0kBA6V84uhU8b531FHSdTDaFCAyCUJomjA==",
"dependencies": {
"Pipelines.Sockets.Unofficial": "2.2.0",
"System.Diagnostics.PerformanceCounter": "5.0.0"
}
},
"Swashbuckle.AspNetCore": {
"type": "Transitive",
"resolved": "5.0.0",
@ -875,6 +909,15 @@
"System.Threading.Tasks": "4.3.0"
}
},
"System.Configuration.ConfigurationManager": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "aM7cbfEfVNlEEOj3DsZP+2g9NRwbkyiAv2isQEzw7pnkDg9ekCU2m1cdJLM02Uq691OaCS91tooaxcEn8d0q5w==",
"dependencies": {
"System.Security.Cryptography.ProtectedData": "5.0.0",
"System.Security.Permissions": "5.0.0"
}
},
"System.Console": {
"type": "Transitive",
"resolved": "4.3.0",
@ -902,6 +945,17 @@
"resolved": "4.7.1",
"contentHash": "j81Lovt90PDAq8kLpaJfJKV/rWdWuEk6jfV+MBkee33vzYLEUsy4gXK8laa9V2nZlLM9VM9yA/OOQxxPEJKAMw=="
},
"System.Diagnostics.PerformanceCounter": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "kcQWWtGVC3MWMNXdMDWfrmIlFZZ2OdoeT6pSNVRtk9+Sa7jwdPiMlNwb0ZQcS7NRlT92pCfmjRtkSWUW3RAKwg==",
"dependencies": {
"Microsoft.NETCore.Platforms": "5.0.0",
"Microsoft.Win32.Registry": "5.0.0",
"System.Configuration.ConfigurationManager": "5.0.0",
"System.Security.Principal.Windows": "5.0.0"
}
},
"System.Diagnostics.Tools": {
"type": "Transitive",
"resolved": "4.3.0",
@ -922,6 +976,14 @@
"System.Runtime": "4.3.0"
}
},
"System.Drawing.Common": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "SztFwAnpfKC8+sEKXAFxCBWhKQaEd97EiOL7oZJZP56zbqnLpmxACWA8aGseaUExciuEAUuR9dY8f7HkTRAdnw==",
"dependencies": {
"Microsoft.Win32.SystemEvents": "5.0.0"
}
},
"System.Dynamic.Runtime": {
"type": "Transitive",
"resolved": "4.0.11",
@ -1059,6 +1121,11 @@
"System.Runtime": "4.3.0"
}
},
"System.IO.Pipelines": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "irMYm3vhVgRsYvHTU5b2gsT2CwT/SMM6LZFzuJjpIvT5Z4CshxNsaoBC1X/LltwuR3Opp8d6jOS/60WwOb7Q2Q=="
},
"System.Linq": {
"type": "Transitive",
"resolved": "4.3.0",
@ -1315,6 +1382,15 @@
"System.Runtime.Extensions": "4.3.0"
}
},
"System.Security.AccessControl": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==",
"dependencies": {
"Microsoft.NETCore.Platforms": "5.0.0",
"System.Security.Principal.Windows": "5.0.0"
}
},
"System.Security.Cryptography.Algorithms": {
"type": "Transitive",
"resolved": "4.3.0",
@ -1427,6 +1503,11 @@
"System.Threading.Tasks": "4.3.0"
}
},
"System.Security.Cryptography.ProtectedData": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "HGxMSAFAPLNoxBvSfW08vHde0F9uh7BjASwu6JF9JnXuEPhCY3YUqURn0+bQV/4UWeaqymmrHWV+Aw9riQCtCA=="
},
"System.Security.Cryptography.X509Certificates": {
"type": "Transitive",
"resolved": "4.3.0",
@ -1459,6 +1540,20 @@
"runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
}
},
"System.Security.Permissions": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "uE8juAhEkp7KDBCdjDIE3H9R1HJuEHqeqX8nLX9gmYKWwsqk3T5qZlPx8qle5DPKimC/Fy3AFTdV7HamgCh9qQ==",
"dependencies": {
"System.Security.AccessControl": "5.0.0",
"System.Windows.Extensions": "5.0.0"
}
},
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
},
"System.Text.Encoding": {
"type": "Transitive",
"resolved": "4.3.0",
@ -1532,6 +1627,14 @@
"System.Runtime": "4.3.0"
}
},
"System.Windows.Extensions": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "c1ho9WU9ZxMZawML+ssPKZfdnrg/OjR3pe0m9v8230z3acqphwvPJqzAkH54xRYm5ntZHGG1EPP3sux9H3qSPg==",
"dependencies": {
"System.Drawing.Common": "5.0.0"
}
},
"System.Xml.ReaderWriter": {
"type": "Transitive",
"resolved": "4.3.0",
@ -1605,6 +1708,7 @@
"Serilog.Sinks.File": "4.1.0",
"SqlKata": "2.3.7",
"SqlKata.Execution": "2.3.7",
"StackExchange.Redis": "2.2.88",
"System.Interactive.Async": "5.0.0",
"ipnetwork2": "2.5.381"
}