mirror of
https://github.com/bitwarden/server.git
synced 2025-04-25 06:42:22 -05:00

* [PM-17562] Slack Event Investigation * Refactored Slack and Webhook integrations to pull configurations dynamically from a new Repository * Added new TemplateProcessor and added/updated unit tests * SlackService improvements, testing, integration configurations * Refactor SlackService to use a dedicated model to parse responses * Refactored SlackOAuthController to use SlackService as an injected dependency; added tests for SlackService * Remove unnecessary methods from the IOrganizationIntegrationConfigurationRepository * Moved Slack OAuth to take into account the Organization it's being stored for. Added methods to store the top level integration for Slack * Organization integrations and configuration database schemas * Format EF files * Initial buildout of basic repositories * [PM-17562] Add Dapper Repositories For Organization Integrations and Configurations * Update Slack and Webhook handlers to use new Repositories * Update SlackOAuth tests to new signatures * Added EF Repositories * Update handlers to use latest repositories * [PM-17562] Add Dapper and EF Repositories For Ogranization Integrations and Configurations * Updated with changes from PR comments * Adjusted Handlers to new repository method names; updated tests to naming convention * Adjust URL structure; add delete for Slack, add tests * Added Webhook Integration Controller * Add tests for WebhookIntegrationController * Added Create/Delete for OrganizationIntegrationConfigurations * Prepend ConnectionTypes into IntegrationType so we don't run into issues later * Added Update to OrganizationIntegrationConfigurtionController * Moved Webhook-specific integration code to being a generic controller for everything but Slack * Removed delete from SlackController - Deletes should happen through the normal Integration controller * Fixed SlackController, reworked OIC Controller to use ids from URL and update the returned object * Added parse/type checking for integration and integration configuration JSONs, Cleaned up GlobalSettings to remove old values * Cleanup and fixes for Azure Service Bus support * Clean up naming on TemplateProcessorTests * Address SonarQube warnings/suggestions * Expanded test coverage; Cleaned up tests * Respond to PR Feedback * Rename TemplateProcessor to IntegrationTemplateProcessor --------- Co-authored-by: Matt Bishop <mbishop@bitwarden.com>
72 lines
2.5 KiB
C#
72 lines
2.5 KiB
C#
using Bit.Api.AdminConsole.Models.Request.Organizations;
|
|
using Bit.Api.AdminConsole.Models.Response.Organizations;
|
|
using Bit.Core.Context;
|
|
using Bit.Core.Exceptions;
|
|
using Bit.Core.Repositories;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
|
#nullable enable
|
|
|
|
namespace Bit.Api.AdminConsole.Controllers;
|
|
|
|
[Route("organizations/{organizationId:guid}/integrations")]
|
|
[Authorize("Application")]
|
|
public class OrganizationIntegrationController(
|
|
ICurrentContext currentContext,
|
|
IOrganizationIntegrationRepository integrationRepository) : Controller
|
|
{
|
|
[HttpPost("")]
|
|
public async Task<OrganizationIntegrationResponseModel> CreateAsync(Guid organizationId, [FromBody] OrganizationIntegrationRequestModel model)
|
|
{
|
|
if (!await HasPermission(organizationId))
|
|
{
|
|
throw new NotFoundException();
|
|
}
|
|
|
|
var integration = await integrationRepository.CreateAsync(model.ToOrganizationIntegration(organizationId));
|
|
return new OrganizationIntegrationResponseModel(integration);
|
|
}
|
|
|
|
[HttpPut("{integrationId:guid}")]
|
|
public async Task<OrganizationIntegrationResponseModel> UpdateAsync(Guid organizationId, Guid integrationId, [FromBody] OrganizationIntegrationRequestModel model)
|
|
{
|
|
if (!await HasPermission(organizationId))
|
|
{
|
|
throw new NotFoundException();
|
|
}
|
|
|
|
var integration = await integrationRepository.GetByIdAsync(integrationId);
|
|
if (integration is null || integration.OrganizationId != organizationId)
|
|
{
|
|
throw new NotFoundException();
|
|
}
|
|
|
|
await integrationRepository.ReplaceAsync(model.ToOrganizationIntegration(integration));
|
|
return new OrganizationIntegrationResponseModel(integration);
|
|
}
|
|
|
|
[HttpDelete("{integrationId:guid}")]
|
|
[HttpPost("{integrationId:guid}/delete")]
|
|
public async Task DeleteAsync(Guid organizationId, Guid integrationId)
|
|
{
|
|
if (!await HasPermission(organizationId))
|
|
{
|
|
throw new NotFoundException();
|
|
}
|
|
|
|
var integration = await integrationRepository.GetByIdAsync(integrationId);
|
|
if (integration is null || integration.OrganizationId != organizationId)
|
|
{
|
|
throw new NotFoundException();
|
|
}
|
|
|
|
await integrationRepository.DeleteAsync(integration);
|
|
}
|
|
|
|
private async Task<bool> HasPermission(Guid organizationId)
|
|
{
|
|
return await currentContext.OrganizationOwner(organizationId);
|
|
}
|
|
}
|