Merge branch 'master' into ac-1705/update-paypal-verification-url-to-…

…point-to-updated-domain
bitwarden · Oct 18, 2023 · b0e29d2 · b0e29d2
2 parents e134569 + 37e9d70
commit b0e29d2
Show file tree

Hide file tree

Showing 64 changed files with 111 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -225,4 +225,4 @@ src/Identity/Identity.zip
 src/Notifications/Notifications.zip
 bitwarden_license/src/Portal/Portal.zip
 bitwarden_license/src/Sso/Sso.zip
-src/Api/flags.json
+**/src/*/flags.json
diff --git a/src/Api/Controllers/GroupsController.cs → ...inConsole/Controllers/GroupsController.cs b/src/Api/Controllers/GroupsController.cs → ...inConsole/Controllers/GroupsController.cs
@@ -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;
@@ -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")]

diff --git a/...ontrollers/OrganizationUsersController.cs → ...ontrollers/OrganizationUsersController.cs b/...ontrollers/OrganizationUsersController.cs → ...ontrollers/OrganizationUsersController.cs
@@ -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;
@@ -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")]

diff --git a/...pi/Controllers/OrganizationsController.cs → ...le/Controllers/OrganizationsController.cs b/...pi/Controllers/OrganizationsController.cs → ...le/Controllers/OrganizationsController.cs
@@ -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;
@@ -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")]

diff --git a/src/Api/Controllers/PoliciesController.cs → ...Console/Controllers/PoliciesController.cs b/src/Api/Controllers/PoliciesController.cs → ...Console/Controllers/PoliciesController.cs
@@ -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;
@@ -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")]

diff --git a/...ollers/ProviderOrganizationsController.cs → ...ollers/ProviderOrganizationsController.cs b/...ollers/ProviderOrganizationsController.cs → ...ollers/ProviderOrganizationsController.cs
@@ -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;
@@ -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")]

diff --git a/...pi/Controllers/ProviderUsersController.cs → ...le/Controllers/ProviderUsersController.cs b/...pi/Controllers/ProviderUsersController.cs → ...le/Controllers/ProviderUsersController.cs
@@ -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;
@@ -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")]

diff --git a/src/Api/Controllers/ProvidersController.cs → ...onsole/Controllers/ProvidersController.cs b/src/Api/Controllers/ProvidersController.cs → ...onsole/Controllers/ProvidersController.cs
@@ -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;
@@ -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")]

diff --git a/src/Api/Models/Request/GroupRequestModel.cs → ...nsole/Models/Request/GroupRequestModel.cs b/src/Api/Models/Request/GroupRequestModel.cs → ...nsole/Models/Request/GroupRequestModel.cs
@@ -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
 {

diff --git a/...ns/ImportOrganizationUsersRequestModel.cs → ...st/ImportOrganizationUsersRequestModel.cs b/...ns/ImportOrganizationUsersRequestModel.cs → ...st/ImportOrganizationUsersRequestModel.cs
@@ -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
 {

diff --git a/...ccounts/OrganizationApiKeyRequestModel.cs → ...zations/OrganizationApiKeyRequestModel.cs b/...ccounts/OrganizationApiKeyRequestModel.cs → ...zations/OrganizationApiKeyRequestModel.cs
@@ -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
 {

diff --git a/...zations/OrganizationCreateRequestModel.cs → ...zations/OrganizationCreateRequestModel.cs b/...zations/OrganizationCreateRequestModel.cs → ...zations/OrganizationCreateRequestModel.cs
@@ -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
 {

diff --git a/...nizations/OrganizationKeysRequestModel.cs → ...nizations/OrganizationKeysRequestModel.cs b/...nizations/OrganizationKeysRequestModel.cs → ...nizations/OrganizationKeysRequestModel.cs
@@ -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
 {

diff --git a/...nizations/OrganizationSeatRequestModel.cs → ...nizations/OrganizationSeatRequestModel.cs b/...nizations/OrganizationSeatRequestModel.cs → ...nizations/OrganizationSeatRequestModel.cs
@@ -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
 {

diff --git a/...zations/OrganizationUpdateRequestModel.cs → ...zations/OrganizationUpdateRequestModel.cs b/...zations/OrganizationUpdateRequestModel.cs → ...zations/OrganizationUpdateRequestModel.cs
@@ -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
 {

diff --git a/...ations/OrganizationUpgradeRequestModel.cs → ...ations/OrganizationUpgradeRequestModel.cs b/...ations/OrganizationUpgradeRequestModel.cs → ...ations/OrganizationUpgradeRequestModel.cs
@@ -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
 {

diff --git a/...izations/OrganizationUserRequestModels.cs → ...izations/OrganizationUserRequestModels.cs b/...izations/OrganizationUserRequestModels.cs → ...izations/OrganizationUserRequestModels.cs
@@ -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
 {

diff --git a/src/Api/Models/Request/PolicyRequestModel.cs → ...sole/Models/Request/PolicyRequestModel.cs b/src/Api/Models/Request/PolicyRequestModel.cs → ...sole/Models/Request/PolicyRequestModel.cs
@@ -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
 {

diff --git a/...rs/ProviderOrganizationAddRequestModel.cs → ...rs/ProviderOrganizationAddRequestModel.cs b/...rs/ProviderOrganizationAddRequestModel.cs → ...rs/ProviderOrganizationAddRequestModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Providers;
+namespace Bit.Api.AdminConsole.Models.Request.Providers;
 
 public class ProviderOrganizationAddRequestModel
 {

diff --git a/...ProviderOrganizationCreateRequestModel.cs → ...ProviderOrganizationCreateRequestModel.cs b/...ProviderOrganizationCreateRequestModel.cs → ...ProviderOrganizationCreateRequestModel.cs
@@ -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
 {

diff --git a/...st/Providers/ProviderSetupRequestModel.cs → ...st/Providers/ProviderSetupRequestModel.cs b/...st/Providers/ProviderSetupRequestModel.cs → ...st/Providers/ProviderSetupRequestModel.cs
@@ -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
 {

diff --git a/...t/Providers/ProviderUpdateRequestModel.cs → ...t/Providers/ProviderUpdateRequestModel.cs b/...t/Providers/ProviderUpdateRequestModel.cs → ...t/Providers/ProviderUpdateRequestModel.cs
@@ -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
 {

diff --git a/...st/Providers/ProviderUserRequestModels.cs → ...st/Providers/ProviderUserRequestModels.cs b/...st/Providers/ProviderUserRequestModels.cs → ...st/Providers/ProviderUserRequestModels.cs
@@ -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
 {

diff --git a/...Api/Models/Response/GroupResponseModel.cs → ...ole/Models/Response/GroupResponseModel.cs b/...Api/Models/Response/GroupResponseModel.cs → ...ole/Models/Response/GroupResponseModel.cs
@@ -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
 {

diff --git a/...nizationApiKeyInformationResponseModel.cs → ...nizationApiKeyInformationResponseModel.cs b/...nizationApiKeyInformationResponseModel.cs → ...nizationApiKeyInformationResponseModel.cs
@@ -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
 {

diff --git a/...anizationAutoEnrollStatusResponseModel.cs → ...anizationAutoEnrollStatusResponseModel.cs b/...anizationAutoEnrollStatusResponseModel.cs → ...anizationAutoEnrollStatusResponseModel.cs
@@ -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
 {

diff --git a/...izations/OrganizationKeysResponseModel.cs → ...izations/OrganizationKeysResponseModel.cs b/...izations/OrganizationKeysResponseModel.cs → ...izations/OrganizationKeysResponseModel.cs
@@ -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
 {

diff --git a/...ons/OrganizationPublicKeyResponseModel.cs → ...ons/OrganizationPublicKeyResponseModel.cs b/...ons/OrganizationPublicKeyResponseModel.cs → ...ons/OrganizationPublicKeyResponseModel.cs
@@ -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
 {

diff --git a/...rganizations/OrganizationResponseModel.cs → ...rganizations/OrganizationResponseModel.cs b/...rganizations/OrganizationResponseModel.cs → ...rganizations/OrganizationResponseModel.cs
@@ -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
 {

diff --git a/...izations/OrganizationUserResponseModel.cs → ...izations/OrganizationUserResponseModel.cs b/...izations/OrganizationUserResponseModel.cs → ...izations/OrganizationUserResponseModel.cs
@@ -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
 {

diff --git a/...ponse/ProfileOrganizationResponseModel.cs → ...ponse/ProfileOrganizationResponseModel.cs b/...ponse/ProfileOrganizationResponseModel.cs → ...ponse/ProfileOrganizationResponseModel.cs
@@ -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
 {

diff --git a/...ofileProviderOrganizationResponseModel.cs → ...ofileProviderOrganizationResponseModel.cs b/...ofileProviderOrganizationResponseModel.cs → ...ofileProviderOrganizationResponseModel.cs
@@ -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
 {

diff --git a/...Providers/ProfileProviderResponseModel.cs → ...Providers/ProfileProviderResponseModel.cs b/...Providers/ProfileProviderResponseModel.cs → ...Providers/ProfileProviderResponseModel.cs
@@ -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
 {

diff --git a/...ders/ProviderOrganizationResponseModel.cs → ...ders/ProviderOrganizationResponseModel.cs b/...ders/ProviderOrganizationResponseModel.cs → ...ders/ProviderOrganizationResponseModel.cs
@@ -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
 {

diff --git a/...sponse/Providers/ProviderResponseModel.cs → ...sponse/Providers/ProviderResponseModel.cs b/...sponse/Providers/ProviderResponseModel.cs → ...sponse/Providers/ProviderResponseModel.cs
@@ -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
 {