Upstream
/
bitwarden-mobile
mirror of https://github.com/bitwarden/mobile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merge

This commit is contained in:
Vince Grassia 2024-05-02 18:47:26 -04:00
parent 057ba53d6c
commit 1f2c126e4b
No known key found for this signature in database
GPG Key ID: 9AD7505E8448CC08
8 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Android/MainApplication.cs
View File

@ -159,11 +159,7 @@ namespace Bit.Droid
var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
var cryptoService = new CryptoService(stateService, cryptoFunctionService);
var biometricService = new BiometricService(stateService, cryptoService);
<<<<<<< HEAD
var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);
=======
var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService, stateService);
>>>>>>> v2023.9.0
ServiceContainer.Register<ISynchronousStorageService>(preferencesStorage);
ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);

4
src/Android/Properties/AndroidManifest.xml
View File

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.8.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
=======
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.9.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
>>>>>>> v2023.9.0
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.NFC" />

6
src/App/Pages/Accounts/LoginSsoPageViewModel.cs
View File

@ -146,18 +146,12 @@ namespace Bit.App.Pages
"ssoToken=" + Uri.EscapeDataString(ssoToken);
WebAuthenticatorResult authResult = null;
<<<<<<< HEAD
authResult = await WebAuthenticator.AuthenticateAsync(new Uri(url),
new Uri(REDIRECT_URI));
=======
authResult = await WebAuthenticator.AuthenticateAsync(new WebAuthenticatorOptions()
{
CallbackUrl = new Uri(REDIRECT_URI),
Url = new Uri(url),
PrefersEphemeralWebBrowserSession = _useEphemeralWebBrowserSession,
});
>>>>>>> v2023.9.0
var code = GetResultCode(authResult, state);
if (!string.IsNullOrEmpty(code))

3
src/Core/Abstractions/ICryptoService.cs
View File

@ -60,9 +60,6 @@ namespace Bit.Core.Abstractions
Task<EncString> EncryptAsync(string plainValue, SymmetricCryptoKey key = null);
Task<EncByteArray> EncryptToBytesAsync(byte[] plainValue, SymmetricCryptoKey key = null);
Task<UserKey> DecryptAndMigrateOldPinKeyAsync(bool masterPasswordOnRestart, string pin, string email, KdfConfig kdfConfig, EncString oldPinKey);
<<<<<<< HEAD
=======
Task<MasterKey> GetOrDeriveMasterKeyAsync(string password, string userId = null);
>>>>>>> v2023.9.0
}
}

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

@ -465,10 +465,7 @@ namespace Bit.Core.Services
Code = code;
CodeVerifier = codeVerifier;
SsoRedirectUrl = redirectUrl;
<<<<<<< HEAD
=======
SsoEmail2FaSessionToken = response.TwoFactorResponse.SsoEmail2faSessionToken;
>>>>>>> v2023.9.0
_masterKey = _setCryptoKeys ? masterKey : null;
_userKey = userKey2FA;
TwoFactorProvidersData = response.TwoFactorResponse.TwoFactorProviders2;

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

@ -700,12 +700,6 @@ namespace Bit.Core.Services
return new EncByteArray(encBytes);
}
<<<<<<< HEAD
// --HELPER METHODS--
private async Task StoreAdditionalKeysAsync(UserKey userKey, string userId = null)
{
=======
public async Task<MasterKey> GetOrDeriveMasterKeyAsync(string password, string userId = null)
{
var masterKey = await GetMasterKeyAsync(userId);
@ -719,7 +713,6 @@ namespace Bit.Core.Services
private async Task StoreAdditionalKeysAsync(UserKey userKey, string userId = null)
{
>>>>>>> v2023.9.0
// Set, refresh, or clear the pin key
if (await _stateService.GetProtectedPinAsync(userId) != null)
{

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

@ -1527,11 +1527,7 @@ namespace Bit.Core.Services
SetLastActiveTimeAsync(null, userId),
SetPreviousPageInfoAsync(null, userId),
SetInvalidUnlockAttemptsAsync(null, userId),
<<<<<<< HEAD
SetLocalDataAsync(null, userId),
=======
SetCiphersLocalDataAsync(null, userId),
>>>>>>> v2023.9.0
SetEncryptedCiphersAsync(null, userId),
SetEncryptedCollectionsAsync(null, userId),
SetLastSyncAsync(null, userId),

17
src/Core/Services/VaultTimeoutService.cs
View File

@ -59,22 +59,9 @@ namespace Bit.Core.Services
public async Task<bool> IsLockedAsync(string userId = null)
{
<<<<<<< HEAD
// When checking if we need to lock inactive account, we don't want to
// set the key, so we only check if the account has an auto unlock key
if (userId != null && await _stateService.GetActiveUserIdAsync() != userId)
{
return await _cryptoService.HasAutoUnlockKeyAsync(userId);
}
var biometricSet = await IsBiometricLockSetAsync(userId);
if (biometricSet && await _stateService.GetBiometricLockedAsync(userId))
{
=======
var biometricSet = await IsBiometricLockSetAsync(userId);
if (biometricSet && await _stateService.GetBiometricLockedAsync(userId))
{
>>>>>>> v2023.9.0
return true;
}
@ -84,14 +71,10 @@ namespace Bit.Core.Services
{
return true;
}
<<<<<<< HEAD
await _cryptoService.SetUserKeyAsync(await _cryptoService.GetAutoUnlockKeyAsync(userId), userId);
=======
if (userId != null && await _stateService.GetActiveUserIdAsync() != userId)
{
await _cryptoService.SetUserKeyAsync(await _cryptoService.GetAutoUnlockKeyAsync(userId), userId);
}
>>>>>>> v2023.9.0
}
// Check again to verify auto key was set