1
0
mirror of https://github.com/bitwarden/mobile synced 2026-01-19 08:53:17 +00:00

Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options

# Conflicts:
#	src/Core/Models/Response/DeviceResponse.cs
#	src/Core/Services/ApiService.cs
This commit is contained in:
André Bispo
2023-07-10 12:32:27 +01:00
13 changed files with 161 additions and 30 deletions

View File

@@ -9,6 +9,7 @@ using Bit.Core.Enums;
using Bit.Core.Models.Request;
using Bit.Core.Utilities;
using Xamarin.CommunityToolkit.ObjectModel;
using Xamarin.Essentials;
namespace Bit.App.Pages
{
@@ -19,6 +20,7 @@ namespace Bit.App.Pages
private bool _requestAdminApprovalEnabled;
private bool _approveWithMasterPasswordEnabled;
private bool _continueEnabled;
private string _email;
private readonly IStateService _stateService;
private readonly IApiService _apiService;
@@ -52,6 +54,8 @@ namespace Bit.App.Pages
allowsMultipleExecutions: false);
}
public string LoggingInAsText => string.Format(AppResources.LoggingInAsX, Email);
public bool RememberThisDevice
{
get => _rememberThisDevice;
@@ -82,6 +86,15 @@ namespace Bit.App.Pages
set => SetProperty(ref _continueEnabled, value);
}
public string Email
{
get => _email;
set => SetProperty(ref _email, value, additionalPropertyNames:
new string[] {
nameof(LoggingInAsText)
});
}
public async Task InitAsync()
{
// Appears if the browser is trusted and shared the key with the app

View File

@@ -3631,6 +3631,15 @@ namespace Bit.App.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Logging in as {0}.
/// </summary>
public static string LoggingInAsX {
get {
return ResourceManager.GetString("LoggingInAsX", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Logging in as {0} on {1}.
/// </summary>

View File

@@ -2661,4 +2661,7 @@ Do you want to switch to this account?</value>
<data name="InvalidAPIToken" xml:space="preserve">
<value>Invalid API token</value>
</data>
<data name="LoggingInAsX" xml:space="preserve">
<value>Logging in as {0}</value>
</data>
</root>