nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 13:08:17 -05:00
Code

Fixed various typos. (#378)

Browse Source
This commit is contained in:
SoulSeekkor 2018-10-18 10:41:49 -05:00 committed by Kyle Spearrin
parent 45a77c8903
commit 976869c968
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Services/Implementations/LicensingService.cs
View File

@ -69,7 +69,7 @@ namespace Bit.Core.Services
foreach(var org in enabledOrgs) foreach(var org in enabledOrgs)
{ {
var license = ReadOrganiztionLicense(org); var license = ReadOrganizationLicense(org);
if(license == null) if(license == null)
{ {
await DisableOrganizationAsync(org, null, "No license file."); await DisableOrganizationAsync(org, null, "No license file.");
@ -221,7 +221,7 @@ namespace Bit.Core.Services
return JsonConvert.DeserializeObject<UserLicense>(data); return JsonConvert.DeserializeObject<UserLicense>(data);
} }
private OrganizationLicense ReadOrganiztionLicense(Organization organization) private OrganizationLicense ReadOrganizationLicense(Organization organization)
{ {
var filePath = $"{_globalSettings.LicenseDirectory}/organization/{organization.Id}.json"; var filePath = $"{_globalSettings.LicenseDirectory}/organization/{organization.Id}.json";
if(!File.Exists(filePath)) if(!File.Exists(filePath))

4
util/Setup/Context.cs
View File

@ -26,7 +26,7 @@ namespace Bit.Setup
Console.WriteLine("No existing `config.yml` detected. Let's generate one."); Console.WriteLine("No existing `config.yml` detected. Let's generate one.");
// Looks like updating from older version. Try to create config file. // 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)) if(!Uri.TryCreate(url, UriKind.Absolute, out var uri))
{ {
Console.WriteLine("Unable to determine existing installation url."); Console.WriteLine("Unable to determine existing installation url.");
@ -34,7 +34,7 @@ namespace Bit.Setup
} }
Config.Url = url; Config.Url = url;
var push = Helpers.GetValueFronEnvFile("global", "globalSettings__pushRelayBaseUri"); var push = Helpers.GetValueFromEnvFile("global", "globalSettings__pushRelayBaseUri");
Config.PushNotifications = push != "REPLACE"; Config.PushNotifications = push != "REPLACE";
var composeFile = "/bitwarden/docker/docker-compose.yml"; var composeFile = "/bitwarden/docker/docker-compose.yml";

2
util/Setup/Helpers.cs
View File

@ -111,7 +111,7 @@ namespace Bit.Setup
return builder.ConnectionString; 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")) if(!File.Exists($"/bitwarden/env/{envFile}.override.env"))
{ {

2
util/Setup/Program.cs
View File

@ -146,7 +146,7 @@ namespace Bit.Setup
{ {
Console.WriteLine("Migrating database."); Console.WriteLine("Migrating database.");
var dbPass = Helpers.GetValueFronEnvFile("mssql", "SA_PASSWORD"); var dbPass = Helpers.GetValueFromEnvFile("mssql", "SA_PASSWORD");
var masterConnectionString = Helpers.MakeSqlConnectionString( var masterConnectionString = Helpers.MakeSqlConnectionString(
"mssql", "master", "sa", dbPass ?? string.Empty); "mssql", "master", "sa", dbPass ?? string.Empty);
var vaultConnectionString = Helpers.MakeSqlConnectionString( var vaultConnectionString = Helpers.MakeSqlConnectionString(