mirror of
https://github.com/bitwarden/server.git
synced 2025-04-24 22:32: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>
104 lines
3.1 KiB
C#
104 lines
3.1 KiB
C#
using System.ComponentModel.DataAnnotations;
|
|
using Bit.Api.AdminConsole.Models.Request.Organizations;
|
|
using Bit.Core.Enums;
|
|
using Xunit;
|
|
|
|
namespace Bit.Api.Test.AdminConsole.Models.Request.Organizations;
|
|
|
|
public class OrganizationIntegrationRequestModelTests
|
|
{
|
|
[Fact]
|
|
public void Validate_CloudBillingSync_ReturnsNotYetSupportedError()
|
|
{
|
|
var model = new OrganizationIntegrationRequestModel
|
|
{
|
|
Type = IntegrationType.CloudBillingSync,
|
|
Configuration = null
|
|
};
|
|
|
|
var results = model.Validate(new ValidationContext(model)).ToList();
|
|
|
|
Assert.Single(results);
|
|
Assert.Contains(nameof(model.Type), results[0].MemberNames);
|
|
Assert.Contains("not yet supported", results[0].ErrorMessage);
|
|
}
|
|
|
|
[Fact]
|
|
public void Validate_Scim_ReturnsNotYetSupportedError()
|
|
{
|
|
var model = new OrganizationIntegrationRequestModel
|
|
{
|
|
Type = IntegrationType.Scim,
|
|
Configuration = null
|
|
};
|
|
|
|
var results = model.Validate(new ValidationContext(model)).ToList();
|
|
|
|
Assert.Single(results);
|
|
Assert.Contains(nameof(model.Type), results[0].MemberNames);
|
|
Assert.Contains("not yet supported", results[0].ErrorMessage);
|
|
}
|
|
|
|
[Fact]
|
|
public void Validate_Slack_ReturnsCannotBeCreatedDirectlyError()
|
|
{
|
|
var model = new OrganizationIntegrationRequestModel
|
|
{
|
|
Type = IntegrationType.Slack,
|
|
Configuration = null
|
|
};
|
|
|
|
var results = model.Validate(new ValidationContext(model)).ToList();
|
|
|
|
Assert.Single(results);
|
|
Assert.Contains(nameof(model.Type), results[0].MemberNames);
|
|
Assert.Contains("cannot be created directly", results[0].ErrorMessage);
|
|
}
|
|
|
|
[Fact]
|
|
public void Validate_Webhook_WithNullConfiguration_ReturnsNoErrors()
|
|
{
|
|
var model = new OrganizationIntegrationRequestModel
|
|
{
|
|
Type = IntegrationType.Webhook,
|
|
Configuration = null
|
|
};
|
|
|
|
var results = model.Validate(new ValidationContext(model)).ToList();
|
|
|
|
Assert.Empty(results);
|
|
}
|
|
|
|
[Fact]
|
|
public void Validate_Webhook_WithConfiguration_ReturnsConfigurationError()
|
|
{
|
|
var model = new OrganizationIntegrationRequestModel
|
|
{
|
|
Type = IntegrationType.Webhook,
|
|
Configuration = "something"
|
|
};
|
|
|
|
var results = model.Validate(new ValidationContext(model)).ToList();
|
|
|
|
Assert.Single(results);
|
|
Assert.Contains(nameof(model.Configuration), results[0].MemberNames);
|
|
Assert.Contains("must not include configuration", results[0].ErrorMessage);
|
|
}
|
|
|
|
[Fact]
|
|
public void Validate_UnknownIntegrationType_ReturnsUnrecognizedError()
|
|
{
|
|
var model = new OrganizationIntegrationRequestModel
|
|
{
|
|
Type = (IntegrationType)999,
|
|
Configuration = null
|
|
};
|
|
|
|
var results = model.Validate(new ValidationContext(model)).ToList();
|
|
|
|
Assert.Single(results);
|
|
Assert.Contains(nameof(model.Type), results[0].MemberNames);
|
|
Assert.Contains("not recognized", results[0].ErrorMessage);
|
|
}
|
|
}
|