nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-04 20:50:21 -05:00
Code

Revert filescoped (#2227)

Browse Source 
* Revert "Add git blame entry (#2226)"

This reverts commit 239286737d15cb84a893703ee5a8b33a2d67ad3d.

* Revert "Turn on file scoped namespaces (#2225)"

This reverts commit 34fb4cca2aa78deb84d4cbc359992a7c6bba7ea5.
This commit is contained in:
Justin Baur 2022-08-29 15:53:48 -04:00 committed by GitHub
parent 239286737d
commit bae03feffe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1208 changed files with 74317 additions and 73126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@ -114,9 +114,6 @@ csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
# Namespace settigns
csharp_style_namespace_declarations = file_scoped:warning
# All files
[*]
guidelines = 120

3
.git-blame-ignore-revs
View File

@ -1,5 +1,2 @@
# Apply .NET format https://github.com/bitwarden/server/pull/1764
23b0a1f9df25058ab29785ecad9a233113c10889
# Turn on file scoped namespaces https://github.com/bitwarden/server/pull/2225
34fb4cca2aa78deb84d4cbc359992a7c6bba7ea5

12
README.md
View File

@ -84,15 +84,3 @@ We recently migrated to using dotnet-format as code formatter. All previous bran
5. Commit
6. Run `git merge -Xours 23b0a1f9df25058ab29785ecad9a233113c10889`
7. Push
### File Scoped Namespaces
We have switched to using file scoped namespace. All previous branches will need to update to avoid large merge conflicts using the following steps:
1. Check out your local Branch
1. Run `git merge 7c4521e0b428d523f2153cda3fb51d51bca9f194`
2. Resolve any merge conflicts, commit.
3. Run `dotnet format`
4. Commit
5. Run `git merge -Xours 34fb4cca2aa78deb84d4cbc359992a7c6bba7ea5`
6. Resolve merge conflicts
7. Push

5
bitwarden_license/src/Commercial.Core/Services/ProviderService.cs
View File

@ -13,8 +13,8 @@ using Bit.Core.Settings;
using Bit.Core.Utilities;
using Microsoft.AspNetCore.DataProtection;
namespace Bit.Commercial.Core.Services;
namespace Bit.Commercial.Core.Services
{
public class ProviderService : IProviderService
{
public static PlanType[] ProviderDisllowedOrganizationTypes = new[] { PlanType.Free, PlanType.FamiliesAnnually, PlanType.FamiliesAnnually2019 };
@ -506,3 +506,4 @@ public class ProviderService : IProviderService
}
}
}
}

5
bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs
View File

@ -2,8 +2,8 @@
using Bit.Core.Services;
using Microsoft.Extensions.DependencyInjection;
namespace Bit.Commercial.Core.Utilities;
namespace Bit.Commercial.Core.Utilities
{
public static class ServiceCollectionExtensions
{
public static void AddCommCoreServices(this IServiceCollection services)
@ -11,3 +11,4 @@ public static class ServiceCollectionExtensions
services.AddScoped<IProviderService, ProviderService>();
}
}
}

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

@ -4,8 +4,8 @@ using Bit.Core.Models.OrganizationConnectionConfigs;
using Bit.Core.Repositories;
using Bit.Core.Settings;
namespace Bit.Scim.Context;
namespace Bit.Scim.Context
{
public interface IScimContext
{
ScimProviderType RequestScimProvider { get; set; }
@ -18,3 +18,4 @@ public interface IScimContext
IOrganizationRepository organizationRepository,
IOrganizationConnectionRepository organizationConnectionRepository);
}
}

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

@ -4,8 +4,8 @@ using Bit.Core.Models.OrganizationConnectionConfigs;
using Bit.Core.Repositories;
using Bit.Core.Settings;
namespace Bit.Scim.Context;
namespace Bit.Scim.Context
{
public class ScimContext : IScimContext
{
private bool _builtHttpContext;
@ -61,3 +61,4 @@ public class ScimContext : IScimContext
}
}
}
}

5
bitwarden_license/src/Scim/Controllers/InfoController.cs
View File

@ -2,8 +2,8 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Scim.Controllers;
namespace Bit.Scim.Controllers
{
[AllowAnonymous]
public class InfoController : Controller
{
@ -20,3 +20,4 @@ public class InfoController : Controller
return Json(CoreHelpers.GetVersion());
}
}
}

5
bitwarden_license/src/Scim/Controllers/v2/GroupsController.cs
View File

@ -8,8 +8,8 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
namespace Bit.Scim.Controllers.v2;
namespace Bit.Scim.Controllers.v2
{
[Authorize("Scim")]
[Route("v2/{organizationId}/groups")]
public class GroupsController : Controller
@ -325,3 +325,4 @@ public class GroupsController : Controller
await _groupRepository.UpdateUsersAsync(group.Id, memberIds);
}
}
}

5
bitwarden_license/src/Scim/Controllers/v2/UsersController.cs
View File

@ -9,8 +9,8 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
namespace Bit.Scim.Controllers.v2;
namespace Bit.Scim.Controllers.v2
{
[Authorize("Scim")]
[Route("v2/{organizationId}/users")]
public class UsersController : Controller
@ -292,3 +292,4 @@ public class UsersController : Controller
return false;
}
}
}

5
bitwarden_license/src/Scim/Models/BaseScimGroupModel.cs
View File

@ -1,7 +1,7 @@
using Bit.Scim.Utilities;
namespace Bit.Scim.Models;
namespace Bit.Scim.Models
{
public abstract class BaseScimGroupModel : BaseScimModel
{
public BaseScimGroupModel(bool initSchema = false)
@ -15,3 +15,4 @@ public abstract class BaseScimGroupModel : BaseScimModel
public string DisplayName { get; set; }
public string ExternalId { get; set; }
}
}

5
bitwarden_license/src/Scim/Models/BaseScimModel.cs
View File

@ -1,5 +1,5 @@
namespace Bit.Scim.Models;
namespace Bit.Scim.Models
{
public abstract class BaseScimModel
{
public BaseScimModel()
@ -12,3 +12,4 @@ public abstract class BaseScimModel
public List<string> Schemas { get; set; }
}
}

5
bitwarden_license/src/Scim/Models/BaseScimUserModel.cs
View File

@ -1,7 +1,7 @@
using Bit.Scim.Utilities;
namespace Bit.Scim.Models;
namespace Bit.Scim.Models
{
public abstract class BaseScimUserModel : BaseScimModel
{
public BaseScimUserModel(bool initSchema = false)
@ -53,3 +53,4 @@ public abstract class BaseScimUserModel : BaseScimModel
public string Type { get; set; }
}
}
}

5
bitwarden_license/src/Scim/Models/ScimErrorResponseModel.cs
View File

@ -1,7 +1,7 @@
using Bit.Scim.Utilities;
namespace Bit.Scim.Models;
namespace Bit.Scim.Models
{
public class ScimErrorResponseModel : BaseScimModel
{
public ScimErrorResponseModel()
@ -11,3 +11,4 @@ public class ScimErrorResponseModel : BaseScimModel
public string Detail { get; set; }
public int Status { get; set; }
}
}

5
bitwarden_license/src/Scim/Models/ScimGroupRequestModel.cs
View File

@ -1,8 +1,8 @@
using Bit.Core.Entities;
using Bit.Core.Utilities;
namespace Bit.Scim.Models;
namespace Bit.Scim.Models
{
public class ScimGroupRequestModel : BaseScimGroupModel
{
public ScimGroupRequestModel()
@ -28,3 +28,4 @@ public class ScimGroupRequestModel : BaseScimGroupModel
public string Display { get; set; }
}
}
}

5
bitwarden_license/src/Scim/Models/ScimGroupResponseModel.cs
View File

@ -1,7 +1,7 @@
using Bit.Core.Entities;
namespace Bit.Scim.Models;
namespace Bit.Scim.Models
{
public class ScimGroupResponseModel : BaseScimGroupModel
{
public ScimGroupResponseModel()
@ -23,3 +23,4 @@ public class ScimGroupResponseModel : BaseScimGroupModel
public string Id { get; set; }
public ScimMetaModel Meta { get; private set; }
}
}

5
bitwarden_license/src/Scim/Models/ScimListResponseModel.cs
View File

@ -1,7 +1,7 @@
using Bit.Scim.Utilities;
namespace Bit.Scim.Models;
namespace Bit.Scim.Models
{
public class ScimListResponseModel<T> : BaseScimModel
{
public ScimListResponseModel()
@ -13,3 +13,4 @@ public class ScimListResponseModel<T> : BaseScimModel
public int ItemsPerPage { get; set; }
public List<T> Resources { get; set; }
}
}

5
bitwarden_license/src/Scim/Models/ScimMetaModel.cs
View File

@ -1,5 +1,5 @@
namespace Bit.Scim.Models;
namespace Bit.Scim.Models
{
public class ScimMetaModel
{
public ScimMetaModel(string resourceType)
@ -11,3 +11,4 @@ public class ScimMetaModel
public DateTime? Created { get; set; }
public DateTime? LastModified { get; set; }
}
}

5
bitwarden_license/src/Scim/Models/ScimPatchModel.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json;
namespace Bit.Scim.Models;
namespace Bit.Scim.Models
{
public class ScimPatchModel : BaseScimModel
{
public ScimPatchModel()
@ -16,3 +16,4 @@ public class ScimPatchModel : BaseScimModel
public JsonElement Value { get; set; }
}
}
}

5
bitwarden_license/src/Scim/Models/ScimUserRequestModel.cs
View File

@ -1,8 +1,9 @@
namespace Bit.Scim.Models;
namespace Bit.Scim.Models
{
public class ScimUserRequestModel : BaseScimUserModel
{
public ScimUserRequestModel()
: base(false)
{ }
}
}

5
bitwarden_license/src/Scim/Models/ScimUserResponseModel.cs
View File

@ -1,7 +1,7 @@
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
namespace Bit.Scim.Models;
namespace Bit.Scim.Models
{
public class ScimUserResponseModel : BaseScimUserModel
{
public ScimUserResponseModel()
@ -26,3 +26,4 @@ public class ScimUserResponseModel : BaseScimUserModel
public string Id { get; set; }
public ScimMetaModel Meta { get; private set; }
}
}

5
bitwarden_license/src/Scim/Program.cs
View File

@ -1,8 +1,8 @@
using Bit.Core.Utilities;
using Serilog.Events;
namespace Bit.Scim;
namespace Bit.Scim
{
public class Program
{
public static void Main(string[] args)
@ -31,3 +31,4 @@ public class Program
.Run();
}
}
}

5
bitwarden_license/src/Scim/ScimSettings.cs
View File

@ -1,5 +1,6 @@
namespace Bit.Scim;
namespace Bit.Scim
{
public class ScimSettings
{
}
}

5
bitwarden_license/src/Scim/Startup.cs
View File

@ -9,8 +9,8 @@ using IdentityModel;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Stripe;
namespace Bit.Scim;
namespace Bit.Scim
{
public class Startup
{
public Startup(IWebHostEnvironment env, IConfiguration configuration)
@ -113,3 +113,4 @@ public class Startup
app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute());
}
}
}

5
bitwarden_license/src/Scim/Utilities/ApiKeyAuthenticationHandler.cs
View File

@ -8,8 +8,8 @@ using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.Extensions.Options;
namespace Bit.Scim.Utilities;
namespace Bit.Scim.Utilities
{
public class ApiKeyAuthenticationHandler : AuthenticationHandler<ApiKeyAuthenticationOptions>
{
private readonly IOrganizationRepository _organizationRepository;
@ -87,3 +87,4 @@ public class ApiKeyAuthenticationHandler : AuthenticationHandler<ApiKeyAuthentic
return AuthenticateResult.Success(ticket);
}
}
}

5
bitwarden_license/src/Scim/Utilities/ApiKeyAuthenticationOptions.cs
View File

@ -1,8 +1,9 @@
using Microsoft.AspNetCore.Authentication;
namespace Bit.Scim.Utilities;
namespace Bit.Scim.Utilities
{
public class ApiKeyAuthenticationOptions : AuthenticationSchemeOptions
{
public const string DefaultScheme = "ScimApiKey";
}
}

5
bitwarden_license/src/Scim/Utilities/ScimConstants.cs
View File

@ -1,5 +1,5 @@
namespace Bit.Scim.Utilities;
namespace Bit.Scim.Utilities
{
public static class ScimConstants
{
public const string Scim2SchemaListResponse = "urn:ietf:params:scim:api:messages:2.0:ListResponse";
@ -7,3 +7,4 @@ public static class ScimConstants
public const string Scim2SchemaUser = "urn:ietf:params:scim:schemas:core:2.0:User";
public const string Scim2SchemaGroup = "urn:ietf:params:scim:schemas:core:2.0:Group";
}
}

5
bitwarden_license/src/Scim/Utilities/ScimContextMiddleware.cs
View File

@ -2,8 +2,8 @@
using Bit.Core.Settings;
using Bit.Scim.Context;
namespace Bit.Scim.Utilities;
namespace Bit.Scim.Utilities
{
public class ScimContextMiddleware
{
private readonly RequestDelegate _next;
@ -20,3 +20,4 @@ public class ScimContextMiddleware
await _next.Invoke(httpContext);
}
}
}

5
bitwarden_license/src/Sso/Controllers/AccountController.cs
View File

@ -22,8 +22,8 @@ using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Sso.Controllers;
namespace Bit.Sso.Controllers
{
public class AccountController : Controller
{
private readonly IAuthenticationSchemeProvider _schemeProvider;
@ -707,3 +707,4 @@ public class AccountController : Controller
&& !context.RedirectUri.StartsWith("http", StringComparison.Ordinal);
}
}
}

5
bitwarden_license/src/Sso/Controllers/HomeController.cs
View File

@ -5,8 +5,8 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Diagnostics;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Sso.Controllers;
namespace Bit.Sso.Controllers
{
public class HomeController : Controller
{
private readonly IIdentityServerInteractionService _interaction;
@ -52,3 +52,4 @@ public class HomeController : Controller
return View("Error", vm);
}
}
}

5
bitwarden_license/src/Sso/Controllers/InfoController.cs
View File

@ -1,8 +1,8 @@
using Bit.Core.Utilities;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Sso.Controllers;
namespace Bit.Sso.Controllers
{
public class InfoController : Controller
{
[HttpGet("~/alive")]
@ -18,3 +18,4 @@ public class InfoController : Controller
return Json(CoreHelpers.GetVersion());
}
}
}

5
bitwarden_license/src/Sso/Controllers/MetadataController.cs
View File

@ -5,8 +5,8 @@ using Microsoft.AspNetCore.Mvc;
using Sustainsys.Saml2.AspNetCore2;
using Sustainsys.Saml2.WebSso;
namespace Bit.Sso.Controllers;
namespace Bit.Sso.Controllers
{
public class MetadataController : Controller
{
private readonly IAuthenticationSchemeProvider _schemeProvider;
@ -67,3 +67,4 @@ public class MetadataController : Controller
};
}
}
}

5
bitwarden_license/src/Sso/Models/ErrorViewModel.cs
View File

@ -1,7 +1,7 @@
using IdentityServer4.Models;
namespace Bit.Sso.Models;
namespace Bit.Sso.Models
{
public class ErrorViewModel
{
private string _requestId;
@ -24,3 +24,4 @@ public class ErrorViewModel
}
}
}
}

5
bitwarden_license/src/Sso/Models/RedirectViewModel.cs
View File

@ -1,6 +1,7 @@
namespace Bit.Sso.Models;
namespace Bit.Sso.Models
{
public class RedirectViewModel
{
public string RedirectUrl { get; set; }
}
}

5
bitwarden_license/src/Sso/Models/SamlEnvironment.cs
View File

@ -1,8 +1,9 @@
using System.Security.Cryptography.X509Certificates;
namespace Bit.Sso.Models;
namespace Bit.Sso.Models
{
public class SamlEnvironment
{
public X509Certificate2 SpSigningCertificate { get; set; }
}
}

5
bitwarden_license/src/Sso/Models/SsoPreValidateResponseModel.cs
View File

@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
namespace Bit.Sso.Models;
namespace Bit.Sso.Models
{
public class SsoPreValidateResponseModel : JsonResult
{
public SsoPreValidateResponseModel(string token) : base(new
@ -10,3 +10,4 @@ public class SsoPreValidateResponseModel : JsonResult
})
{ }
}
}

5
bitwarden_license/src/Sso/Program.cs
View File

@ -2,8 +2,8 @@
using Serilog;
using Serilog.Events;
namespace Bit.Sso;
namespace Bit.Sso
{
public class Program
{
public static void Main(string[] args)
@ -31,3 +31,4 @@ public class Program
.Run();
}
}
}

5
bitwarden_license/src/Sso/Startup.cs
View File

@ -8,8 +8,8 @@ using IdentityServer4.Extensions;
using Microsoft.IdentityModel.Logging;
using Stripe;
namespace Bit.Sso;
namespace Bit.Sso
{
public class Startup
{
public Startup(IWebHostEnvironment env, IConfiguration configuration)
@ -152,3 +152,4 @@ public class Startup
logger.LogInformation(Constants.BypassFiltersEventId, globalSettings.ProjectName + " started.");
}
}
}

5
bitwarden_license/src/Sso/Utilities/ClaimsExtensions.cs
View File

@ -1,8 +1,8 @@
using System.Security.Claims;
using System.Text.RegularExpressions;
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public static class ClaimsExtensions
{
private static readonly Regex _normalizeTextRegEx =
@ -43,3 +43,4 @@ public static class ClaimsExtensions
return _normalizeTextRegEx.Replace(text, string.Empty);
}
}
}

5
bitwarden_license/src/Sso/Utilities/DiscoveryResponseGenerator.cs
View File

@ -5,8 +5,8 @@ using IdentityServer4.Services;
using IdentityServer4.Stores;
using IdentityServer4.Validation;
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public class DiscoveryResponseGenerator : IdentityServer4.ResponseHandling.DiscoveryResponseGenerator
{
private readonly GlobalSettings _globalSettings;
@ -33,3 +33,4 @@ public class DiscoveryResponseGenerator : IdentityServer4.ResponseHandling.Disco
_globalSettings.BaseServiceUri.InternalSso);
}
}
}

5
bitwarden_license/src/Sso/Utilities/DynamicAuthenticationScheme.cs
View File

@ -3,8 +3,8 @@ using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
using Sustainsys.Saml2.AspNetCore2;
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public class DynamicAuthenticationScheme : AuthenticationScheme, IDynamicAuthenticationScheme
{
public DynamicAuthenticationScheme(string name, string displayName, Type handlerType,
@ -87,3 +87,4 @@ public class DynamicAuthenticationScheme : AuthenticationScheme, IDynamicAuthent
}
}
}
}

5
bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs
View File

@ -18,8 +18,8 @@ using Sustainsys.Saml2.AspNetCore2;
using Sustainsys.Saml2.Configuration;
using Sustainsys.Saml2.Saml2P;
namespace Bit.Core.Business.Sso;
namespace Bit.Core.Business.Sso
{
public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider
{
private readonly IPostConfigureOptions<OpenIdConnectOptions> _oidcPostConfigureOptions;
@ -455,3 +455,4 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider
};
}
}
}

5
bitwarden_license/src/Sso/Utilities/ExtendedOptionsMonitorCache.cs
View File

@ -1,8 +1,8 @@
using System.Collections.Concurrent;
using Microsoft.Extensions.Options;
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public class ExtendedOptionsMonitorCache<TOptions> : IExtendedOptionsMonitorCache<TOptions> where TOptions : class
{
private readonly ConcurrentDictionary<string, Lazy<TOptions>> _cache =
@ -34,3 +34,4 @@ public class ExtendedOptionsMonitorCache<TOptions> : IExtendedOptionsMonitorCach
return _cache.TryRemove(name ?? Options.DefaultName, out _);
}
}
}

5
bitwarden_license/src/Sso/Utilities/IDynamicAuthenticationScheme.cs
View File

@ -1,8 +1,8 @@
using Bit.Core.Enums;
using Microsoft.AspNetCore.Authentication;
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public interface IDynamicAuthenticationScheme
{
AuthenticationSchemeOptions Options { get; set; }
@ -10,3 +10,4 @@ public interface IDynamicAuthenticationScheme
Task Validate();
}
}

5
bitwarden_license/src/Sso/Utilities/IExtendedOptionsMonitorCache.cs
View File

@ -1,8 +1,9 @@
using Microsoft.Extensions.Options;
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public interface IExtendedOptionsMonitorCache<TOptions> : IOptionsMonitorCache<TOptions> where TOptions : class
{
void AddOrUpdate(string name, TOptions options);
}
}

5
bitwarden_license/src/Sso/Utilities/OpenIdConnectOptionsExtensions.cs
View File

@ -1,8 +1,8 @@
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public static class OpenIdConnectOptionsExtensions
{
public static async Task<bool> CouldHandleAsync(this OpenIdConnectOptions options, string scheme, HttpContext context)
@ -60,3 +60,4 @@ public static class OpenIdConnectOptionsExtensions
return false;
}
}
}

5
bitwarden_license/src/Sso/Utilities/OpenIdConnectScopes.cs
View File

@ -1,5 +1,5 @@
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
/// <summary>
/// OpenID Connect Clients use scope values as defined in 3.3 of OAuth 2.0
/// [RFC6749]. These values represent the standard scope values supported
@ -61,3 +61,4 @@ public static class OpenIdConnectScopes
/// </remarks>
public const string Acr = "acr";
}
}

5
bitwarden_license/src/Sso/Utilities/Saml2OptionsExtensions.cs
View File

@ -4,8 +4,8 @@ using System.Xml;
using Sustainsys.Saml2;
using Sustainsys.Saml2.AspNetCore2;
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public static class Saml2OptionsExtensions
{
public static async Task<bool> CouldHandleAsync(this Saml2Options options, string scheme, HttpContext context)
@ -102,3 +102,4 @@ public static class Saml2OptionsExtensions
return true;
}
}
}

5
bitwarden_license/src/Sso/Utilities/SamlClaimTypes.cs
View File

@ -1,5 +1,5 @@
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public static class SamlClaimTypes
{
public const string Email = "urn:oid:0.9.2342.19200300.100.1.3";
@ -9,3 +9,4 @@ public static class SamlClaimTypes
public const string CommonName = "urn:oid:2.5.4.3";
public const string UserId = "urn:oid:0.9.2342.19200300.100.1.1";
}
}

5
bitwarden_license/src/Sso/Utilities/SamlNameIdFormats.cs
View File

@ -1,5 +1,5 @@
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public static class SamlNameIdFormats
{
// Common
@ -15,3 +15,4 @@ public static class SamlNameIdFormats
public const string KerberosPrincipalName = "urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos";
public const string EntityIdentifier = "urn:oasis:names:tc:SAML:2.0:nameid-format:entity";
}
}

5
bitwarden_license/src/Sso/Utilities/SamlPropertyKeys.cs
View File

@ -1,6 +1,7 @@
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public static class SamlPropertyKeys
{
public const string ClaimFormat = "http://schemas.xmlsoap.org/ws/2005/05/identity/claimproperties/format";
}
}

5
bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs
View File

@ -9,8 +9,8 @@ using IdentityServer4.ResponseHandling;
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
using Sustainsys.Saml2.AspNetCore2;
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public static class ServiceCollectionExtensions
{
public static IServiceCollection AddSsoServices(this IServiceCollection services,
@ -75,3 +75,4 @@ public static class ServiceCollectionExtensions
return identityServerBuilder;
}
}
}

5
bitwarden_license/src/Sso/Utilities/SsoAuthenticationMiddleware.cs
View File

@ -3,8 +3,8 @@ using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
using Sustainsys.Saml2.AspNetCore2;
namespace Bit.Sso.Utilities;
namespace Bit.Sso.Utilities
{
public class SsoAuthenticationMiddleware
{
private readonly RequestDelegate _next;
@ -82,3 +82,4 @@ public class SsoAuthenticationMiddleware
await _next(context);
}
}
}

5
bitwarden_license/test/Commercial.Core.Test/AutoFixture/ProviderUserFixtures.cs
View File

@ -3,8 +3,8 @@ using AutoFixture;
using AutoFixture.Xunit2;
using Bit.Core.Enums.Provider;
namespace Bit.Commercial.Core.Test.AutoFixture;
namespace Bit.Commercial.Core.Test.AutoFixture
{
internal class ProviderUser : ICustomization
{
public ProviderUserStatusType Status { get; set; }
@ -42,3 +42,4 @@ public class ProviderUserAttribute : CustomizeAttribute
return new ProviderUser(_status, _type);
}
}
}

5
bitwarden_license/test/Commercial.Core.Test/Services/ProviderServiceTests.cs
View File

@ -19,8 +19,8 @@ using NSubstitute.ReturnsExtensions;
using Xunit;
using ProviderUser = Bit.Core.Entities.Provider.ProviderUser;
namespace Bit.Commercial.Core.Test.Services;
namespace Bit.Commercial.Core.Test.Services
{
public class ProviderServiceTests
{
[Theory, CustomAutoData(typeof(SutProviderCustomization))]
@ -547,3 +547,4 @@ public class ProviderServiceTests
.LogProviderOrganizationEventAsync(providerOrganization, EventType.ProviderOrganization_Removed);
}
}
}

5
src/Admin/AdminSettings.cs
View File

@ -1,5 +1,5 @@
namespace Bit.Admin;
namespace Bit.Admin
{
public class AdminSettings
{
public virtual string Admins { get; set; }
@ -13,3 +13,4 @@ public class AdminSettings
public string AuthKey { get; set; }
}
}
}

5
src/Admin/Controllers/ErrorController.cs
View File

@ -1,8 +1,8 @@
using Microsoft.AspNetCore.Diagnostics;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.Controllers
{
public class ErrorController : Controller
{
[Route("/error")]
@ -21,3 +21,4 @@ public class ErrorController : Controller
}
}
}
}

5
src/Admin/Controllers/HomeController.cs
View File

@ -6,8 +6,8 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.Controllers
{
public class HomeController : Controller
{
private readonly GlobalSettings _globalSettings;
@ -111,3 +111,4 @@ public enum ProjectType
Core,
Web,
}
}

5
src/Admin/Controllers/InfoController.cs
View File

@ -1,8 +1,8 @@
using Bit.Core.Utilities;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.Controllers
{
public class InfoController : Controller
{
[HttpGet("~/alive")]
@ -18,3 +18,4 @@ public class InfoController : Controller
return Json(CoreHelpers.GetVersion());
}
}
}

5
src/Admin/Controllers/LoginController.cs
View File

@ -3,8 +3,8 @@ using Bit.Core.Identity;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.Controllers
{
public class LoginController : Controller
{
private readonly PasswordlessSignInManager<IdentityUser> _signInManager;
@ -90,3 +90,4 @@ public class LoginController : Controller
};
}
}
}

5
src/Admin/Controllers/LogsController.cs
View File

@ -7,8 +7,8 @@ using Microsoft.Azure.Cosmos;
using Microsoft.Azure.Cosmos.Linq;
using Serilog.Events;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.Controllers
{
[Authorize]
[SelfHosted(NotSelfHostedOnly = true)]
public class LogsController : Controller
@ -90,3 +90,4 @@ public class LogsController : Controller
}
}
}
}

5
src/Admin/Controllers/OrganizationsController.cs
View File

@ -11,8 +11,8 @@ using Bit.Core.Utilities;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.Controllers
{
[Authorize]
public class OrganizationsController : Controller
{
@ -214,3 +214,4 @@ public class OrganizationsController : Controller
}
}
}

5
src/Admin/Controllers/ProvidersController.cs
View File

@ -7,8 +7,8 @@ using Bit.Core.Utilities;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.Controllers
{
[Authorize]
[SelfHosted(NotSelfHostedOnly = true)]
public class ProvidersController : Controller
@ -131,3 +131,4 @@ public class ProvidersController : Controller
return RedirectToAction("Edit", new { id = providerId });
}
}
}

5
src/Admin/Controllers/ToolsController.cs
View File

@ -10,8 +10,8 @@ using Bit.Core.Utilities;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.Controllers
{
[Authorize]
[SelfHosted(NotSelfHostedOnly = true)]
public class ToolsController : Controller
@ -556,3 +556,4 @@ public class ToolsController : Controller
return File(bytes, "application/json", "StripeSubscriptionsSearch.json");
}
}
}

5
src/Admin/Controllers/UsersController.cs
View File

@ -7,8 +7,8 @@ using Bit.Core.Utilities;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.Controllers
{
[Authorize]
public class UsersController : Controller
{
@ -108,3 +108,4 @@ public class UsersController : Controller
return RedirectToAction("Index");
}
}
}

5
src/Admin/HostedServices/AmazonSqsBlockIpHostedService.cs
View File

@ -4,8 +4,8 @@ using Amazon.SQS.Model;
using Bit.Core.Settings;
using Microsoft.Extensions.Options;
namespace Bit.Admin.HostedServices;
namespace Bit.Admin.HostedServices
{
public class AmazonSqsBlockIpHostedService : BlockIpHostedService
{
private AmazonSQSClient _client;
@ -81,3 +81,4 @@ public class AmazonSqsBlockIpHostedService : BlockIpHostedService
}
}
}
}

5
src/Admin/HostedServices/AzureQueueBlockIpHostedService.cs
View File

@ -2,8 +2,8 @@
using Bit.Core.Settings;
using Microsoft.Extensions.Options;
namespace Bit.Admin.HostedServices;
namespace Bit.Admin.HostedServices
{
public class AzureQueueBlockIpHostedService : BlockIpHostedService
{
private QueueClient _blockIpQueueClient;
@ -61,3 +61,4 @@ public class AzureQueueBlockIpHostedService : BlockIpHostedService
}
}
}
}

5
src/Admin/HostedServices/AzureQueueMailHostedService.cs
View File

@ -6,8 +6,8 @@ using Bit.Core.Services;
using Bit.Core.Settings;
using Bit.Core.Utilities;
namespace Bit.Admin.HostedServices;
namespace Bit.Admin.HostedServices
{
public class AzureQueueMailHostedService : IHostedService
{
private readonly ILogger<AzureQueueMailHostedService> _logger;
@ -99,3 +99,4 @@ public class AzureQueueMailHostedService : IHostedService
return (await _mailQueueClient.ReceiveMessagesAsync(maxMessages: 32))?.Value ?? new QueueMessage[] { };
}
}
}

5
src/Admin/HostedServices/BlockIpHostedService.cs
View File

@ -1,8 +1,8 @@
using Bit.Core.Settings;
using Microsoft.Extensions.Options;
namespace Bit.Admin.HostedServices;
namespace Bit.Admin.HostedServices
{
public abstract class BlockIpHostedService : IHostedService, IDisposable
{
protected readonly ILogger<BlockIpHostedService> _logger;
@ -162,3 +162,4 @@ public abstract class BlockIpHostedService : IHostedService, IDisposable
}
}
}
}

5
src/Admin/HostedServices/DatabaseMigrationHostedService.cs
View File

@ -3,8 +3,8 @@ using Bit.Core.Jobs;
using Bit.Core.Settings;
using Bit.Migrator;
namespace Bit.Admin.HostedServices;
namespace Bit.Admin.HostedServices
{
public class DatabaseMigrationHostedService : IHostedService, IDisposable
{
private readonly GlobalSettings _globalSettings;
@ -61,3 +61,4 @@ public class DatabaseMigrationHostedService : IHostedService, IDisposable
public virtual void Dispose()
{ }
}
}

5
src/Admin/Jobs/AliveJob.cs
View File

@ -3,8 +3,8 @@ using Bit.Core.Jobs;
using Bit.Core.Settings;
using Quartz;
namespace Bit.Admin.Jobs;
namespace Bit.Admin.Jobs
{
public class AliveJob : BaseJob
{
private readonly GlobalSettings _globalSettings;
@ -26,3 +26,4 @@ public class AliveJob : BaseJob
response.StatusCode);
}
}
}

5
src/Admin/Jobs/DatabaseExpiredGrantsJob.cs
View File

@ -3,8 +3,8 @@ using Bit.Core.Jobs;
using Bit.Core.Repositories;
using Quartz;
namespace Bit.Admin.Jobs;
namespace Bit.Admin.Jobs
{
public class DatabaseExpiredGrantsJob : BaseJob
{
private readonly IMaintenanceRepository _maintenanceRepository;
@ -24,3 +24,4 @@ public class DatabaseExpiredGrantsJob : BaseJob
_logger.LogInformation(Constants.BypassFiltersEventId, "Finished job task: DeleteExpiredGrantsAsync");
}
}
}

5
src/Admin/Jobs/DatabaseExpiredSponsorshipsJob.cs
View File

@ -4,8 +4,8 @@ using Bit.Core.Repositories;
using Bit.Core.Settings;
using Quartz;
namespace Bit.Admin.Jobs;
namespace Bit.Admin.Jobs
{
public class DatabaseExpiredSponsorshipsJob : BaseJob
{
private GlobalSettings _globalSettings;
@ -36,3 +36,4 @@ public class DatabaseExpiredSponsorshipsJob : BaseJob
_logger.LogInformation(Constants.BypassFiltersEventId, "Finished job task: DeleteExpiredSponsorshipsAsync");
}
}
}

5
src/Admin/Jobs/DatabaseRebuildlIndexesJob.cs
View File

@ -3,8 +3,8 @@ using Bit.Core.Jobs;
using Bit.Core.Repositories;
using Quartz;
namespace Bit.Admin.Jobs;
namespace Bit.Admin.Jobs
{
public class DatabaseRebuildlIndexesJob : BaseJob
{
private readonly IMaintenanceRepository _maintenanceRepository;
@ -24,3 +24,4 @@ public class DatabaseRebuildlIndexesJob : BaseJob
_logger.LogInformation(Constants.BypassFiltersEventId, "Finished job task: RebuildIndexesAsync");
}
}
}

5
src/Admin/Jobs/DatabaseUpdateStatisticsJob.cs
View File

@ -3,8 +3,8 @@ using Bit.Core.Jobs;
using Bit.Core.Repositories;
using Quartz;
namespace Bit.Admin.Jobs;
namespace Bit.Admin.Jobs
{
public class DatabaseUpdateStatisticsJob : BaseJob
{
private readonly IMaintenanceRepository _maintenanceRepository;
@ -27,3 +27,4 @@ public class DatabaseUpdateStatisticsJob : BaseJob
_logger.LogInformation(Constants.BypassFiltersEventId, "Finished job task: DisableCipherAutoStatsAsync");
}
}
}

5
src/Admin/Jobs/DeleteCiphersJob.cs
View File

@ -4,8 +4,8 @@ using Bit.Core.Repositories;
using Microsoft.Extensions.Options;
using Quartz;
namespace Bit.Admin.Jobs;
namespace Bit.Admin.Jobs
{
public class DeleteCiphersJob : BaseJob
{
private readonly ICipherRepository _cipherRepository;
@ -34,3 +34,4 @@ public class DeleteCiphersJob : BaseJob
_logger.LogInformation(Constants.BypassFiltersEventId, "Finished job task: DeleteDeletedAsync");
}
}
}

5
src/Admin/Jobs/DeleteSendsJob.cs
View File

@ -4,8 +4,8 @@ using Bit.Core.Repositories;
using Bit.Core.Services;
using Quartz;
namespace Bit.Admin.Jobs;
namespace Bit.Admin.Jobs
{
public class DeleteSendsJob : BaseJob
{
private readonly ISendRepository _sendRepository;
@ -39,3 +39,4 @@ public class DeleteSendsJob : BaseJob
}
}
}
}

5
src/Admin/Jobs/JobsHostedService.cs
View File

@ -3,8 +3,8 @@ using Bit.Core.Jobs;
using Bit.Core.Settings;
using Quartz;
namespace Bit.Admin.Jobs;
namespace Bit.Admin.Jobs
{
public class JobsHostedService : BaseJobsHostedService
{
public JobsHostedService(
@ -93,3 +93,4 @@ public class JobsHostedService : BaseJobsHostedService
services.AddTransient<DeleteCiphersJob>();
}
}
}

5
src/Admin/Models/BillingInformationModel.cs
View File

@ -1,10 +1,11 @@
using Bit.Core.Models.Business;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class BillingInformationModel
{
public BillingInfo BillingInfo { get; set; }
public Guid? UserId { get; set; }
public Guid? OrganizationId { get; set; }
}
}

5
src/Admin/Models/ChargeBraintreeModel.cs
View File

@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class ChargeBraintreeModel : IValidatableObject
{
[Required]
@ -25,3 +25,4 @@ public class ChargeBraintreeModel : IValidatableObject
}
}
}
}

5
src/Admin/Models/CreateProviderModel.cs
View File

@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class CreateProviderModel
{
public CreateProviderModel() { }
@ -10,3 +10,4 @@ public class CreateProviderModel
[Required]
public string OwnerEmail { get; set; }
}
}

5
src/Admin/Models/CreateUpdateTransactionModel.cs
View File

@ -2,8 +2,8 @@
using Bit.Core.Entities;
using Bit.Core.Enums;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class CreateUpdateTransactionModel : IValidatableObject
{
public CreateUpdateTransactionModel() { }
@ -75,3 +75,4 @@ public class CreateUpdateTransactionModel : IValidatableObject
};
}
}
}

5
src/Admin/Models/CursorPagedModel.cs
View File

@ -1,5 +1,5 @@
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class CursorPagedModel<T>
{
public List<T> Items { get; set; }
@ -7,3 +7,4 @@ public class CursorPagedModel<T>
public string Cursor { get; set; }
public string NextCursor { get; set; }
}
}

5
src/Admin/Models/ErrorViewModel.cs
View File

@ -1,8 +1,9 @@
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class ErrorViewModel
{
public string RequestId { get; set; }
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
}
}

5
src/Admin/Models/HomeModel.cs
View File

@ -1,9 +1,10 @@
using Bit.Core.Settings;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class HomeModel
{
public string CurrentVersion { get; set; }
public GlobalSettings GlobalSettings { get; set; }
}
}

5
src/Admin/Models/LicenseModel.cs
View File

@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class LicenseModel : IValidatableObject
{
[Display(Name = "User Id")]
@ -32,3 +32,4 @@ public class LicenseModel : IValidatableObject
}
}
}
}

5
src/Admin/Models/LogModel.cs
View File

@ -1,8 +1,8 @@
using Microsoft.Azure.Documents;
using Newtonsoft.Json.Linq;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class LogModel : Resource
{
public long EventIdHash { get; set; }
@ -52,3 +52,4 @@ public class LogDetailsModel : LogModel
return val;
}
}
}

5
src/Admin/Models/LoginModel.cs
View File

@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class LoginModel
{
[Required]
@ -11,3 +11,4 @@ public class LoginModel
public string Error { get; set; }
public string Success { get; set; }
}
}

5
src/Admin/Models/LogsModel.cs
View File

@ -1,7 +1,7 @@
using Serilog.Events;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class LogsModel : CursorPagedModel<LogModel>
{
public LogEventLevel? Level { get; set; }
@ -9,3 +9,4 @@ public class LogsModel : CursorPagedModel<LogModel>
public DateTime? Start { get; set; }
public DateTime? End { get; set; }
}
}

5
src/Admin/Models/OrganizationEditModel.cs
View File

@ -6,8 +6,8 @@ using Bit.Core.Models.Data.Organizations.OrganizationUsers;
using Bit.Core.Settings;
using Bit.Core.Utilities;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class OrganizationEditModel : OrganizationViewModel
{
public OrganizationEditModel() { }
@ -150,3 +150,4 @@ public class OrganizationEditModel : OrganizationViewModel
return existingOrganization;
}
}
}

5
src/Admin/Models/OrganizationViewModel.cs
View File

@ -2,8 +2,8 @@
using Bit.Core.Enums;
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class OrganizationViewModel
{
public OrganizationViewModel() { }
@ -47,3 +47,4 @@ public class OrganizationViewModel
public int PolicyCount { get; set; }
public bool HasPublicPrivateKeys { get; set; }
}
}

5
src/Admin/Models/OrganizationsModel.cs
View File

@ -1,7 +1,7 @@
using Bit.Core.Entities;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class OrganizationsModel : PagedModel<Organization>
{
public string Name { get; set; }
@ -10,3 +10,4 @@ public class OrganizationsModel : PagedModel<Organization>
public string Action { get; set; }
public bool SelfHosted { get; set; }
}
}

5
src/Admin/Models/PagedModel.cs
View File

@ -1,5 +1,5 @@
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public abstract class PagedModel<T>
{
public List<T> Items { get; set; }
@ -8,3 +8,4 @@ public abstract class PagedModel<T>
public int? PreviousPage => Page < 2 ? (int?)null : Page - 1;
public int? NextPage => Items.Count < Count ? (int?)null : Page + 1;
}
}

5
src/Admin/Models/PromoteAdminModel.cs
View File

@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class PromoteAdminModel
{
[Required]
@ -11,3 +11,4 @@ public class PromoteAdminModel
[Display(Name = "Organization Id")]
public Guid? OrganizationId { get; set; }
}
}

5
src/Admin/Models/ProviderEditModel.cs
View File

@ -2,8 +2,8 @@
using Bit.Core.Entities.Provider;
using Bit.Core.Models.Data;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class ProviderEditModel : ProviderViewModel
{
public ProviderEditModel() { }
@ -31,3 +31,4 @@ public class ProviderEditModel : ProviderViewModel
return existingProvider;
}
}
}

5
src/Admin/Models/ProviderViewModel.cs
View File

@ -2,8 +2,8 @@
using Bit.Core.Enums.Provider;
using Bit.Core.Models.Data;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class ProviderViewModel
{
public ProviderViewModel() { }
@ -22,3 +22,4 @@ public class ProviderViewModel
public IEnumerable<ProviderUserUserDetails> ProviderAdmins { get; set; }
public IEnumerable<ProviderOrganizationOrganizationDetails> ProviderOrganizations { get; set; }
}
}

5
src/Admin/Models/ProvidersModel.cs
View File

@ -1,7 +1,7 @@
using Bit.Core.Entities.Provider;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class ProvidersModel : PagedModel<Provider>
{
public string Name { get; set; }
@ -10,3 +10,4 @@ public class ProvidersModel : PagedModel<Provider>
public string Action { get; set; }
public bool SelfHosted { get; set; }
}
}

5
src/Admin/Models/StripeSubscriptionsModel.cs
View File

@ -1,8 +1,8 @@
using System.ComponentModel.DataAnnotations;
using Bit.Core.Models.BitStripe;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class StripeSubscriptionRowModel
{
public Stripe.Subscription Subscription { get; set; }
@ -40,3 +40,4 @@ public class StripeSubscriptionsModel : IValidatableObject
}
}
}
}

5
src/Admin/Models/TaxRateAddEditModel.cs
View File

@ -1,5 +1,5 @@
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class TaxRateAddEditModel
{
public string StripeTaxRateId { get; set; }
@ -8,3 +8,4 @@ public class TaxRateAddEditModel
public string PostalCode { get; set; }
public decimal Rate { get; set; }
}
}

5
src/Admin/Models/TaxRatesModel.cs
View File

@ -1,8 +1,9 @@
using Bit.Core.Entities;
namespace Bit.Admin.Models;
namespace Bit.Admin.Models
{
public class TaxRatesModel : PagedModel<TaxRate>
{
public string Message { get; set; }
}
}

Some files were not shown because too many files have changed in this diff Show More