Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-21 12:05:42 +01:00
Code Issues Projects Releases Wiki Activity

[AC-1201] refactor: move all SCIM related files into the AdminConsole scope (#2841)

Browse Source 
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
This commit is contained in:
Vincent Salucci 2023-04-18 18:31:00 -05:00 committed by GitHub
parent 4f2fb2ccf5
commit 9a1a369472
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/CODEOWNERS vendored
View File

@ -10,3 +10,9 @@ src/Identity @bitwarden/team-auth-dev
**/SecretsManager @bitwarden/team-secrets-manager-dev
**/Tools @bitwarden/team-tools-dev
**/Vault @bitwarden/team-vault-dev
# Admin-Console Team
bitwarden_license/src/Scim @bitwarden/team-admin-console-dev
bitwarden_license/src/test/Scim.IntegrationTest @bitwarden/team-admin-console-dev
bitwarden_license/src/test/Scim.ScimTest @bitwarden/team-admin-console-dev
**/AdminConsole @bitwarden/team-admin-console-dev

6
bitwarden_license/src/Scim/Context/IScimContext.cs
View File

@ -1,6 +1,6 @@
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.OrganizationConnectionConfigs;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
using Bit.Core.Entities;
using Bit.Core.Repositories;
using Bit.Core.Settings;

5
bitwarden_license/src/Scim/Context/ScimContext.cs
View File

@ -1,6 +1,7 @@
using Bit.Core.Entities;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.OrganizationConnectionConfigs;
using Bit.Core.Repositories;
using Bit.Core.Settings;

5
bitwarden_license/src/Scim/Groups/PostGroupCommand.cs
View File

@ -1,4 +1,5 @@
using Bit.Core.Entities;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
using Bit.Core.OrganizationFeatures.Groups.Interfaces;
@ -48,7 +49,7 @@ public class PostGroupCommand : IPostGroupCommand
private async Task UpdateGroupMembersAsync(Group group, ScimGroupRequestModel model)
{
if (_scimContext.RequestScimProvider != Core.Enums.ScimProviderType.Okta)
if (_scimContext.RequestScimProvider != ScimProviderType.Okta)
{
return;
}

5
bitwarden_license/src/Scim/Groups/PutGroupCommand.cs
View File

@ -1,4 +1,5 @@
using Bit.Core.Entities;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
using Bit.Core.OrganizationFeatures.Groups.Interfaces;
@ -42,7 +43,7 @@ public class PutGroupCommand : IPutGroupCommand
private async Task UpdateGroupMembersAsync(Group group, ScimGroupRequestModel model)
{
if (_scimContext.RequestScimProvider != Core.Enums.ScimProviderType.Okta)
if (_scimContext.RequestScimProvider != ScimProviderType.Okta)
{
return;
}

3
bitwarden_license/src/Scim/Users/PostUserCommand.cs
View File

@ -1,4 +1,5 @@
using Bit.Core.Enums;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
using Bit.Core.Models.Data;
using Bit.Core.Models.Data.Organizations.OrganizationUsers;

5
bitwarden_license/test/Scim.Test/Groups/PostGroupCommandTests.cs
View File

@ -1,4 +1,5 @@
using Bit.Core.Entities;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
using Bit.Core.OrganizationFeatures.Groups.Interfaces;
@ -74,7 +75,7 @@ public class PostGroupCommandTests
sutProvider.GetDependency<IScimContext>()
.RequestScimProvider
.Returns(Core.Enums.ScimProviderType.Okta);
.Returns(ScimProviderType.Okta);
var group = await sutProvider.Sut.PostGroupAsync(organization, scimGroupRequestModel);

5
bitwarden_license/test/Scim.Test/Groups/PutGroupCommandTests.cs
View File

@ -1,4 +1,5 @@
using Bit.Core.Entities;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
using Bit.Core.OrganizationFeatures.Groups.Interfaces;
@ -64,7 +65,7 @@ public class PutGroupCommandTests
sutProvider.GetDependency<IScimContext>()
.RequestScimProvider
.Returns(Core.Enums.ScimProviderType.Okta);
.Returns(ScimProviderType.Okta);
var inputModel = new ScimGroupRequestModel
{

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

@ -1,5 +1,6 @@
using Bit.Api.Models.Request.Organizations;
using Bit.Api.Models.Response.Organizations;
using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
using Bit.Core.Context;
using Bit.Core.Entities;
using Bit.Core.Enums;

2
src/Core/Enums/ScimProviderType.cs → src/Core/AdminConsole/Enums/ScimProviderType.cs
View File

@ -1,4 +1,4 @@
namespace Bit.Core.Enums;
namespace Bit.Core.AdminConsole.Enums;
public enum ScimProviderType : byte
{

5
src/Core/Models/OrganizationConnectionConfigs/ScimConfig.cs → src/Core/AdminConsole/Models/OrganizationConnectionConfigs/ScimConfig.cs
View File

@ -1,7 +1,8 @@
using System.Text.Json.Serialization;
using Bit.Core.Enums;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.Models.OrganizationConnectionConfigs;
namespace Bit.Core.Models.OrganizationConnectionConfigs;
namespace Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
public class ScimConfig : IConnectionConfig
{

4
src/Core/Models/Data/Organizations/SelfHostedOrganizationDetails.cs
View File

@ -1,8 +1,8 @@
using Bit.Core.Auth.Entities;
using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
using Bit.Core.Auth.Entities;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.Business;
using Bit.Core.Models.OrganizationConnectionConfigs;
namespace Bit.Core.Models.Data.Organizations;

2
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -1,5 +1,6 @@
using System.Security.Claims;
using System.Text.Json;
using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
using Bit.Core.Auth.Enums;
using Bit.Core.Auth.Models.Business;
using Bit.Core.Auth.Repositories;
@ -11,7 +12,6 @@ using Bit.Core.Exceptions;
using Bit.Core.Models.Business;
using Bit.Core.Models.Data;
using Bit.Core.Models.Data.Organizations.Policies;
using Bit.Core.Models.OrganizationConnectionConfigs;
using Bit.Core.Repositories;
using Bit.Core.Settings;
using Bit.Core.Tools.Enums;

1
test/Api.Test/Controllers/OrganizationConnectionsControllerTests.cs
View File

@ -2,6 +2,7 @@
using Bit.Api.Controllers;
using Bit.Api.Models.Request.Organizations;
using Bit.Api.Models.Response.Organizations;
using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
using Bit.Core.Context;
using Bit.Core.Entities;
using Bit.Core.Enums;

4
test/Core.Test/Entities/OrganizationConnectionTests.cs
View File

@ -1,6 +1,6 @@
using Bit.Core.Entities;
using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.OrganizationConnectionConfigs;
using Bit.Test.Common.AutoFixture.Attributes;
using Xunit;

4
test/Core.Test/Models/Data/SelfHostedOrganizationDetailsTests.cs
View File

@ -1,10 +1,10 @@
using Bit.Core.Auth.Entities;
using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
using Bit.Core.Auth.Entities;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.Business;
using Bit.Core.Models.Data.Organizations;
using Bit.Core.Models.OrganizationConnectionConfigs;
using Bit.Core.Test.AutoFixture;
using Bit.Test.Common.AutoFixture.Attributes;
using Xunit;

2
test/Core.Test/Models/OrganizationConnectionConfigs/ScimConfigTests.cs
View File

@ -1,4 +1,4 @@
using Bit.Core.Models.OrganizationConnectionConfigs;
using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
using Xunit;
namespace Bit.Core.Test.Models.OrganizationConnectionConfigs;