diff --git a/src/Core/Services/Implementations/LicensingService.cs b/src/Core/Services/Implementations/LicensingService.cs index 16dff8b003..83a2dabc1e 100644 --- a/src/Core/Services/Implementations/LicensingService.cs +++ b/src/Core/Services/Implementations/LicensingService.cs @@ -69,7 +69,7 @@ namespace Bit.Core.Services foreach(var org in enabledOrgs) { - var license = ReadOrganiztionLicense(org); + var license = ReadOrganizationLicense(org); if(license == null) { await DisableOrganizationAsync(org, null, "No license file."); @@ -221,7 +221,7 @@ namespace Bit.Core.Services return JsonConvert.DeserializeObject(data); } - private OrganizationLicense ReadOrganiztionLicense(Organization organization) + private OrganizationLicense ReadOrganizationLicense(Organization organization) { var filePath = $"{_globalSettings.LicenseDirectory}/organization/{organization.Id}.json"; if(!File.Exists(filePath)) diff --git a/util/Setup/Context.cs b/util/Setup/Context.cs index a96354d5f1..7bc7fd7f36 100644 --- a/util/Setup/Context.cs +++ b/util/Setup/Context.cs @@ -26,7 +26,7 @@ namespace Bit.Setup Console.WriteLine("No existing `config.yml` detected. Let's generate one."); // Looks like updating from older version. Try to create config file. - var url = Helpers.GetValueFronEnvFile("global", "globalSettings__baseServiceUri__vault"); + var url = Helpers.GetValueFromEnvFile("global", "globalSettings__baseServiceUri__vault"); if(!Uri.TryCreate(url, UriKind.Absolute, out var uri)) { Console.WriteLine("Unable to determine existing installation url."); @@ -34,7 +34,7 @@ namespace Bit.Setup } Config.Url = url; - var push = Helpers.GetValueFronEnvFile("global", "globalSettings__pushRelayBaseUri"); + var push = Helpers.GetValueFromEnvFile("global", "globalSettings__pushRelayBaseUri"); Config.PushNotifications = push != "REPLACE"; var composeFile = "/bitwarden/docker/docker-compose.yml"; diff --git a/util/Setup/Helpers.cs b/util/Setup/Helpers.cs index 41525a4a27..43770aa1ef 100644 --- a/util/Setup/Helpers.cs +++ b/util/Setup/Helpers.cs @@ -111,7 +111,7 @@ namespace Bit.Setup return builder.ConnectionString; } - public static string GetValueFronEnvFile(string envFile, string key) + public static string GetValueFromEnvFile(string envFile, string key) { if(!File.Exists($"/bitwarden/env/{envFile}.override.env")) { diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs index f4168dc7c3..4042d9b437 100644 --- a/util/Setup/Program.cs +++ b/util/Setup/Program.cs @@ -146,7 +146,7 @@ namespace Bit.Setup { Console.WriteLine("Migrating database."); - var dbPass = Helpers.GetValueFronEnvFile("mssql", "SA_PASSWORD"); + var dbPass = Helpers.GetValueFromEnvFile("mssql", "SA_PASSWORD"); var masterConnectionString = Helpers.MakeSqlConnectionString( "mssql", "master", "sa", dbPass ?? string.Empty); var vaultConnectionString = Helpers.MakeSqlConnectionString(