[KeyConnector] Add support for key connector OTP (#1633)

* initial commit - add UsesKeyConnector to UserService - add models - begin work on authentication * finish auth workflow for key connector sso login - finish api call for get user key - start api calls for posts to key connector * Bypass lock page if already unlocked * Move logic to KeyConnectorService, log out if no pin or biometric is set * Disable password reprompt when using key connector * hide password reprompt checkbox when editing or adding cipher * add PostUserKey and PostSetKeyConnector calls * add ConvertMasterPasswordPage * add functionality to RemoveMasterPasswordPage - rename Convert to Remove * Hide Change Master Password button if using key connector * Add OTP verification for export component * Update src/App/Pages/Vault/AddEditPage.xaml.cs Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * remove toolbar item "close" * Update src/Core/Models/Request/KeyConnectorUserKeyRequest.cs Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * remove new line in resource string - format warning as two labels - set label in code behind for loading simultaneously * implement GetAndSetKey in KeyConnectorService - ignore EnvironmentService call * remove unnecesary orgIdentifier * move RemoveMasterPasswordPage call to LockPage * add spacing to export vault page * log out if no PIN or bio on lock page with key connector * Delete excessive whitespace * Delete excessive whitespace * Change capitalisation of OTP * add default value to models for backwards compatibility * remove this keyword * actually handle exceptions * move RemoveMasterPasswordPage to TabPage using messaging service * add minor improvements * remove 'this.' Co-authored-by: Hinton <oscar@oscarhinton.com> Co-authored-by: Thomas Rittson <trittson@bitwarden.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
2025-12-15 07:43:37 +00:00 · 2021-11-10 20:46:48 -05:00
parent 90b62d61ae
commit 13869b5a1b
40 changed files with 869 additions and 74 deletions
--- a/src/Core/Services/UserVerificationService.cs
+++ b/src/Core/Services/UserVerificationService.cs
@@ -0,0 +1,69 @@
+using System;
+using Bit.Core.Enums;
+using Bit.Core.Models.Request;
+using Bit.Core.Services;
+using Bit.Core.Abstractions;
+using System.Threading.Tasks;
+
+namespace Bit.Core.Services
+{
+    public class UserVerificationService : IUserVerificationService
+    {
+        private readonly IApiService _apiService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly II18nService _i18nService;
+        private readonly ICryptoService _cryptoService;
+
+        public UserVerificationService(IApiService apiService, IPlatformUtilsService platformUtilsService,
+            II18nService i18nService, ICryptoService cryptoService)
+        {
+            _apiService = apiService;
+            _platformUtilsService = platformUtilsService;
+            _i18nService = i18nService;
+            _cryptoService = cryptoService;
+        }
+
+        async public Task<bool> VerifyUser(string secret, VerificationType verificationType)
+        {
+            if (string.IsNullOrEmpty(secret))
+            {
+                await InvalidSecretErrorAsync(verificationType);
+                return false;
+            }
+
+            if (verificationType == VerificationType.OTP)
+            {
+                var request = new VerifyOTPRequest(secret);
+                try
+                {
+                    await _apiService.PostAccountVerifyOTPAsync(request);
+                }
+                catch
+                {
+                    await InvalidSecretErrorAsync(verificationType);
+                    return false;
+                }
+            }
+            else
+            {
+                var passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(secret, null);
+                if (!passwordValid)
+                {
+                    await InvalidSecretErrorAsync(verificationType);
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        async private Task InvalidSecretErrorAsync(VerificationType verificationType)
+        {
+            var errorMessage = verificationType == VerificationType.OTP
+                ? _i18nService.T("InvalidVerificationCode")
+                : _i18nService.T("InvalidMasterPassword");
+
+            await _platformUtilsService.ShowDialogAsync(errorMessage);
+        }
+    }
+}