[BITAU-121] Add accountDomain and accountEmail to AuthenticatorBridge items (#1017)

Author: brant-livefront

AuthenticatorBridgeKit/AuthenticatorBridgeItemDataModel.swift

@@ -6,6 +6,12 @@ import Foundation
 public struct AuthenticatorBridgeItemDataModel: Codable, Equatable {
     // MARK: Properties
 
+    /// The domain of the Bitwarden account that owns this item. (e.g. https://vault.bitwarden.com)
+    public let accountDomain: String?
+
+    /// The email of the Bitwarden account that owns this item.
+    public let accountEmail: String?
+
     /// Bool indicating if this item is a favorite.
     public let favorite: Bool
 
@@ -18,6 +24,6 @@ public struct AuthenticatorBridgeItemDataModel: Codable, Equatable {
     /// The TOTP key used to generate codes.
     public let totpKey: String?
 
-    /// The username of the Bitwarden account that owns this iteam.
+    /// The username of the item.
     public let username: String?
 }

AuthenticatorBridgeKit/AuthenticatorBridgeItemDataView.swift

@@ -6,6 +6,12 @@ import Foundation
 public struct AuthenticatorBridgeItemDataView: Codable, Equatable {
     // MARK: Properties
 
+    /// The domain of the Bitwarden account that owns this item. (e.g. https://vault.bitwarden.com)
+    public let accountDomain: String?
+
+    /// The email of the Bitwarden account that owns this item.
+    public let accountEmail: String?
+
     /// Bool indicating if this item is a favorite.
     public let favorite: Bool
 
@@ -18,19 +24,29 @@ public struct AuthenticatorBridgeItemDataView: Codable, Equatable {
     /// The TOTP key used to generate codes.
     public let totpKey: String?
 
-    /// The username of the Bitwarden account that owns this iteam.
+    /// The username of the item.
     public let username: String?
 
     /// Initialize an `AuthenticatorBridgeItemDataView` with the values provided.
     ///
     /// - Parameters:
+    ///   - accountDomain: The domain of the Bitwarden account that owns this item.
+    ///   - accountEmail: The email of the Bitwarden account that owns this item
     ///   - favorite: Bool indicating if this item is a favorite.
     ///   - id: The unique id of the item.
     ///   - name: The name of the item.
     ///   - totpKey: The TOTP key used to generate codes.
-    ///   - username: The username of the Bitwarden account that owns this item.
+    ///   - username: The username of the item.
     ///
-    public init(favorite: Bool, id: String, name: String, totpKey: String?, username: String?) {
+    public init(accountDomain: String?,
+                accountEmail: String?,
+                favorite: Bool,
+                id: String,
+                name: String,
+                totpKey: String?,
+                username: String?) {
+        self.accountDomain = accountDomain
+        self.accountEmail = accountEmail
         self.favorite = favorite
         self.id = id
         self.name = name

AuthenticatorBridgeKit/SharedCryptographyService.swift

@@ -62,6 +62,8 @@ public class DefaultAuthenticatorCryptographyService: SharedCryptographyService
 
         return items.map { item in
             AuthenticatorBridgeItemDataView(
+                accountDomain: (try? decrypt(item.accountDomain, withKey: symmetricKey)) ?? "",
+                accountEmail: (try? decrypt(item.accountEmail, withKey: symmetricKey)) ?? "",
                 favorite: item.favorite,
                 id: item.id,
                 name: (try? decrypt(item.name, withKey: symmetricKey)) ?? "",
@@ -79,6 +81,8 @@ public class DefaultAuthenticatorCryptographyService: SharedCryptographyService
 
         return items.map { item in
             AuthenticatorBridgeItemDataModel(
+                accountDomain: encrypt(item.accountDomain, withKey: symmetricKey) ?? "",
+                accountEmail: encrypt(item.accountEmail, withKey: symmetricKey) ?? "",
                 favorite: item.favorite,
                 id: item.id,
                 name: encrypt(item.name, withKey: symmetricKey) ?? "",

AuthenticatorBridgeKit/Tests/AuthenticatorBridgeItemDataTests.swift

@@ -49,7 +49,13 @@ final class AuthenticatorBridgeItemDataTests: AuthenticatorBridgeKitTestCase {
             context: dataStore.persistentContainer.viewContext,
             userId: "userId",
             authenticatorItem: AuthenticatorBridgeItemDataModel(
-                favorite: true, id: "is", name: "name", totpKey: "TOTP Key", username: "username"
+                accountDomain: "https://vault.example.com",
+                accountEmail: "[email protected]",
+                favorite: true,
+                id: "is",
+                name: "name",
+                totpKey: "TOTP Key",
+                username: "username"
             )
         )
 

AuthenticatorBridgeKit/Tests/SharedCryptographyServiceTests.swift

@@ -71,6 +71,16 @@ final class SharedCryptographyServiceTests: AuthenticatorBridgeKitTestCase {
 
             // Encrypted values should not remain equal, unless they were `nil`
             XCTAssertNotEqual(item.name, encryptedItem.name)
+            if item.accountDomain != nil {
+                XCTAssertNotEqual(item.accountDomain, encryptedItem.accountDomain)
+            } else {
+                XCTAssertNil(encryptedItem.accountDomain)
+            }
+            if item.accountEmail != nil {
+                XCTAssertNotEqual(item.accountEmail, encryptedItem.accountEmail)
+            } else {
+                XCTAssertNil(encryptedItem.accountEmail)
+            }
             if item.totpKey != nil {
                 XCTAssertNotEqual(item.totpKey, encryptedItem.totpKey)
             } else {

AuthenticatorBridgeKit/Tests/TestHelpers/Fixtures/AuthenticatorBridgeItemDataView+Fixtures.swift

@@ -4,13 +4,17 @@ import Foundation
 
 extension AuthenticatorBridgeItemDataView {
     static func fixture(
+        accountDomain: String? = "",
+        accountEmail: String? = "",
         favorite: Bool = false,
         id: String = UUID().uuidString,
         name: String = "Name",
         totpKey: String? = nil,
         username: String? = nil
     ) -> AuthenticatorBridgeItemDataView {
         AuthenticatorBridgeItemDataView(
+            accountDomain: accountDomain,
+            accountEmail: accountEmail,
             favorite: favorite,
             id: id,
             name: name,
@@ -23,9 +27,12 @@ extension AuthenticatorBridgeItemDataView {
         [
             AuthenticatorBridgeItemDataView.fixture(),
             AuthenticatorBridgeItemDataView.fixture(favorite: true),
+            AuthenticatorBridgeItemDataView.fixture(accountDomain: "https://vault.example.com"),
+            AuthenticatorBridgeItemDataView.fixture(accountEmail: "[email protected]"),
             AuthenticatorBridgeItemDataView.fixture(totpKey: "TOTP Key"),
             AuthenticatorBridgeItemDataView.fixture(username: "Username"),
             AuthenticatorBridgeItemDataView.fixture(totpKey: "TOTP Key", username: "Username"),
+            AuthenticatorBridgeItemDataView.fixture(accountEmail: ""),
             AuthenticatorBridgeItemDataView.fixture(totpKey: ""),
             AuthenticatorBridgeItemDataView.fixture(username: ""),
             AuthenticatorBridgeItemDataView.fixture(totpKey: "", username: ""),

AuthenticatorBridgeKit/Tests/TestHelpers/MockSharedCryptographyService.swift

@@ -7,30 +7,14 @@ class MockSharedCryptographyService: SharedCryptographyService {
     var decryptCalled = false
     var encryptCalled = false
 
-    func decryptAuthenticatorItemDatas(
-        _ items: [AuthenticatorBridgeKit.AuthenticatorBridgeItemData]
-    ) async throws -> [AuthenticatorBridgeKit.AuthenticatorBridgeItemDataView] {
-        decryptCalled = true
-
-        return items.compactMap { item in
-            guard let model = item.model else { return nil }
-
-            return AuthenticatorBridgeItemDataView(
-                favorite: model.favorite,
-                id: model.id,
-                name: model.name,
-                totpKey: model.totpKey,
-                username: model.username
-            )
-        }
-    }
-
     func decryptAuthenticatorItems(
         _ items: [AuthenticatorBridgeItemDataModel]
     ) async throws -> [AuthenticatorBridgeItemDataView] {
         decryptCalled = true
         return items.map { model in
             AuthenticatorBridgeItemDataView(
+                accountDomain: model.accountDomain,
+                accountEmail: model.accountEmail,
                 favorite: model.favorite,
                 id: model.id,
                 name: model.name,
@@ -46,6 +30,8 @@ class MockSharedCryptographyService: SharedCryptographyService {
         encryptCalled = true
         return items.map { view in
             AuthenticatorBridgeItemDataModel(
+                accountDomain: view.accountDomain,
+                accountEmail: view.accountEmail,
                 favorite: view.favorite,
                 id: view.id,
                 name: view.name,

BitwardenShared/Core/Platform/Services/AuthenticatorSyncService.swift

@@ -160,16 +160,17 @@ actor DefaultAuthenticatorSyncService: NSObject, AuthenticatorSyncService {
         let decryptedCiphers = try await totpCiphers.asyncMap { cipher in
             try await self.clientService.vault(for: userId).ciphers().decrypt(cipher: cipher)
         }
-        let account = try await stateService.getActiveAccount()
-        let username = account.profile.email
+        let account = try? await stateService.getAccount(userId: userId)
 
         return decryptedCiphers.map { cipher in
             AuthenticatorBridgeItemDataView(
+                accountDomain: account?.settings.environmentUrls?.webVaultHost,
+                accountEmail: account?.profile.email,
                 favorite: false,
                 id: cipher.id ?? UUID().uuidString,
                 name: cipher.name,
                 totpKey: cipher.login?.totp,
-                username: username
+                username: cipher.login?.username
             )
         }
     }