Upstream/bitwarden-mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile.git synced 2024-12-27 17:08:00 +01:00
Code Issues Projects Releases Wiki Activity

fix for sso login when bio unlock already enabled (#1086)

Browse Source
This commit is contained in:
Matt Portune 2020-09-23 09:02:20 -04:00 committed by GitHub
parent 74b34661a5
commit 2ddf624f7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/Pages/Accounts/LockPageViewModel.cs
View File

@ -116,7 +116,7 @@ namespace Bit.App.Pages
{ {
_pinSet = await _vaultTimeoutService.IsPinLockSetAsync(); _pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
PinLock = (_pinSet.Item1 && _vaultTimeoutService.PinProtectedKey != null) || _pinSet.Item2; PinLock = (_pinSet.Item1 && _vaultTimeoutService.PinProtectedKey != null) || _pinSet.Item2;
BiometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync(); BiometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _cryptoService.HasKeyAsync();
_email = await _userService.GetEmailAsync(); _email = await _userService.GetEmailAsync();
var webVault = _environmentService.GetWebVaultUrl(); var webVault = _environmentService.GetWebVaultUrl();
if (string.IsNullOrWhiteSpace(webVault)) if (string.IsNullOrWhiteSpace(webVault))

2
src/Core/Services/CryptoService.cs
View File

@ -54,7 +54,7 @@ namespace Bit.Core.Services
// If we have a lock option set, we do not store the key // If we have a lock option set, we do not store the key
return; return;
} }
await _secureStorageService.SaveAsync(Keys_Key, key.KeyB64); await _secureStorageService.SaveAsync(Keys_Key, key?.KeyB64);
} }
public async Task SetKeyHashAsync(string keyHash) public async Task SetKeyHashAsync(string keyHash)