[ABW-2214] Shared persona data not persisted in profile

Package.swift

@@ -775,6 +775,7 @@ package.addModules([
 		name: "PersonasClientLive",
 		dependencies: [
 			"PersonasClient",
+			"AuthorizedDappsClient", // Need to update persisted shared persona data if a persona data entry is deleted, so we do not have broken references.
 			"ProfileStore",
 		],
 		tests: .yes()

Sources/Clients/AuthorizedDappsClient/AuthorizedDappsClient+Interface.swift

@@ -57,4 +57,94 @@ extension AuthorizedDappsClient {
 	) async throws -> IdentifiedArrayOf<Profile.Network.AuthorizedDapp> {
 		try await getAuthorizedDapps().filter { $0.referencesToAuthorizedPersonas.ids.contains(id) }
 	}
+
+	public func removeBrokenReferencesToSharedPersonaData(
+		personaCurrent: Profile.Network.Persona,
+		personaUpdated: Profile.Network.Persona
+	) async throws {
+		guard personaCurrent.id == personaUpdated.id else {
+			struct PersonaIDMismatch: Swift.Error {}
+			throw PersonaIDMismatch()
+		}
+		let identityAddress = personaCurrent.address
+		let dApps = try await getAuthorizedDapps()
+
+		// We only care about the update persona
+		let idsOfEntriesToKeep = Set(personaUpdated.personaData.entries.map(\.id))
+
+		for authedDapp in dApps {
+			var updatedAuthedDapp = authedDapp
+			for personaSimple in authedDapp.referencesToAuthorizedPersonas {
+				guard personaSimple.identityAddress == identityAddress else {
+					continue
+				}
+				let sharedData = personaSimple.sharedPersonaData
+				let idsOfEntriesToDelete = sharedData.entryIDs.subtracting(idsOfEntriesToKeep)
+
+				guard !idsOfEntriesToDelete.isEmpty else {
+					continue
+				}
+
+				var authorizedPersonaSimple = personaSimple
+
+				authorizedPersonaSimple.sharedPersonaData.remove(ids: idsOfEntriesToDelete)
+				updatedAuthedDapp.referencesToAuthorizedPersonas[id: authorizedPersonaSimple.id] = authorizedPersonaSimple
+			}
+			if updatedAuthedDapp != authedDapp {
+				try await updateAuthorizedDapp(updatedAuthedDapp)
+			}
+		}
+	}
+}
+
+extension Profile.Network.AuthorizedDapp.AuthorizedPersonaSimple.SharedPersonaData {
+	private mutating func remove(id: PersonaDataEntryID) {
+		func removeCollectionIfNeeded(
+			at keyPath: WritableKeyPath<Self, Profile.Network.AuthorizedDapp.AuthorizedPersonaSimple.SharedPersonaData.SharedCollection?>
+		) {
+			guard
+				var collection = self[keyPath: keyPath],
+				collection.ids.contains(id)
+			else { return }
+			collection.ids.remove(id)
+			switch collection.request.quantifier {
+			case .atLeast:
+				if collection.ids.count < collection.request.quantity {
+					// must delete whole collection since requested quantity is no longer fulfilled.
+					self[keyPath: keyPath] = nil
+				}
+			case .exactly:
+				// must delete whole collection since requested quantity is no longer fulfilled.
+				self[keyPath: keyPath] = nil
+			}
+		}
+
+		func removeEntryIfNeeded(
+			at keyPath: WritableKeyPath<Self, PersonaDataEntryID?>
+		) {
+			guard self[keyPath: keyPath] == id else { return }
+			self[keyPath: keyPath] = nil
+		}
+
+		removeEntryIfNeeded(at: \.name)
+		removeEntryIfNeeded(at: \.dateOfBirth)
+		removeEntryIfNeeded(at: \.companyName)
+		removeCollectionIfNeeded(at: \.emailAddresses)
+		removeCollectionIfNeeded(at: \.phoneNumbers)
+		removeCollectionIfNeeded(at: \.urls)
+		removeCollectionIfNeeded(at: \.postalAddresses)
+		removeCollectionIfNeeded(at: \.creditCards)
+
+		// The only purpose of this switch is to make sure we get a compilation error when we add a new PersonaData.Entry kind, so
+		// we do not forget to handle it here.
+		switch PersonaData.Entry.Kind.fullName {
+		case .fullName, .dateOfBirth, .companyName, .emailAddress, .phoneNumber, .url, .postalAddress, .creditCard: break
+		}
+	}
+
+	mutating func remove(ids: Set<PersonaDataEntryID>) {
+		ids.forEach {
+			remove(id: $0)
+		}
+	}
 }

Sources/Features/EditPersonaFeature/EditPersona.swift

@@ -1,3 +1,4 @@
+import AuthorizedDappsClient
 import FeaturePrelude
 import PersonasClient
 import Prelude
@@ -114,6 +115,7 @@ public struct EditPersona: Sendable, FeatureReducer {
 	public init() {}
 
 	@Dependency(\.dismiss) var dismiss
+	@Dependency(\.authorizedDappsClient) var authorizedDappsClient
 	@Dependency(\.personasClient) var personasClient
 	@Dependency(\.errorQueue) var errorQueue
 
@@ -159,6 +161,10 @@ public struct EditPersona: Sendable, FeatureReducer {
 			return .run { [state] send in
 				let updatedPersona = state.persona.updated(with: output)
 				loggerGlobal.critical("calling personasClient.updatePersona")
+				try await authorizedDappsClient.removeBrokenReferencesToSharedPersonaData(
+					personaCurrent: state.persona,
+					personaUpdated: updatedPersona
+				)
 				try await personasClient.updatePersona(updatedPersona)
 				loggerGlobal.critical("personasClient.updatePersona DONE => delegating")
 				await send(.delegate(.personaSaved(updatedPersona)))

Sources/Profile/AuthorizedDapp/AuthorizedDapp.swift

@@ -151,15 +151,15 @@ extension Profile.Network.AuthorizedDapp {
 		{
 			public typealias SharedCollection = Shared<PersonaDataEntryID>
 
-			public let name: PersonaDataEntryID?
-			public let dateOfBirth: PersonaDataEntryID?
-			public let companyName: PersonaDataEntryID?
+			public var name: PersonaDataEntryID?
+			public var dateOfBirth: PersonaDataEntryID?
+			public var companyName: PersonaDataEntryID?
 
-			public let emailAddresses: SharedCollection?
-			public let phoneNumbers: SharedCollection?
-			public let urls: SharedCollection?
-			public let postalAddresses: SharedCollection?
-			public let creditCards: SharedCollection?
+			public var emailAddresses: SharedCollection?
+			public var phoneNumbers: SharedCollection?
+			public var urls: SharedCollection?
+			public var postalAddresses: SharedCollection?
+			public var creditCards: SharedCollection?
 
 			public var entryIDs: Set<PersonaDataEntryID> {
 				var ids: [PersonaDataEntryID] = [
@@ -217,7 +217,7 @@ extension Profile.Network.AuthorizedDapp {
 		{
 			public typealias Number = RequestedNumber
 			public let request: Number
-			public private(set) var ids: OrderedSet<ID>
+			public var ids: OrderedSet<ID>
 
 			public init(
 				ids: OrderedSet<ID>,