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

[PM-1969] Spellcheck other (#2878)

Browse Source 
* Fix typo in error message: 'Unkown' -> 'Unknown'

* Fix typos in error message

* Fix typo in example text: 'licence' -> 'license'

* Fix typo in validation: 'Ooganization' -> 'Organization'

* Fix typo in text string: 'compatibilty' -> 'compatibility'

* Fix typo: 'ProviderDisllowedOrganizationTypes' -> 'ProviderDisallowedOrganizationTypes'

* Fix typo: 'NSubstitueVersion' -> 'NSubstituteVersion'

* Fix typo: 'CreateIntialInvite' -> 'CreateInitialInvite'

* Fix typo: '_queuryScheme' -> '_queryScheme'

* Fix typo: 'GetApplicationCacheServiceBusSubcriptionName' -> 'GetApplicationCacheServiceBusSubscriptionName'

* Fix typo: 'metaDataRespository' -> 'metaDataRepository'

* Fix typo: 'cipherAttachements' -> 'cipherAttachments'

* Fix typo: 'savedEmergencyAccesss' -> 'savedEmergencyAccesses'

* Fix typo: 'owerOrgUser' -> 'ownerOrgUser'

* Fix typo: 'Organiation' -> 'Organization'

* Fix typo: 'extistingUser' -> 'existingUser'

* Fix typo: 'availibleAccess' -> 'availableAccess'

* Fix typo: 'HasEnouphStorage' -> 'HasEnoughStorage'

* Fix typo: 'extistingOrg' -> 'existingOrg'

* Fix typo: 'subcriber' -> 'subscriber'

* Fix typo: 'availibleCollections' -> 'availableCollections'

* Fix typo: 'Succes' -> 'Success'

* Fix typo: 'CreateAsync_UpdateWithCollecitons_Works' -> 'CreateAsync_UpdateWithCollections_Works'

* Fix typo: 'BadInsallationId' -> 'BadInstallationId'

* Fix typo: 'OrgNotFamiles' -> 'OrgNotFamilies'

* Revert "Fix typo: 'Organiation' -> 'Organization'"

This reverts commit 8aadad1c25d853f26ec39029d157ef63e073d3d4.

* Revert "Fix typos in error message"

This reverts commit 81d201fc09ae4274b7fabe8c6fbcdbb91647bac8.

---------

Co-authored-by: Daniel James Smith <djsmith@web.de>
This commit is contained in:
Jim Hays 2023-05-17 06:14:36 -04:00 committed by GitHub
parent 8dda73ae70
commit 8262af3c53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -35,7 +35,7 @@
<!--
NuGet: https://www.nuget.org/packages/NSubstitute/
-->
<NSubstitueVersion>4.3.0</NSubstitueVersion>
<NSubstituteVersion>4.3.0</NSubstituteVersion>
<!--
NuGet: https://www.nuget.org/packages/AutoFixture.Xunit2/
-->

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

@ -17,7 +17,7 @@ namespace Bit.Commercial.Core.Services;
public class ProviderService : IProviderService
{
public static PlanType[] ProviderDisllowedOrganizationTypes = new[] { PlanType.Free, PlanType.FamiliesAnnually, PlanType.FamiliesAnnually2019 };
public static PlanType[] ProviderDisallowedOrganizationTypes = new[] { PlanType.Free, PlanType.FamiliesAnnually, PlanType.FamiliesAnnually2019 };
private readonly IDataProtector _dataProtector;
private readonly IMailService _mailService;
@ -493,7 +493,7 @@ public class ProviderService : IProviderService
private void ThrowOnInvalidPlanType(PlanType requestedType)
{
if (ProviderDisllowedOrganizationTypes.Contains(requestedType))
if (ProviderDisallowedOrganizationTypes.Contains(requestedType))
{
throw new BadRequestException($"Providers cannot manage organizations with the requested plan type ({requestedType}). Only Teams and Enterprise accounts are allowed.");
}

2
bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj
View File

@ -11,7 +11,7 @@
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstitueVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

2
bitwarden_license/test/Scim.Test/Scim.Test.csproj
View File

@ -15,7 +15,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NSubstitute" Version="$(NSubstitueVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
</ItemGroup>
<ItemGroup>

2
dev/secrets.json.example
View File

@ -26,6 +26,6 @@
"id": "<your Installation Id>",
"key": "<your Installation Key>"
},
"licenseDirectory": "<full path to licence directory>"
"licenseDirectory": "<full path to license directory>"
}
}

4
src/Api/Auth/Controllers/TwoFactorController.cs
View File

@ -410,14 +410,14 @@ public class TwoFactorController : Controller
}
}
[Obsolete("Leaving this for backwards compatibilty on clients")]
[Obsolete("Leaving this for backwards compatibility on clients")]
[HttpGet("get-device-verification-settings")]
public Task<DeviceVerificationResponseModel> GetDeviceVerificationSettings()
{
return Task.FromResult(new DeviceVerificationResponseModel(false, false));
}
[Obsolete("Leaving this for backwards compatibilty on clients")]
[Obsolete("Leaving this for backwards compatibility on clients")]
[HttpPut("device-verification-settings")]
public Task<DeviceVerificationResponseModel> PutDeviceVerificationSettings(
[FromBody] DeviceVerificationRequestModel model)

40
src/Api/Auth/Models/Request/TwoFactorRequestModels.cs
View File

@ -17,9 +17,9 @@ public class UpdateTwoFactorAuthenticatorRequestModel : SecretVerificationReques
[StringLength(50)]
public string Key { get; set; }
public User ToUser(User extistingUser)
public User ToUser(User existingUser)
{
var providers = extistingUser.GetTwoFactorProviders();
var providers = existingUser.GetTwoFactorProviders();
if (providers == null)
{
providers = new Dictionary<TwoFactorProviderType, TwoFactorProvider>();
@ -34,8 +34,8 @@ public class UpdateTwoFactorAuthenticatorRequestModel : SecretVerificationReques
MetaData = new Dictionary<string, object> { ["Key"] = Key },
Enabled = true
});
extistingUser.SetTwoFactorProviders(providers);
return extistingUser;
existingUser.SetTwoFactorProviders(providers);
return existingUser;
}
}
@ -51,9 +51,9 @@ public class UpdateTwoFactorDuoRequestModel : SecretVerificationRequestModel, IV
[StringLength(50)]
public string Host { get; set; }
public User ToUser(User extistingUser)
public User ToUser(User existingUser)
{
var providers = extistingUser.GetTwoFactorProviders();
var providers = existingUser.GetTwoFactorProviders();
if (providers == null)
{
providers = new Dictionary<TwoFactorProviderType, TwoFactorProvider>();
@ -73,13 +73,13 @@ public class UpdateTwoFactorDuoRequestModel : SecretVerificationRequestModel, IV
},
Enabled = true
});
extistingUser.SetTwoFactorProviders(providers);
return extistingUser;
existingUser.SetTwoFactorProviders(providers);
return existingUser;
}
public Organization ToOrganization(Organization extistingOrg)
public Organization ToOrganization(Organization existingOrg)
{
var providers = extistingOrg.GetTwoFactorProviders();
var providers = existingOrg.GetTwoFactorProviders();
if (providers == null)
{
providers = new Dictionary<TwoFactorProviderType, TwoFactorProvider>();
@ -99,8 +99,8 @@ public class UpdateTwoFactorDuoRequestModel : SecretVerificationRequestModel, IV
},
Enabled = true
});
extistingOrg.SetTwoFactorProviders(providers);
return extistingOrg;
existingOrg.SetTwoFactorProviders(providers);
return existingOrg;
}
public override IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
@ -122,9 +122,9 @@ public class UpdateTwoFactorYubicoOtpRequestModel : SecretVerificationRequestMod
[Required]
public bool? Nfc { get; set; }
public User ToUser(User extistingUser)
public User ToUser(User existingUser)
{
var providers = extistingUser.GetTwoFactorProviders();
var providers = existingUser.GetTwoFactorProviders();
if (providers == null)
{
providers = new Dictionary<TwoFactorProviderType, TwoFactorProvider>();
@ -147,8 +147,8 @@ public class UpdateTwoFactorYubicoOtpRequestModel : SecretVerificationRequestMod
},
Enabled = true
});
extistingUser.SetTwoFactorProviders(providers);
return extistingUser;
existingUser.SetTwoFactorProviders(providers);
return existingUser;
}
private string FormatKey(string keyValue)
@ -205,9 +205,9 @@ public class TwoFactorEmailRequestModel : SecretVerificationRequestModel
public string AuthRequestId { get; set; }
// An auth session token used for obtaining email and as an authN factor for the sending of emailed 2FA OTPs.
public string SsoEmail2FaSessionToken { get; set; }
public User ToUser(User extistingUser)
public User ToUser(User existingUser)
{
var providers = extistingUser.GetTwoFactorProviders();
var providers = existingUser.GetTwoFactorProviders();
if (providers == null)
{
providers = new Dictionary<TwoFactorProviderType, TwoFactorProvider>();
@ -222,8 +222,8 @@ public class TwoFactorEmailRequestModel : SecretVerificationRequestModel
MetaData = new Dictionary<string, object> { ["Email"] = Email.ToLowerInvariant() },
Enabled = true
});
extistingUser.SetTwoFactorProviders(providers);
return extistingUser;
existingUser.SetTwoFactorProviders(providers);
return existingUser;
}
public override IEnumerable<ValidationResult> Validate(ValidationContext validationContext)

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

@ -101,7 +101,7 @@ public class OrganizationConnectionsController : Controller
case OrganizationConnectionType.Scim:
return await CreateOrUpdateOrganizationConnectionAsync<ScimConfig>(organizationConnectionId, model);
default:
throw new BadRequestException($"Unkown Organization connection Type: {model.Type}");
throw new BadRequestException($"Unknown Organization connection Type: {model.Type}");
}
}
@ -127,7 +127,7 @@ public class OrganizationConnectionsController : Controller
case OrganizationConnectionType.Scim:
return new OrganizationConnectionResponseModel(connection, typeof(ScimConfig));
default:
throw new BadRequestException($"Unkown Organization connection Type: {type}");
throw new BadRequestException($"Unknown Organization connection Type: {type}");
}
}

2
src/Api/Controllers/ProviderUsersController.cs
View File

@ -65,7 +65,7 @@ public class ProviderUsersController : Controller
throw new NotFoundException();
}
var invite = ProviderUserInviteFactory.CreateIntialInvite(model.Emails, model.Type.Value,
var invite = ProviderUserInviteFactory.CreateInitialInvite(model.Emails, model.Type.Value,
_userService.GetProperUserId(User).Value, providerId);
await _providerService.InviteUserAsync(invite);
}

2
src/Api/Models/Request/BitPayInvoiceRequestModel.cs
View File

@ -59,7 +59,7 @@ public class BitPayInvoiceRequestModel : IValidatableObject
{
if (!UserId.HasValue && !OrganizationId.HasValue)
{
yield return new ValidationResult("User or Ooganization is required.");
yield return new ValidationResult("User or Organization is required.");
}
}
}

2
src/Api/Models/Request/DeviceVerificationRequestModel.cs
View File

@ -4,7 +4,7 @@ namespace Bit.Api.Models.Request;
public class DeviceVerificationRequestModel
{
[Obsolete("Leaving this for backwards compatibilty on clients")]
[Obsolete("Leaving this for backwards compatibility on clients")]
[Required]
public bool UnknownDeviceVerificationEnabled { get; set; }
}

2
src/Api/Models/Response/DeviceVerificationResponseModel.cs
View File

@ -2,7 +2,7 @@
namespace Bit.Api.Models.Response;
[Obsolete("Leaving this for backwards compatibilty on clients")]
[Obsolete("Leaving this for backwards compatibility on clients")]
public class DeviceVerificationResponseModel : ResponseModel
{
public DeviceVerificationResponseModel(bool isDeviceVerificationSectionEnabled, bool unknownDeviceVerificationEnabled)

4
src/Core/Auth/IdentityServer/TokenRetrieval.cs
View File

@ -5,7 +5,7 @@ namespace Bit.Core.Auth.IdentityServer;
public static class TokenRetrieval
{
private static string _headerScheme = "Bearer ";
private static string _queuryScheme = "access_token";
private static string _queryScheme = "access_token";
private static string _authHeader = "Authorization";
public static Func<HttpRequest, string> FromAuthorizationHeaderOrQueryString()
@ -15,7 +15,7 @@ public static class TokenRetrieval
var authorization = request.Headers[_authHeader].FirstOrDefault();
if (string.IsNullOrWhiteSpace(authorization))
{
return request.Query[_queuryScheme].FirstOrDefault();
return request.Query[_queryScheme].FirstOrDefault();
}
if (authorization.StartsWith(_headerScheme, StringComparison.OrdinalIgnoreCase))

10
src/Core/Auth/Services/Implementations/EmergencyAccessService.cs
View File

@ -418,11 +418,11 @@ public class EmergencyAccessService : IEmergencyAccessService
return string.IsNullOrWhiteSpace(user.Name) ? user.Email : user.Name;
}
private bool IsValidRequest(EmergencyAccess availibleAccess, User requestingUser, EmergencyAccessType requestedAccessType)
private bool IsValidRequest(EmergencyAccess availableAccess, User requestingUser, EmergencyAccessType requestedAccessType)
{
return availibleAccess != null &&
availibleAccess.GranteeId == requestingUser.Id &&
availibleAccess.Status == EmergencyAccessStatusType.RecoveryApproved &&
availibleAccess.Type == requestedAccessType;
return availableAccess != null &&
availableAccess.GranteeId == requestingUser.Id &&
availableAccess.Status == EmergencyAccessStatusType.RecoveryApproved &&
availableAccess.Type == requestedAccessType;
}
}

2
src/Core/HostedServices/ApplicationCacheHostedService.cs
View File

@ -27,7 +27,7 @@ public class ApplicationCacheHostedService : IHostedService, IDisposable
GlobalSettings globalSettings)
{
_topicName = globalSettings.ServiceBus.ApplicationCacheTopicName;
_subName = CoreHelpers.GetApplicationCacheServiceBusSubcriptionName(globalSettings);
_subName = CoreHelpers.GetApplicationCacheServiceBusSubscriptionName(globalSettings);
_applicationCacheService = applicationCacheService as InMemoryServiceBusApplicationCacheService;
_organizationRepository = organizationRepository;
_logger = logger;

2
src/Core/Models/Business/Provider/ProviderUserInvite.cs
View File

@ -12,7 +12,7 @@ public class ProviderUserInvite<T>
public static class ProviderUserInviteFactory
{
public static ProviderUserInvite<string> CreateIntialInvite(IEnumerable<string> inviteeEmails, ProviderUserType type, Guid invitingUserId, Guid providerId)
public static ProviderUserInvite<string> CreateInitialInvite(IEnumerable<string> inviteeEmails, ProviderUserType type, Guid invitingUserId, Guid providerId)
{
return new ProviderUserInvite<string>
{

10
src/Core/Services/Implementations/AppleIapService.cs
View File

@ -15,18 +15,18 @@ public class AppleIapService : IAppleIapService
private readonly GlobalSettings _globalSettings;
private readonly IWebHostEnvironment _hostingEnvironment;
private readonly IMetaDataRepository _metaDataRespository;
private readonly IMetaDataRepository _metaDataRepository;
private readonly ILogger<AppleIapService> _logger;
public AppleIapService(
GlobalSettings globalSettings,
IWebHostEnvironment hostingEnvironment,
IMetaDataRepository metaDataRespository,
IMetaDataRepository metaDataRepository,
ILogger<AppleIapService> logger)
{
_globalSettings = globalSettings;
_hostingEnvironment = hostingEnvironment;
_metaDataRespository = metaDataRespository;
_metaDataRepository = metaDataRepository;
_logger = logger;
}
@ -61,7 +61,7 @@ public class AppleIapService : IAppleIapService
{
throw new Exception("OriginalTransactionId is null");
}
await _metaDataRespository.UpsertAsync("AppleReceipt", originalTransactionId,
await _metaDataRepository.UpsertAsync("AppleReceipt", originalTransactionId,
new Dictionary<string, string>
{
["Data"] = receiptStatus.GetReceiptData(),
@ -71,7 +71,7 @@ public class AppleIapService : IAppleIapService
public async Task<Tuple<string, Guid?>> GetReceiptAsync(string originalTransactionId)
{
var receipt = await _metaDataRespository.GetAsync("AppleReceipt", originalTransactionId);
var receipt = await _metaDataRepository.GetAsync("AppleReceipt", originalTransactionId);
if (receipt == null)
{
return null;

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

@ -18,7 +18,7 @@ public class InMemoryServiceBusApplicationCacheService : InMemoryApplicationCach
GlobalSettings globalSettings)
: base(organizationRepository, providerRepository)
{
_subName = CoreHelpers.GetApplicationCacheServiceBusSubcriptionName(globalSettings);
_subName = CoreHelpers.GetApplicationCacheServiceBusSubscriptionName(globalSettings);
_topicClient = new TopicClient(globalSettings.ServiceBus.ConnectionString,
globalSettings.ServiceBus.ApplicationCacheTopicName);
}

10
src/Core/Services/Implementations/StripePaymentService.cs
View File

@ -527,7 +527,7 @@ public class StripePaymentService : IPaymentService
}
}
private async Task<Stripe.Subscription> ChargeForNewSubscriptionAsync(ISubscriber subcriber, Stripe.Customer customer,
private async Task<Stripe.Subscription> ChargeForNewSubscriptionAsync(ISubscriber subscriber, Stripe.Customer customer,
bool createdStripeCustomer, bool stripePaymentMethod, PaymentMethodType paymentMethodType,
Stripe.SubscriptionCreateOptions subCreateOptions, Braintree.Customer braintreeCustomer)
{
@ -556,7 +556,7 @@ public class StripePaymentService : IPaymentService
customer.Metadata.ContainsKey("btCustomerId") ? customer.Metadata["btCustomerId"] : null;
if (!string.IsNullOrWhiteSpace(appleReceiptOrigTransactionId))
{
if (!subcriber.IsUser())
if (!subscriber.IsUser())
{
throw new GatewayException("In-app purchase is only allowed for users.");
}
@ -577,7 +577,7 @@ public class StripePaymentService : IPaymentService
if (existingTransaction == null)
{
appleTransaction = verifiedAppleReceipt.BuildTransactionFromLastTransaction(
PremiumPlanAppleIapPrice, subcriber.Id);
PremiumPlanAppleIapPrice, subscriber.Id);
appleTransaction.Type = TransactionType.Charge;
await _transactionRepository.CreateAsync(appleTransaction);
}
@ -595,12 +595,12 @@ public class StripePaymentService : IPaymentService
SubmitForSettlement = true,
PayPal = new Braintree.TransactionOptionsPayPalRequest
{
CustomField = $"{subcriber.BraintreeIdField()}:{subcriber.Id}"
CustomField = $"{subscriber.BraintreeIdField()}:{subscriber.Id}"
}
},
CustomFields = new Dictionary<string, string>
{
[subcriber.BraintreeIdField()] = subcriber.Id.ToString()
[subscriber.BraintreeIdField()] = subscriber.Id.ToString()
}
});

2
src/Core/Utilities/CoreHelpers.cs
View File

@ -526,7 +526,7 @@ public static class CoreHelpers
return !invalid;
}
public static string GetApplicationCacheServiceBusSubcriptionName(GlobalSettings globalSettings)
public static string GetApplicationCacheServiceBusSubscriptionName(GlobalSettings globalSettings)
{
var subName = globalSettings.ServiceBus.ApplicationCacheSubscriptionName;
if (string.IsNullOrWhiteSpace(subName))

8
src/Infrastructure.EntityFramework/Repositories/CollectionCipherRepository.cs
View File

@ -181,7 +181,7 @@ public class CollectionCipherRepository : BaseEntityFrameworkRepository, ICollec
using (var scope = ServiceScopeFactory.CreateScope())
{
var dbContext = GetDatabaseContext(scope);
var availibleCollections = from c in dbContext.Collections
var availableCollections = from c in dbContext.Collections
join o in dbContext.Organizations
on c.OrganizationId equals o.Id
join ou in dbContext.OrganizationUsers
@ -205,15 +205,15 @@ public class CollectionCipherRepository : BaseEntityFrameworkRepository, ICollec
(o.Id == organizationId && o.Enabled && ou.Status == OrganizationUserStatusType.Confirmed &&
(ou.AccessAll || !cu.ReadOnly || g.AccessAll || !cg.ReadOnly))
select new { c, o, ou, cu, gu, g, cg };
var count = await availibleCollections.CountAsync();
if (await availibleCollections.CountAsync() < 1)
var count = await availableCollections.CountAsync();
if (await availableCollections.CountAsync() < 1)
{
return;
}
var insertData = from collectionId in collectionIds
from cipherId in cipherIds
where availibleCollections.Select(x => x.c.Id).Contains(collectionId)
where availableCollections.Select(x => x.c.Id).Contains(collectionId)
select new Models.CollectionCipher
{
CollectionId = collectionId,

4
src/Infrastructure.EntityFramework/Repositories/GroupRepository.cs
View File

@ -19,11 +19,11 @@ public class GroupRepository : Repository<Core.Entities.Group, Group, Guid>, IGr
using (var scope = ServiceScopeFactory.CreateScope())
{
var dbContext = GetDatabaseContext(scope);
var availibleCollections = await (
var availableCollections = await (
from c in dbContext.Collections
where c.OrganizationId == grp.OrganizationId
select c).ToListAsync();
var filteredCollections = collections.Where(c => availibleCollections.Any(a => c.Id == a.Id));
var filteredCollections = collections.Where(c => availableCollections.Any(a => c.Id == a.Id));
var collectionGroups = filteredCollections.Select(y => new CollectionGroup
{
CollectionId = y.Id,

4
src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs
View File

@ -22,11 +22,11 @@ public class OrganizationUserRepository : Repository<Core.Entities.OrganizationU
using (var scope = ServiceScopeFactory.CreateScope())
{
var dbContext = GetDatabaseContext(scope);
var availibleCollections = await (
var availableCollections = await (
from c in dbContext.Collections
where c.OrganizationId == organizationUser.OrganizationId
select c).ToListAsync();
var filteredCollections = collections.Where(c => availibleCollections.Any(a => c.Id == a.Id));
var filteredCollections = collections.Where(c => availableCollections.Any(a => c.Id == a.Id));
var collectionUsers = filteredCollections.Select(y => new CollectionUser
{
CollectionId = y.Id,

8
test/Api.IntegrationTest/SecretsManager/Controllers/AccessPoliciesControllerTests.cs
View File

@ -794,7 +794,7 @@ public class AccessPoliciesControllerTests : IClassFixture<ApiApplicationFactory
[InlineData(PermissionType.RunAsUserWithPermission)]
public async Task GetServiceAccountAccessPolicies(PermissionType permissionType)
{
var (org, owerOrgUser) = await _organizationHelper.Initialize(true, true);
var (org, ownerOrgUser) = await _organizationHelper.Initialize(true, true);
await LoginAsync(_email);
var initData = await SetupAccessPolicyRequest(org.Id);
@ -820,7 +820,7 @@ public class AccessPoliciesControllerTests : IClassFixture<ApiApplicationFactory
new UserServiceAccountAccessPolicy
{
GrantedServiceAccountId = initData.ServiceAccountId,
OrganizationUserId = owerOrgUser.Id,
OrganizationUserId = ownerOrgUser.Id,
Read = true,
Write = true,
},
@ -834,8 +834,8 @@ public class AccessPoliciesControllerTests : IClassFixture<ApiApplicationFactory
Assert.NotNull(result?.UserAccessPolicies);
Assert.NotEmpty(result!.UserAccessPolicies);
Assert.Equal(owerOrgUser.Id,
result.UserAccessPolicies.First(x => x.OrganizationUserId == owerOrgUser.Id).OrganizationUserId);
Assert.Equal(ownerOrgUser.Id,
result.UserAccessPolicies.First(x => x.OrganizationUserId == ownerOrgUser.Id).OrganizationUserId);
}
[Theory]

2
test/Api.Test/Api.Test.csproj
View File

@ -10,7 +10,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstitueVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
<PrivateAssets>all</PrivateAssets>

2
test/Billing.Test/Billing.Test.csproj
View File

@ -16,7 +16,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="AutoFixture.Xunit2" Version="$(AutoFixtureXUnit2Version)" />
<PackageReference Include="NSubstitute" Version="$(NSubstitueVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
</ItemGroup>
<ItemGroup>

2
test/Common/Common.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NSubstitute" Version="$(NSubstitueVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
<PrivateAssets>all</PrivateAssets>

2
test/Core.Test/Core.Test.csproj
View File

@ -10,7 +10,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
<PackageReference Include="Moq" Version="4.17.2" />
<PackageReference Include="NSubstitute" Version="$(NSubstitueVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
<PrivateAssets>all</PrivateAssets>

2
test/Core.Test/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommandTests.cs
View File

@ -65,7 +65,7 @@ public class SetUpSponsorshipCommandTests : FamiliesForEnterpriseTestsBase
[Theory]
[BitMemberAutoData(nameof(NonFamiliesPlanTypes))]
public async Task SetUpSponsorship_OrgNotFamiles_ThrowsBadRequest(PlanType planType,
public async Task SetUpSponsorship_OrgNotFamilies_ThrowsBadRequest(PlanType planType,
OrganizationSponsorship sponsorship, Organization org,
SutProvider<SetUpSponsorshipCommand> sutProvider)
{

6
test/Core.Test/Services/LocalAttachmentStorageServiceTests.cs
View File

@ -183,12 +183,12 @@ public class LocalAttachmentStorageServiceTests
[Theory, BitAutoData]
[UserCipherCustomize]
public async Task UserCipher_DeleteAttachmentsForCipherAsync_Succes(Cipher cipher) => await DeleteAttachmentsForCipherAsync_Succes(cipher);
public async Task UserCipher_DeleteAttachmentsForCipherAsync_Success(Cipher cipher) => await DeleteAttachmentsForCipherAsync_Success(cipher);
[Theory, BitAutoData]
[OrganizationCipherCustomize]
public async Task OrganizationCipher_DeleteAttachmentsForCipherAsync_Succes(Cipher cipher) => await DeleteAttachmentsForCipherAsync_Succes(cipher);
public async Task OrganizationCipher_DeleteAttachmentsForCipherAsync_Success(Cipher cipher) => await DeleteAttachmentsForCipherAsync_Success(cipher);
private async Task DeleteAttachmentsForCipherAsync_Succes(Cipher cipher)
private async Task DeleteAttachmentsForCipherAsync_Success(Cipher cipher)
{
using (var tempDirectory = new TempDirectory())
{

4
test/Core.Test/Tools/Services/SendServiceTests.cs
View File

@ -429,7 +429,7 @@ public class SendServiceTests
[Theory]
[BitAutoData]
public async void SaveFileSendAsync_HasEnouphStorage_Success(SutProvider<SendService> sutProvider,
public async void SaveFileSendAsync_HasEnoughStorage_Success(SutProvider<SendService> sutProvider,
Send send)
{
var user = new User
@ -483,7 +483,7 @@ public class SendServiceTests
[Theory]
[BitAutoData]
public async void SaveFileSendAsync_HasEnouphStorage_SendFileThrows_CleansUp(SutProvider<SendService> sutProvider,
public async void SaveFileSendAsync_HasEnoughStorage_SendFileThrows_CleansUp(SutProvider<SendService> sutProvider,
Send send)
{
var user = new User

2
test/Icons.Test/Icons.Test.csproj
View File

@ -10,7 +10,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstitueVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

2
test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
View File

@ -450,7 +450,7 @@ public class IdentityServerTests : IClassFixture<IdentityApplicationFactory>
}
[Fact]
public async Task TokenEndpoint_GrantTypeClientCredentials_AsInstallation_BadInsallationId_Fails()
public async Task TokenEndpoint_GrantTypeClientCredentials_AsInstallation_BadInstallationId_Fails()
{
var context = await _factory.Server.PostAsync("/connect/token", new FormUrlEncodedContent(new Dictionary<string, string>
{

2
test/Identity.IntegrationTest/Identity.IntegrationTest.csproj
View File

@ -11,7 +11,7 @@
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstitueVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
<PrivateAssets>all</PrivateAssets>

2
test/Identity.Test/Identity.Test.csproj
View File

@ -11,7 +11,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstitueVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
<PrivateAssets>all</PrivateAssets>

8
test/Infrastructure.EFIntegration.Test/Auth/Repositories/EmergencyAccessRepositoryTests.cs
View File

@ -24,7 +24,7 @@ public class EmergencyAccessRepositoryTests
SqlRepo.UserRepository sqlUserRepo
)
{
var savedEmergencyAccesss = new List<EmergencyAccess>();
var savedEmergencyAccesses = new List<EmergencyAccess>();
foreach (var sut in suts)
{
var i = suts.IndexOf(sut);
@ -41,7 +41,7 @@ public class EmergencyAccessRepositoryTests
sut.ClearChangeTracking();
var savedEmergencyAccess = await sut.GetByIdAsync(postEfEmergencyAccess.Id);
savedEmergencyAccesss.Add(savedEmergencyAccess);
savedEmergencyAccesses.Add(savedEmergencyAccess);
}
for (int j = 0; j < users.Count; j++)
@ -53,9 +53,9 @@ public class EmergencyAccessRepositoryTests
emergencyAccess.GranteeId = users[0].Id;
var sqlEmergencyAccess = await sqlEmergencyAccessRepo.CreateAsync(emergencyAccess);
var savedSqlEmergencyAccess = await sqlEmergencyAccessRepo.GetByIdAsync(sqlEmergencyAccess.Id);
savedEmergencyAccesss.Add(savedSqlEmergencyAccess);
savedEmergencyAccesses.Add(savedSqlEmergencyAccess);
var distinctItems = savedEmergencyAccesss.Distinct(equalityComparer);
var distinctItems = savedEmergencyAccesses.Distinct(equalityComparer);
Assert.True(!distinctItems.Skip(1).Any());
}
}

2
test/Infrastructure.EFIntegration.Test/Infrastructure.EFIntegration.Test.csproj
View File

@ -9,7 +9,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
<PackageReference Include="Moq" Version="4.17.2" />
<PackageReference Include="NSubstitute" Version="$(NSubstitueVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
<PrivateAssets>all</PrivateAssets>

8
test/Infrastructure.EFIntegration.Test/Vault/AutoFixture/CipherFixtures.cs
View File

@ -52,9 +52,9 @@ internal class CipherBuilder : ISpecimenBuilder
{
var obj = fixture.WithAutoNSubstitutions().Create<Cipher>();
var cipherData = fixture.WithAutoNSubstitutions().Create<CipherLoginData>();
var cipherAttachements = fixture.WithAutoNSubstitutions().Create<List<CipherAttachment>>();
var cipherAttachments = fixture.WithAutoNSubstitutions().Create<List<CipherAttachment>>();
obj.Data = JsonSerializer.Serialize(cipherData, serializerOptions);
obj.Attachments = JsonSerializer.Serialize(cipherAttachements, serializerOptions);
obj.Attachments = JsonSerializer.Serialize(cipherAttachments, serializerOptions);
return obj;
}
@ -64,9 +64,9 @@ internal class CipherBuilder : ISpecimenBuilder
for (var i = 0; i < ciphers.Count(); i++)
{
var cipherData = fixture.WithAutoNSubstitutions().Create<CipherLoginData>();
var cipherAttachements = fixture.WithAutoNSubstitutions().Create<List<CipherAttachment>>();
var cipherAttachments = fixture.WithAutoNSubstitutions().Create<List<CipherAttachment>>();
ciphers[i].Data = JsonSerializer.Serialize(cipherData, serializerOptions);
ciphers[i].Attachments = JsonSerializer.Serialize(cipherAttachements, serializerOptions);
ciphers[i].Attachments = JsonSerializer.Serialize(cipherAttachments, serializerOptions);
}
return ciphers;

2
test/Infrastructure.IntegrationTest/Vault/Repositories/CipherRepositoryTests.cs
View File

@ -43,7 +43,7 @@ public class CipherRepositoryTests
}
[DatabaseTheory, DatabaseData]
public async Task CreateAsync_UpdateWithCollecitons_Works(
public async Task CreateAsync_UpdateWithCollections_Works(
IUserRepository userRepository,
IOrganizationRepository organizationRepository,
IOrganizationUserRepository organizationUserRepository,