From 5932dd99ad28101f2c8c4bd00744b8114f766773 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 28 Aug 2017 18:08:26 -0400 Subject: [PATCH] remove to web vault url --- .../Services/IAppSettingsService.cs | 2 +- src/App/Constants.cs | 2 +- src/App/Pages/EnvironmentPage.cs | 26 +++++++++---------- src/App/Pages/LoginTwoFactorPage.cs | 10 +++---- src/App/Resources/AppResources.Designer.cs | 18 ++++++------- src/App/Resources/AppResources.resx | 4 +-- src/App/Services/AppSettingsService.cs | 8 +++--- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/App/Abstractions/Services/IAppSettingsService.cs b/src/App/Abstractions/Services/IAppSettingsService.cs index dc4c4dab0..2ffd60bd4 100644 --- a/src/App/Abstractions/Services/IAppSettingsService.cs +++ b/src/App/Abstractions/Services/IAppSettingsService.cs @@ -11,7 +11,7 @@ namespace Bit.App.Abstractions bool AutofillPasswordField { get; set; } string SecurityStamp { get; set; } string BaseUrl { get; set; } - string VaultUrl { get; set; } + string WebVaultUrl { get; set; } string ApiUrl { get; set; } string IdentityUrl { get; set; } } diff --git a/src/App/Constants.cs b/src/App/Constants.cs index 8dfeeb6f5..3d06223e4 100644 --- a/src/App/Constants.cs +++ b/src/App/Constants.cs @@ -35,7 +35,7 @@ public const string LastSync = "other:lastSync"; public const string LastBuildKey = "LastBuild"; public const string BaseUrl = "other:baseUrl"; - public const string VaultUrl = "other:vaultUrl"; + public const string WebVaultUrl = "other:webVaultUrl"; public const string ApiUrl = "other:apiUrl"; public const string IdentityUrl = "other:identityUrl"; diff --git a/src/App/Pages/EnvironmentPage.cs b/src/App/Pages/EnvironmentPage.cs index 35858c578..a0995644e 100644 --- a/src/App/Pages/EnvironmentPage.cs +++ b/src/App/Pages/EnvironmentPage.cs @@ -26,7 +26,7 @@ namespace Bit.App.Pages } public FormEntryCell BaseUrlCell { get; set; } - public FormEntryCell VaultUrlCell { get; set; } + public FormEntryCell WebVaultUrlCell { get; set; } public FormEntryCell ApiUrlCell { get; set; } public FormEntryCell IdentityUrlCell { get; set; } public StackLayout StackLayout { get; set; } @@ -41,9 +41,9 @@ namespace Bit.App.Pages IdentityUrlCell.Entry.Text = _appSettings.IdentityUrl; ApiUrlCell = new FormEntryCell(AppResources.ApiUrl, nextElement: IdentityUrlCell.Entry, entryKeyboard: Keyboard.Url); ApiUrlCell.Entry.Text = _appSettings.ApiUrl; - VaultUrlCell = new FormEntryCell(AppResources.VaultUrl, nextElement: ApiUrlCell.Entry, entryKeyboard: Keyboard.Url); - VaultUrlCell.Entry.Text = _appSettings.VaultUrl; - BaseUrlCell = new FormEntryCell(AppResources.ServerUrl, nextElement: VaultUrlCell.Entry, entryKeyboard: Keyboard.Url); + WebVaultUrlCell = new FormEntryCell(AppResources.WebVaultUrl, nextElement: ApiUrlCell.Entry, entryKeyboard: Keyboard.Url); + WebVaultUrlCell.Entry.Text = _appSettings.WebVaultUrl; + BaseUrlCell = new FormEntryCell(AppResources.ServerUrl, nextElement: WebVaultUrlCell.Entry, entryKeyboard: Keyboard.Url); BaseUrlCell.Entry.Text = _appSettings.BaseUrl; var table = new FormTableView @@ -72,7 +72,7 @@ namespace Bit.App.Pages { new TableSection(AppResources.CustomEnvironment) { - VaultUrlCell, + WebVaultUrlCell, ApiUrlCell, IdentityUrlCell } @@ -124,7 +124,7 @@ namespace Bit.App.Pages BaseUrlCell.InitEvents(); IdentityUrlCell.InitEvents(); ApiUrlCell.InitEvents(); - VaultUrlCell.InitEvents(); + WebVaultUrlCell.InitEvents(); StackLayout.LayoutChanged += Layout_LayoutChanged; BaseUrlCell.Entry.FocusWithDelay(); } @@ -134,7 +134,7 @@ namespace Bit.App.Pages BaseUrlCell.Dispose(); IdentityUrlCell.Dispose(); ApiUrlCell.Dispose(); - VaultUrlCell.Dispose(); + WebVaultUrlCell.Dispose(); StackLayout.LayoutChanged -= Layout_LayoutChanged; } @@ -162,18 +162,18 @@ namespace Bit.App.Pages BaseUrlCell.Entry.Text = null; } - if(!string.IsNullOrWhiteSpace(VaultUrlCell.Entry.Text)) + if(!string.IsNullOrWhiteSpace(WebVaultUrlCell.Entry.Text)) { - VaultUrlCell.Entry.Text = FixUrl(VaultUrlCell.Entry.Text); - if(!Uri.TryCreate(VaultUrlCell.Entry.Text, UriKind.Absolute, out result)) + WebVaultUrlCell.Entry.Text = FixUrl(WebVaultUrlCell.Entry.Text); + if(!Uri.TryCreate(WebVaultUrlCell.Entry.Text, UriKind.Absolute, out result)) { - _userDialogs.Alert(string.Format(AppResources.FormattedIncorrectly, AppResources.VaultUrl)); + _userDialogs.Alert(string.Format(AppResources.FormattedIncorrectly, AppResources.WebVaultUrl)); return; } } else { - VaultUrlCell.Entry.Text = null; + WebVaultUrlCell.Entry.Text = null; } if(!string.IsNullOrWhiteSpace(ApiUrlCell.Entry.Text)) @@ -207,7 +207,7 @@ namespace Bit.App.Pages _appSettings.BaseUrl = BaseUrlCell.Entry.Text; _appSettings.IdentityUrl = IdentityUrlCell.Entry.Text; _appSettings.ApiUrl = ApiUrlCell.Entry.Text; - _appSettings.VaultUrl = VaultUrlCell.Entry.Text; + _appSettings.WebVaultUrl = WebVaultUrlCell.Entry.Text; _userDialogs.Toast(AppResources.EnvironmentSaved); _googleAnalyticsService.TrackAppEvent("SetEnvironmentUrls"); await Navigation.PopForDeviceAsync(); diff --git a/src/App/Pages/LoginTwoFactorPage.cs b/src/App/Pages/LoginTwoFactorPage.cs index 90711d4b8..a2dbd97e6 100644 --- a/src/App/Pages/LoginTwoFactorPage.cs +++ b/src/App/Pages/LoginTwoFactorPage.cs @@ -187,19 +187,19 @@ namespace Bit.App.Pages var host = WebUtility.UrlEncode(duoParams["Host"].ToString()); var req = WebUtility.UrlEncode(duoParams["Signature"].ToString()); - var vaultUrl = "https://vault.bitwarden.com"; + var webVaultUrl = "https://vault.bitwarden.com"; if(!string.IsNullOrWhiteSpace(_appSettingsService.BaseUrl)) { - vaultUrl = _appSettingsService.BaseUrl; + webVaultUrl = _appSettingsService.BaseUrl; } - else if(!string.IsNullOrWhiteSpace(_appSettingsService.VaultUrl)) + else if(!string.IsNullOrWhiteSpace(_appSettingsService.WebVaultUrl)) { - vaultUrl = _appSettingsService.VaultUrl; + webVaultUrl = _appSettingsService.WebVaultUrl; } var webView = new HybridWebView { - Uri = $"{vaultUrl}/duo-connector.html?host={host}&request={req}", + Uri = $"{webVaultUrl}/duo-connector.html?host={host}&request={req}", HorizontalOptions = LayoutOptions.FillAndExpand, VerticalOptions = LayoutOptions.FillAndExpand, MinimumHeightRequest = 400 diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs index 6638d0627..04b2a5593 100644 --- a/src/App/Resources/AppResources.Designer.cs +++ b/src/App/Resources/AppResources.Designer.cs @@ -2392,15 +2392,6 @@ namespace Bit.App.Resources { } } - /// - /// Looks up a localized string similar to Vault Server URL. - /// - public static string VaultUrl { - get { - return ResourceManager.GetString("VaultUrl", resourceCulture); - } - } - /// /// Looks up a localized string similar to Verification Code. /// @@ -2536,6 +2527,15 @@ namespace Bit.App.Resources { } } + /// + /// Looks up a localized string similar to Web Vault Server URL. + /// + public static string WebVaultUrl { + get { + return ResourceManager.GetString("WebVaultUrl", resourceCulture); + } + } + /// /// Looks up a localized string similar to Yes. /// diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx index d2bff3499..81507ccc5 100644 --- a/src/App/Resources/AppResources.resx +++ b/src/App/Resources/AppResources.resx @@ -1024,7 +1024,7 @@ Server URL - - Vault Server URL + + Web Vault Server URL \ No newline at end of file diff --git a/src/App/Services/AppSettingsService.cs b/src/App/Services/AppSettingsService.cs index acf219a3c..6b8f29138 100644 --- a/src/App/Services/AppSettingsService.cs +++ b/src/App/Services/AppSettingsService.cs @@ -104,21 +104,21 @@ namespace Bit.App.Services } } - public string VaultUrl + public string WebVaultUrl { get { - return _settings.GetValueOrDefault(Constants.VaultUrl); + return _settings.GetValueOrDefault(Constants.WebVaultUrl); } set { if(value == null) { - _settings.Remove(Constants.VaultUrl); + _settings.Remove(Constants.WebVaultUrl); return; } - _settings.AddOrUpdateValue(Constants.VaultUrl, value); + _settings.AddOrUpdateValue(Constants.WebVaultUrl, value); } }