bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-16 00:03:22 +00:00
Code Issues Releases Wiki Activity

[PM-2297] code format

Browse Source
This commit is contained in:
André Bispo
2023-07-24 09:39:42 +01:00
parent 661ff3da5c
commit dd2cd0d9df
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Core/Services/AuthService.cs
View File

@@ -490,7 +490,7 @@ namespace Bit.Core.Services
await _cryptoService.SetMasterKeyEncryptedUserKeyAsync(tokenResponse.Key); await _cryptoService.SetMasterKeyEncryptedUserKeyAsync(tokenResponse.Key);
var decryptOptions = await _stateService.GetAccountDecryptionOptions(); var decryptOptions = await _stateService.GetAccountDecryptionOptions();
if (await _deviceTrustCryptoService.IsDeviceTrustedAsync() && decryptOptions?.TrustedDeviceOption != null) if (decryptOptions?.TrustedDeviceOption != null)
{ {
var key = await _deviceTrustCryptoService.DecryptUserKeyWithDeviceKeyAsync(decryptOptions?.TrustedDeviceOption.EncryptedPrivateKey, decryptOptions?.TrustedDeviceOption.EncryptedUserKey); var key = await _deviceTrustCryptoService.DecryptUserKeyWithDeviceKeyAsync(decryptOptions?.TrustedDeviceOption.EncryptedPrivateKey, decryptOptions?.TrustedDeviceOption.EncryptedUserKey);
if (key != null) if (key != null)
@@ -498,14 +498,12 @@ namespace Bit.Core.Services
await _cryptoService.SetUserKeyAsync(key); await _cryptoService.SetUserKeyAsync(key);
} }
} }
else if (!string.IsNullOrEmpty(tokenResponse.KeyConnectorUrl) || !string.IsNullOrEmpty(decryptOptions?.KeyConnectorOption?.KeyConnectorUrl)) else if (masterKey != null &&
(!string.IsNullOrEmpty(tokenResponse.KeyConnectorUrl) || !string.IsNullOrEmpty(decryptOptions?.KeyConnectorOption?.KeyConnectorUrl)))
{ {
if (masterKey != null) await _cryptoService.SetMasterKeyAsync(masterKey);
{ var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
await _cryptoService.SetMasterKeyAsync(masterKey); await _cryptoService.SetUserKeyAsync(userKey);
var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
await _cryptoService.SetUserKeyAsync(userKey);
}
} }
// User doesn't have a key pair yet (old account), let's generate one for them. // User doesn't have a key pair yet (old account), let's generate one for them.

4
src/Core/Services/DeviceTrustCryptoService.cs
View File

@@ -113,8 +113,8 @@ namespace Bit.Core.Services
if (existingDeviceKey == null) if (existingDeviceKey == null)
{ {
// User doesn't have a device key anymore so device is untrusted // User doesn't have a device key anymore so device is untrusted
return null; return null;
} }
// Attempt to decrypt encryptedDevicePrivateKey with device key // Attempt to decrypt encryptedDevicePrivateKey with device key