From 39512b471976beff891dd4377f966a2e28fac0eb Mon Sep 17 00:00:00 2001 From: Shane Melton Date: Wed, 8 Mar 2023 17:17:51 -0800 Subject: [PATCH] [AC-1070] Formatting --- src/App/Pages/Accounts/LockPageViewModel.cs | 8 ++++---- .../Accounts/UpdateTempPasswordPageViewModel.cs | 14 +++++++------- src/Core/Models/Domain/ForcePasswordResetReason.cs | 2 +- src/Core/Services/AuthService.cs | 12 ++++++------ src/Core/Services/PolicyService.cs | 2 +- src/Core/Services/StateService.cs | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/App/Pages/Accounts/LockPageViewModel.cs b/src/App/Pages/Accounts/LockPageViewModel.cs index f59ba944e..369aa4210 100644 --- a/src/App/Pages/Accounts/LockPageViewModel.cs +++ b/src/App/Pages/Accounts/LockPageViewModel.cs @@ -336,14 +336,14 @@ namespace Bit.App.Pages var pinKey = await _cryptoService.MakePinKeyAysnc(decPin, _email, kdfConfig); await _stateService.SetPinProtectedKeyAsync(await _cryptoService.EncryptAsync(key.Key, pinKey)); } - + if (await RequirePasswordChangeAsync()) { // Save the ForcePasswordResetReason to force a password reset after unlock await _stateService.SetForcePasswordResetReasonAsync( ForcePasswordResetReason.WeakMasterPasswordOnLogin); } - + MasterPassword = string.Empty; await AppHelpers.ResetInvalidUnlockAttemptsAsync(); await SetKeyAndContinueAsync(key); @@ -386,8 +386,8 @@ namespace Bit.App.Pages MasterPassword, _passwordGenerationService.GetPasswordStrengthUserInput(_email)).Score; return !await _policyService.EvaluateMasterPassword( - strength, - MasterPassword, + strength, + MasterPassword, _enforcedMasterPasswordOptions ); } diff --git a/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs b/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs index 2a85c8229..8d0aef58a 100644 --- a/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs +++ b/src/App/Pages/Accounts/UpdateTempPasswordPageViewModel.cs @@ -14,14 +14,14 @@ namespace Bit.App.Pages public class UpdateTempPasswordPageViewModel : BaseChangePasswordViewModel { private readonly IUserVerificationService _userVerificationService; - + public UpdateTempPasswordPageViewModel() { PageTitle = AppResources.UpdateMasterPassword; TogglePasswordCommand = new Command(TogglePassword); ToggleConfirmPasswordCommand = new Command(ToggleConfirmPassword); SubmitCommand = new Command(async () => await SubmitAsync()); - + _userVerificationService = ServiceContainer.Resolve("userVerificationService"); } @@ -36,7 +36,7 @@ namespace Bit.App.Pages public override async Task InitAsync(bool forceSync = false) { await base.InitAsync(forceSync); - + var forcePasswordResetReason = await _stateService.GetForcePasswordResetReasonAsync(); if (forcePasswordResetReason.HasValue) @@ -114,10 +114,10 @@ namespace Bit.App.Pages throw new ArgumentOutOfRangeException(); } await _deviceActionService.HideLoadingAsync(); - + // Clear the force reset password reason await _stateService.SetForcePasswordResetReasonAsync(null); - + _platformUtilsService.ShowToast("success", null, AppResources.UpdatedMasterPassword); UpdateTempPasswordSuccessAction?.Invoke(); @@ -146,14 +146,14 @@ namespace Bit.App.Pages NewMasterPasswordHash = newMasterPasswordHash, MasterPasswordHint = Hint }; - + await _apiService.PutUpdateTempPasswordAsync(request); } private async Task UpdatePasswordAsync(string newMasterPasswordHash, Tuple newEncKey) { var currentPasswordHash = await _cryptoService.HashPasswordAsync(CurrentMasterPassword, null); - + var request = new PasswordRequest { MasterPasswordHash = currentPasswordHash, diff --git a/src/Core/Models/Domain/ForcePasswordResetReason.cs b/src/Core/Models/Domain/ForcePasswordResetReason.cs index 36883ed60..70b701bdd 100644 --- a/src/Core/Models/Domain/ForcePasswordResetReason.cs +++ b/src/Core/Models/Domain/ForcePasswordResetReason.cs @@ -6,7 +6,7 @@ /// Occurs when an organization admin forces a user to reset their password. /// AdminForcePasswordReset, - + /// /// Occurs when a user logs in with a master password that does not meet an organization's master password /// policy that is enforced on login. diff --git a/src/Core/Services/AuthService.cs b/src/Core/Services/AuthService.cs index 82038b4f8..9b74ece17 100644 --- a/src/Core/Services/AuthService.cs +++ b/src/Core/Services/AuthService.cs @@ -147,7 +147,7 @@ namespace Bit.Core.Services var hashedPassword = await _cryptoService.HashPasswordAsync(masterPassword, key); var localHashedPassword = await _cryptoService.HashPasswordAsync(masterPassword, key, HashPurpose.LocalAuthorization); var result = await LogInHelperAsync(email, hashedPassword, localHashedPassword, null, null, null, key, null, null, null, captchaToken); - + if (await RequirePasswordChange(email, masterPassword)) { if (!string.IsNullOrEmpty(_authedUserId)) @@ -180,9 +180,9 @@ namespace Bit.Core.Services { return false; } - + var passwordStrength = _passwordGenerationService.PasswordStrength( - masterPassword, + masterPassword, _passwordGenerationService.GetPasswordStrengthUserInput(email) ).Score; @@ -212,7 +212,7 @@ namespace Bit.Core.Services } var result = await LogInHelperAsync(Email, MasterPasswordHash, LocalMasterPasswordHash, Code, CodeVerifier, SsoRedirectUrl, _key, twoFactorProvider, twoFactorToken, remember, CaptchaToken, authRequestId: AuthRequestId); - + // If we successfully authenticated and we have a saved _2faForcePasswordResetReason reason from LogInAsync() if (!string.IsNullOrEmpty(_authedUserId) && _2faForcePasswordResetReason.HasValue) { @@ -450,8 +450,8 @@ namespace Bit.Core.Services KdfMemory = tokenResponse.KdfMemory, KdfParallelism = tokenResponse.KdfParallelism, HasPremiumPersonally = _tokenService.GetPremium(), - ForcePasswordResetReason = result.ForcePasswordReset - ? ForcePasswordResetReason.AdminForcePasswordReset + ForcePasswordResetReason = result.ForcePasswordReset + ? ForcePasswordResetReason.AdminForcePasswordReset : (ForcePasswordResetReason?)null, }, new Account.AccountTokens() diff --git a/src/Core/Services/PolicyService.cs b/src/Core/Services/PolicyService.cs index 5dc0ab21a..2c9cd7c20 100644 --- a/src/Core/Services/PolicyService.cs +++ b/src/Core/Services/PolicyService.cs @@ -130,7 +130,7 @@ namespace Bit.Core.Services { enforcedOptions.RequireSpecial = true; } - + var enforceOnLogin = GetPolicyBool(currentPolicy, "enforceOnLogin"); if (enforceOnLogin != null && (bool)enforceOnLogin) { diff --git a/src/Core/Services/StateService.cs b/src/Core/Services/StateService.cs index 6c950d397..aea34a6e9 100644 --- a/src/Core/Services/StateService.cs +++ b/src/Core/Services/StateService.cs @@ -1042,7 +1042,7 @@ namespace Bit.Core.Services public async Task GetForcePasswordResetReasonAsync(string userId = null) { - var reconcileOptions = ReconcileOptions(new StorageOptions { UserId = userId }, + var reconcileOptions = ReconcileOptions(new StorageOptions { UserId = userId }, await GetDefaultStorageOptionsAsync()); return (await GetAccountAsync(reconcileOptions))?.Profile?.ForcePasswordResetReason; }