diff --git a/bitwarden_license/src/Sso/Controllers/AccountController.cs b/bitwarden_license/src/Sso/Controllers/AccountController.cs index 11399c7e34..f9bb77837d 100644 --- a/bitwarden_license/src/Sso/Controllers/AccountController.cs +++ b/bitwarden_license/src/Sso/Controllers/AccountController.cs @@ -308,8 +308,8 @@ public class AccountController : Controller await HttpContext.SignOutAsync(); } - // HACK: Temporary workaroud for the time being that doesn't try to sign out of OneLogin schemes, - // which doesnt support SLO + // HACK: Temporary workaround for the time being that doesn't try to sign out of OneLogin schemes, + // which doesn't support SLO if (externalAuthenticationScheme != null && !externalAuthenticationScheme.Contains("onelogin")) { // Build a return URL so the upstream provider will redirect back diff --git a/bitwarden_license/src/Sso/Utilities/ClaimsExtensions.cs b/bitwarden_license/src/Sso/Utilities/ClaimsExtensions.cs index 735c7bc0ad..f82614635c 100644 --- a/bitwarden_license/src/Sso/Utilities/ClaimsExtensions.cs +++ b/bitwarden_license/src/Sso/Utilities/ClaimsExtensions.cs @@ -12,7 +12,7 @@ public static class ClaimsExtensions { var normalizedClaims = claims.Select(c => (Normalize(c.Type), c.Value)).ToList(); - // Order of prescendence is by passed in names + // Order of precedence is by passed in names foreach (var name in possibleNames.Select(Normalize)) { // Second by order of claims (find claim by name) diff --git a/dev/reverse-proxy.conf.example b/dev/reverse-proxy.conf.example index d132bc849f..b9afbc78a0 100644 --- a/dev/reverse-proxy.conf.example +++ b/dev/reverse-proxy.conf.example @@ -26,7 +26,7 @@ upstream identity_loadbalancer { } server { - listen 33756; # The port clients will connect to for the Identiy, must be exposed via Docker + listen 33756; # The port clients will connect to for the Identity, must be exposed via Docker location / { proxy_pass http://identity_loadbalancer; } diff --git a/src/Admin/Controllers/ToolsController.cs b/src/Admin/Controllers/ToolsController.cs index 8cfbe0a3a7..a0c0818325 100644 --- a/src/Admin/Controllers/ToolsController.cs +++ b/src/Admin/Controllers/ToolsController.cs @@ -527,7 +527,7 @@ public class ToolsController : Controller } // This requires a redundant API call to Stripe because of the way they handle pagination. - // The StartingBefore value has to be infered from the list we get, and isn't supplied by Stripe. + // The StartingBefore value has to be inferred from the list we get, and isn't supplied by Stripe. private async Task StripeSubscriptionsGetHasPreviousPage(List subscriptions, StripeSubscriptionListOptions options) { var hasPreviousPage = false; diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs index 8bb861cc27..79648f3358 100644 --- a/src/Core/Services/Implementations/StripePaymentService.cs +++ b/src/Core/Services/Implementations/StripePaymentService.cs @@ -140,7 +140,7 @@ public class StripePaymentService : IPaymentService { Country = taxInfo.BillingAddressCountry, PostalCode = taxInfo.BillingAddressPostalCode, - // Line1 is required in Stripe's API, suggestion in Docs is to use Business Name intead. + // Line1 is required in Stripe's API, suggestion in Docs is to use Business Name instead. Line1 = taxInfo.BillingAddressLine1 ?? string.Empty, Line2 = taxInfo.BillingAddressLine2, City = taxInfo.BillingAddressCity, diff --git a/src/Core/Settings/GlobalSettings.cs b/src/Core/Settings/GlobalSettings.cs index d7ef4aaa0c..a2768458a5 100644 --- a/src/Core/Settings/GlobalSettings.cs +++ b/src/Core/Settings/GlobalSettings.cs @@ -390,7 +390,7 @@ public class GlobalSettings : IGlobalSettings /// /// /// The certificate path and are passed into the . - /// The file format of the certificate may be binary encded (DER) or base64. If the private key is encrypted, provide the password in , + /// The file format of the certificate may be binary encoded (DER) or base64. If the private key is encrypted, provide the password in , /// public string CertificatePath { get; set; } /// diff --git a/src/Core/Utilities/CustomRedisProcessingStrategy.cs b/src/Core/Utilities/CustomRedisProcessingStrategy.cs index e3b4acd68e..fd7cb75ba7 100644 --- a/src/Core/Utilities/CustomRedisProcessingStrategy.cs +++ b/src/Core/Utilities/CustomRedisProcessingStrategy.cs @@ -50,7 +50,7 @@ public class CustomRedisProcessingStrategy : RedisProcessingStrategy return SkipRateLimitResult(); } - // Check if any Redis timeouts have occured recently + // Check if any Redis timeouts have occurred recently if (_memoryCache.TryGetValue(_redisTimeoutCacheKey, out var timeoutCounter)) { // We've exceeded threshold, backoff Redis and skip rate limiting for now diff --git a/src/Core/Utilities/LoggerFactoryExtensions.cs b/src/Core/Utilities/LoggerFactoryExtensions.cs index 145bf5f6c0..25a6f42477 100644 --- a/src/Core/Utilities/LoggerFactoryExtensions.cs +++ b/src/Core/Utilities/LoggerFactoryExtensions.cs @@ -77,7 +77,7 @@ public static class LoggerFactoryExtensions } else if (CoreHelpers.SettingHasValue(globalSettings?.Syslog.Destination)) { - // appending sitename to project name to allow eaiser identification in syslog. + // appending sitename to project name to allow easier identification in syslog. var appName = $"{globalSettings.SiteName}-{globalSettings.ProjectName}"; if (globalSettings.Syslog.Destination.Equals("local", StringComparison.OrdinalIgnoreCase)) { diff --git a/src/Infrastructure.EntityFramework/Repositories/CollectionCipherRepository.cs b/src/Infrastructure.EntityFramework/Repositories/CollectionCipherRepository.cs index 7b41e81b51..b83b9db25f 100644 --- a/src/Infrastructure.EntityFramework/Repositories/CollectionCipherRepository.cs +++ b/src/Infrastructure.EntityFramework/Repositories/CollectionCipherRepository.cs @@ -110,7 +110,7 @@ public class CollectionCipherRepository : BaseEntityFrameworkRepository, ICollec foreach (var requestedCollectionId in collectionIds) { - // I don't totally agree with t.CipherId = cipherId here because that should have been guarenteed by + // I don't totally agree with t.CipherId = cipherId here because that should have been guaranteed by // the WHERE above but the SQL Server CTE has it var existingCollectionCipher = collectionCiphers .FirstOrDefault(t => t.CollectionId == requestedCollectionId && t.CipherId == cipherId); diff --git a/test/Core.Test/Services/HandlebarsMailServiceTests.cs b/test/Core.Test/Services/HandlebarsMailServiceTests.cs index b0d4f7e618..a29e884367 100644 --- a/test/Core.Test/Services/HandlebarsMailServiceTests.cs +++ b/test/Core.Test/Services/HandlebarsMailServiceTests.cs @@ -39,7 +39,7 @@ public class HandlebarsMailServiceTests // This will send all emails to the test email address so that they can be viewed. var namedParameters = new Dictionary<(string, Type), object> { - // TODO: Swith to use env variable + // TODO: Switch to use env variable { ("email", typeof(string)), "test@bitwarden.com" }, { ("user", typeof(User)), new User { diff --git a/test/Infrastructure.EFIntegration.Test/Vault/AutoFixture/CipherFixtures.cs b/test/Infrastructure.EFIntegration.Test/Vault/AutoFixture/CipherFixtures.cs index ebce1e8b5e..245e1dcc5c 100644 --- a/test/Infrastructure.EFIntegration.Test/Vault/AutoFixture/CipherFixtures.cs +++ b/test/Infrastructure.EFIntegration.Test/Vault/AutoFixture/CipherFixtures.cs @@ -37,7 +37,7 @@ internal class CipherBuilder : ISpecimenBuilder .Without(c => c.OrganizationId)); } - // Can't test valid Favorites and Folders without creating those values inide each test, + // Can't test valid Favorites and Folders without creating those values inside each test, // since we won't have any UserIds until the test is running & creating data fixture.Customize(c => c .Without(e => e.Favorites) diff --git a/util/Migrator/DbScripts/2020-10-28_00_UserApiKey.sql b/util/Migrator/DbScripts/2020-10-28_00_UserApiKey.sql index 0b88706613..023b1cb943 100644 --- a/util/Migrator/DbScripts/2020-10-28_00_UserApiKey.sql +++ b/util/Migrator/DbScripts/2020-10-28_00_UserApiKey.sql @@ -55,7 +55,7 @@ WHERE [ApiKey] IS NULL GO --- Change dbo.User.ApiKey to not null to enforece all future users to have one on create +-- Change dbo.User.ApiKey to not null to enforce all future users to have one on create ALTER TABLE [dbo].[User] ALTER COLUMN