Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-29 13:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Fix swagger errors (#2277)

Browse Source
This commit is contained in:
Oscar Hinton 2022-09-15 17:14:35 +02:00 committed by GitHub
parent 287dc2e06b
commit 3a8f344202
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controllers/OrganizationsController.cs
View File

@ -537,7 +537,7 @@ public class OrganizationsController : Controller
} }
[HttpGet("{id}/api-key-information/{type?}")] [HttpGet("{id}/api-key-information/{type?}")]
public async Task<ListResponseModel<OrganizationApiKeyInformation>> ApiKeyInformation(Guid id, OrganizationApiKeyType? type) public async Task<ListResponseModel<OrganizationApiKeyInformation>> ApiKeyInformation(Guid id, [FromRoute] OrganizationApiKeyType? type)
{ {
if (!await HasApiKeyAccessAsync(id, type)) if (!await HasApiKeyAccessAsync(id, type))
{ {

1
src/Api/Controllers/TwoFactorController.cs
View File

@ -229,6 +229,7 @@ public class TwoFactorController : Controller
} }
[HttpPost("get-webauthn-challenge")] [HttpPost("get-webauthn-challenge")]
[ApiExplorerSettings(IgnoreApi = true)] // Disable Swagger due to CredentialCreateOptions not converting properly
public async Task<CredentialCreateOptions> GetWebAuthnChallenge([FromBody] SecretVerificationRequestModel model) public async Task<CredentialCreateOptions> GetWebAuthnChallenge([FromBody] SecretVerificationRequestModel model)
{ {
var user = await CheckAsync(model, true); var user = await CheckAsync(model, true);

4
src/Api/Utilities/ServiceCollectionExtensions.cs
View File

@ -28,7 +28,7 @@ public static class ServiceCollectionExtensions
}); });
config.SwaggerDoc("internal", new OpenApiInfo { Title = "Bitwarden Internal API", Version = "latest" }); config.SwaggerDoc("internal", new OpenApiInfo { Title = "Bitwarden Internal API", Version = "latest" });
config.AddSecurityDefinition("OAuth2 Client Credentials", new OpenApiSecurityScheme config.AddSecurityDefinition("oauth2-client-credentials", new OpenApiSecurityScheme
{ {
Type = SecuritySchemeType.OAuth2, Type = SecuritySchemeType.OAuth2,
Flows = new OpenApiOAuthFlows Flows = new OpenApiOAuthFlows
@ -52,7 +52,7 @@ public static class ServiceCollectionExtensions
Reference = new OpenApiReference Reference = new OpenApiReference
{ {
Type = ReferenceType.SecurityScheme, Type = ReferenceType.SecurityScheme,
Id = "OAuth2 Client Credentials" Id = "oauth2-client-credentials"
}, },
}, },
new[] { "api.organization" } new[] { "api.organization" }