Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AC Team code ownership moves - Api project #3351

Merged
merged 3 commits into from
Oct 18, 2023
Merged

AC Team code ownership moves - Api project #3351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c00009
First pass at moving Api files
eliykat Oct 18, 2023
607ae0e
Move api tests
eliykat Oct 18, 2023
13ad277
dotnet format
eliykat Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Api/Controllers/GroupsController.cs → ...inConsole/Controllers/GroupsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Bit.Api.Models.Request;
using Bit.Api.AdminConsole.Models.Request;
using Bit.Api.AdminConsole.Models.Response;
using Bit.Api.Models.Response;
using Bit.Core.Context;
using Bit.Core.Exceptions;
Expand All @@ -8,7 +9,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Controllers;
namespace Bit.Api.AdminConsole.Controllers;

[Route("organizations/{orgId}/groups")]
[Authorize("Application")]
Expand Down
7 changes: 4 additions & 3 deletions ...ontrollers/OrganizationUsersController.cs → ...ontrollers/OrganizationUsersController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Bit.Api.Models.Request.Organizations;
using Bit.Api.AdminConsole.Models.Request.Organizations;
using Bit.Api.AdminConsole.Models.Response.Organizations;
using Bit.Api.Models.Request.Organizations;
using Bit.Api.Models.Response;
using Bit.Api.Models.Response.Organizations;
using Bit.Core.Context;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
Expand All @@ -14,7 +15,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Controllers;
namespace Bit.Api.AdminConsole.Controllers;

[Route("organizations/{orgId}/users")]
[Authorize("Application")]
Expand Down
7 changes: 5 additions & 2 deletions ...pi/Controllers/OrganizationsController.cs → ...le/Controllers/OrganizationsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
using System.Text.Json;
using Bit.Api.AdminConsole.Models.Request;
using Bit.Api.AdminConsole.Models.Request.Organizations;
using Bit.Api.AdminConsole.Models.Response;
using Bit.Api.AdminConsole.Models.Response.Organizations;
using Bit.Api.Auth.Models.Request.Accounts;
using Bit.Api.Auth.Models.Request.Organizations;
using Bit.Api.Auth.Models.Response.Organizations;
using Bit.Api.Models.Request;
using Bit.Api.Models.Request.Accounts;
using Bit.Api.Models.Request.Organizations;
using Bit.Api.Models.Response;
using Bit.Api.Models.Response.Organizations;
using Bit.Core;
using Bit.Core.Auth.Enums;
using Bit.Core.Auth.Repositories;
Expand All @@ -26,7 +29,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Controllers;
namespace Bit.Api.AdminConsole.Controllers;

[Route("organizations")]
[Authorize("Application")]
Expand Down
4 changes: 2 additions & 2 deletions src/Api/Controllers/PoliciesController.cs → ...Console/Controllers/PoliciesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Bit.Api.Models.Request;
using Bit.Api.AdminConsole.Models.Request;
using Bit.Api.Models.Response;
using Bit.Core.Context;
using Bit.Core.Enums;
Expand All @@ -12,7 +12,7 @@
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Controllers;
namespace Bit.Api.AdminConsole.Controllers;

[Route("organizations/{orgId}/policies")]
[Authorize("Application")]
Expand Down
6 changes: 3 additions & 3 deletions ...ollers/ProviderOrganizationsController.cs → ...ollers/ProviderOrganizationsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bit.Api.Models.Request.Providers;
using Bit.Api.AdminConsole.Models.Request.Providers;
using Bit.Api.AdminConsole.Models.Response.Providers;
using Bit.Api.Models.Response;
using Bit.Api.Models.Response.Providers;
using Bit.Core.Context;
using Bit.Core.Exceptions;
using Bit.Core.Repositories;
Expand All @@ -9,7 +9,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Controllers;
namespace Bit.Api.AdminConsole.Controllers;

[Route("providers/{providerId:guid}/organizations")]
[Authorize("Application")]
Expand Down
6 changes: 3 additions & 3 deletions ...pi/Controllers/ProviderUsersController.cs → ...le/Controllers/ProviderUsersController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bit.Api.Models.Request.Providers;
using Bit.Api.AdminConsole.Models.Request.Providers;
using Bit.Api.AdminConsole.Models.Response.Providers;
using Bit.Api.Models.Response;
using Bit.Api.Models.Response.Providers;
using Bit.Core.Context;
using Bit.Core.Exceptions;
using Bit.Core.Models.Business.Provider;
Expand All @@ -9,7 +9,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Controllers;
namespace Bit.Api.AdminConsole.Controllers;

[Route("providers/{providerId:guid}/users")]
[Authorize("Application")]
Expand Down
6 changes: 3 additions & 3 deletions src/Api/Controllers/ProvidersController.cs → ...onsole/Controllers/ProvidersController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Bit.Api.Models.Request.Providers;
using Bit.Api.Models.Response.Providers;
using Bit.Api.AdminConsole.Models.Request.Providers;
using Bit.Api.AdminConsole.Models.Response.Providers;
using Bit.Core.Context;
using Bit.Core.Exceptions;
using Bit.Core.Repositories;
Expand All @@ -8,7 +8,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Controllers;
namespace Bit.Api.AdminConsole.Controllers;

[Route("providers")]
[Authorize("Application")]
Expand Down
3 changes: 2 additions & 1 deletion src/Api/Models/Request/GroupRequestModel.cs → ...nsole/Models/Request/GroupRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using System.ComponentModel.DataAnnotations;
using Bit.Api.Models.Request;
using Bit.Core.Entities;

namespace Bit.Api.Models.Request;
namespace Bit.Api.AdminConsole.Models.Request;

public class GroupRequestModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...ns/ImportOrganizationUsersRequestModel.cs → ...st/ImportOrganizationUsersRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Bit.Core.Models.Business;

namespace Bit.Api.Models.Request.Organizations;
namespace Bit.Api.AdminConsole.Models.Request;

public class ImportOrganizationUsersRequestModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...ccounts/OrganizationApiKeyRequestModel.cs → ...zations/OrganizationApiKeyRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Bit.Api.Auth.Models.Request.Accounts;
using Bit.Core.Enums;

namespace Bit.Api.Models.Request.Accounts;
namespace Bit.Api.AdminConsole.Models.Request.Organizations;

public class OrganizationApiKeyRequestModel : SecretVerificationRequestModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...zations/OrganizationCreateRequestModel.cs → ...zations/OrganizationCreateRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Bit.Core.Models.Business;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Request.Organizations;
namespace Bit.Api.AdminConsole.Models.Request.Organizations;

public class OrganizationCreateRequestModel : IValidatableObject
{
Expand Down
2 changes: 1 addition & 1 deletion ...nizations/OrganizationKeysRequestModel.cs → ...nizations/OrganizationKeysRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Bit.Core.Entities;
using Bit.Core.Models.Business;

namespace Bit.Api.Models.Request.Organizations;
namespace Bit.Api.AdminConsole.Models.Request.Organizations;

public class OrganizationKeysRequestModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...nizations/OrganizationSeatRequestModel.cs → ...nizations/OrganizationSeatRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace Bit.Api.Models.Request.Organizations;
namespace Bit.Api.AdminConsole.Models.Request.Organizations;

public class OrganizationSeatRequestModel : IValidatableObject
{
Expand Down
2 changes: 1 addition & 1 deletion ...zations/OrganizationUpdateRequestModel.cs → ...zations/OrganizationUpdateRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Bit.Core.Models.Data;
using Bit.Core.Settings;

namespace Bit.Api.Models.Request.Organizations;
namespace Bit.Api.AdminConsole.Models.Request.Organizations;

public class OrganizationUpdateRequestModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...ations/OrganizationUpgradeRequestModel.cs → ...ations/OrganizationUpgradeRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Bit.Core.Enums;
using Bit.Core.Models.Business;

namespace Bit.Api.Models.Request.Organizations;
namespace Bit.Api.AdminConsole.Models.Request.Organizations;

public class OrganizationUpgradeRequestModel
{
Expand Down
3 changes: 2 additions & 1 deletion ...izations/OrganizationUserRequestModels.cs → ...izations/OrganizationUserRequestModels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using System.ComponentModel.DataAnnotations;
using Bit.Api.Models.Request;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.Data;
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Request.Organizations;
namespace Bit.Api.AdminConsole.Models.Request.Organizations;

public class OrganizationUserInviteRequestModel
{
Expand Down
2 changes: 1 addition & 1 deletion src/Api/Models/Request/PolicyRequestModel.cs → ...sole/Models/Request/PolicyRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Bit.Core.Entities;
using Bit.Core.Enums;

namespace Bit.Api.Models.Request;
namespace Bit.Api.AdminConsole.Models.Request;

public class PolicyRequestModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...rs/ProviderOrganizationAddRequestModel.cs → ...rs/ProviderOrganizationAddRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace Bit.Api.Models.Request.Providers;
namespace Bit.Api.AdminConsole.Models.Request.Providers;

public class ProviderOrganizationAddRequestModel
{
Expand Down
4 changes: 2 additions & 2 deletions ...ProviderOrganizationCreateRequestModel.cs → ...ProviderOrganizationCreateRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.ComponentModel.DataAnnotations;
using Bit.Api.Models.Request.Organizations;
using Bit.Api.AdminConsole.Models.Request.Organizations;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Request.Providers;
namespace Bit.Api.AdminConsole.Models.Request.Providers;

public class ProviderOrganizationCreateRequestModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...st/Providers/ProviderSetupRequestModel.cs → ...st/Providers/ProviderSetupRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Bit.Core.Entities.Provider;

namespace Bit.Api.Models.Request.Providers;
namespace Bit.Api.AdminConsole.Models.Request.Providers;

public class ProviderSetupRequestModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...t/Providers/ProviderUpdateRequestModel.cs → ...t/Providers/ProviderUpdateRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Bit.Core.Entities.Provider;
using Bit.Core.Settings;

namespace Bit.Api.Models.Request.Providers;
namespace Bit.Api.AdminConsole.Models.Request.Providers;

public class ProviderUpdateRequestModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...st/Providers/ProviderUserRequestModels.cs → ...st/Providers/ProviderUserRequestModels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Bit.Core.Enums.Provider;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Request.Providers;
namespace Bit.Api.AdminConsole.Models.Request.Providers;

public class ProviderUserInviteRequestModel
{
Expand Down
5 changes: 3 additions & 2 deletions ...Api/Models/Response/GroupResponseModel.cs → ...ole/Models/Response/GroupResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
using Bit.Core.Entities;
using Bit.Api.Models.Response;
using Bit.Core.Entities;
using Bit.Core.Models.Api;
using Bit.Core.Models.Data;

namespace Bit.Api.Models.Response;
namespace Bit.Api.AdminConsole.Models.Response;

public class GroupResponseModel : ResponseModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...nizationApiKeyInformationResponseModel.cs → ...nizationApiKeyInformationResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Bit.Core.Enums;
using Bit.Core.Models.Api;

namespace Bit.Api.Models.Response.Organizations;
namespace Bit.Api.AdminConsole.Models.Response.Organizations;

public class OrganizationApiKeyInformation : ResponseModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...anizationAutoEnrollStatusResponseModel.cs → ...anizationAutoEnrollStatusResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bit.Core.Models.Api;

namespace Bit.Api.Models.Response.Organizations;
namespace Bit.Api.AdminConsole.Models.Response.Organizations;

public class OrganizationAutoEnrollStatusResponseModel : ResponseModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...izations/OrganizationKeysResponseModel.cs → ...izations/OrganizationKeysResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Bit.Core.Entities;
using Bit.Core.Models.Api;

namespace Bit.Api.Models.Response.Organizations;
namespace Bit.Api.AdminConsole.Models.Response.Organizations;

public class OrganizationKeysResponseModel : ResponseModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...ons/OrganizationPublicKeyResponseModel.cs → ...ons/OrganizationPublicKeyResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Bit.Core.Entities;
using Bit.Core.Models.Api;

namespace Bit.Api.Models.Response.Organizations;
namespace Bit.Api.AdminConsole.Models.Response.Organizations;

public class OrganizationPublicKeyResponseModel : ResponseModel
{
Expand Down
5 changes: 3 additions & 2 deletions ...rganizations/OrganizationResponseModel.cs → ...rganizations/OrganizationResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using Bit.Core.Entities;
using Bit.Api.Models.Response;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.Api;
using Bit.Core.Models.Business;
using Bit.Core.Utilities;
using Constants = Bit.Core.Constants;

namespace Bit.Api.Models.Response.Organizations;
namespace Bit.Api.AdminConsole.Models.Response.Organizations;

public class OrganizationResponseModel : ResponseModel
{
Expand Down
3 changes: 2 additions & 1 deletion ...izations/OrganizationUserResponseModel.cs → ...izations/OrganizationUserResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
using System.Text.Json.Serialization;
using Bit.Api.Models.Response;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models.Api;
using Bit.Core.Models.Data;
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Response.Organizations;
namespace Bit.Api.AdminConsole.Models.Response.Organizations;

public class OrganizationUserResponseModel : ResponseModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...ponse/ProfileOrganizationResponseModel.cs → ...ponse/ProfileOrganizationResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Response;
namespace Bit.Api.AdminConsole.Models.Response;

public class ProfileOrganizationResponseModel : ResponseModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...ofileProviderOrganizationResponseModel.cs → ...ofileProviderOrganizationResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Bit.Core.Models.Data;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Response;
namespace Bit.Api.AdminConsole.Models.Response;

public class ProfileProviderOrganizationResponseModel : ProfileOrganizationResponseModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...Providers/ProfileProviderResponseModel.cs → ...Providers/ProfileProviderResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Bit.Core.Models.Data;
using Bit.Core.Utilities;

namespace Bit.Api.Models.Response.Providers;
namespace Bit.Api.AdminConsole.Models.Response.Providers;

public class ProfileProviderResponseModel : ResponseModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...ders/ProviderOrganizationResponseModel.cs → ...ders/ProviderOrganizationResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Bit.Core.Models.Api;
using Bit.Core.Models.Data;

namespace Bit.Api.Models.Response.Providers;
namespace Bit.Api.AdminConsole.Models.Response.Providers;

public class ProviderOrganizationResponseModel : ResponseModel
{
Expand Down
2 changes: 1 addition & 1 deletion ...sponse/Providers/ProviderResponseModel.cs → ...sponse/Providers/ProviderResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Bit.Core.Entities.Provider;
using Bit.Core.Models.Api;

namespace Bit.Api.Models.Response.Providers;
namespace Bit.Api.AdminConsole.Models.Response.Providers;

public class ProviderResponseModel : ResponseModel
{
Expand Down
Loading
Loading