Refactor/Migrate to new Relationship APIs

.dev/appsettings.override.json

@@ -49,6 +49,9 @@
             }
           }
         }
+      },
+      "Application": {
+        "didDomainName": "localhost"
       }
     },
     "Files": {
@@ -69,6 +72,9 @@
           "Provider": "Postgres",
           "ConnectionString": "User ID=messages;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;"
         }
+      },
+      "Application": {
+        "didDomainName": "localhost"
       }
     },
     "Relationships": {
@@ -77,6 +83,9 @@
           "Provider": "Postgres",
           "ConnectionString": "User ID=relationships;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;"
         }
+      },
+      "Application": {
+        "didDomainName": "localhost"
       }
     },
     "Synchronization": {

.dev/compose.backbone.env

@@ -1 +1 @@
-BACKBONE_VERSION=5.9.1
+BACKBONE_VERSION=6.2.0

apps/enmeshed/assets/i18n/de.json

@@ -1054,21 +1054,6 @@
       "Rejected": "Abgelehnte Kontaktanfrage",
       "Revoked": "Zurückgezogene Kontaktanfrage"
     },
-    "relationshipChange": {
-      "Accepted": "Akzeptierte Anfrage",
-      "Creation": "Eingehen einer Beziehung",
-      "Pending": "Offene Anfrage",
-      "Rejected": "Abgelehnte Anfrage",
-      "request": {
-        "name": "Anfrage zum Ändern einer Beziehung"
-      },
-      "response": {
-        "name": "Antwort zum Ändern einer Beziehung"
-      },
-      "Revoked": "Zurückgezogene Anfrage",
-      "Termination": "Auflösen einer Beziehung",
-      "TerminationCancellation": "Wiederaufnahme einer Beziehung"
-    },
     "requestItem": {
       "AuthenticationRequestItem": {
         "name": "Hat eine Bestätigung angefordert"

apps/enmeshed/assets/i18n/en.json

@@ -1054,21 +1054,6 @@
       "Rejected": "Rejected contact request",
       "Revoked": "Withdrawn contact request"
     },
-    "relationshipChange": {
-      "Accepted": "Accepted relationship change",
-      "Creation": "Relationship Creation",
-      "Pending": "Pending relationship change",
-      "Rejected": "Rejected relationship change",
-      "request": {
-        "name": "Relationship Change Request"
-      },
-      "response": {
-        "name": "Relationship Change Response"
-      },
-      "Revoked": "Revoked relationship change",
-      "Termination": "Relationship Termination",
-      "TerminationCancellation": "Cancellation of Relationship Termination"
-    },
     "requestItem": {
       "AuthenticationRequestItem": {
         "name": "Requested your authentication"

packages/connector_sdk/lib/src/endpoints/relationships_endpoint.dart

@@ -6,11 +6,11 @@ import 'transformers.dart';
 class RelationshipsEndpoint extends Endpoint {
   RelationshipsEndpoint(super.dio);
 
-  Future<ConnectorResponse<RelationshipDTO>> createRelationship({required String templateId, required Map<String, dynamic> content}) => post(
+  Future<ConnectorResponse<RelationshipDTO>> createRelationship({required String templateId, required Map<String, dynamic> creationContent}) => post(
         '/api/v2/Relationships',
         data: {
           'templateId': templateId,
-          'content': content,
+          'content': creationContent,
         },
         transformer: relationshipTransformer,
       );
@@ -25,25 +25,39 @@ class RelationshipsEndpoint extends Endpoint {
         '/api/v2/Relationships/$relationshipId',
         transformer: relationshipTransformer,
       );
-  Future<ConnectorResponse<RelationshipDTO>> acceptRelationshipChange({
-    required String relationshipId,
-    required String changeId,
-    required Map<String, dynamic> content,
-  }) =>
-      put(
-        '/api/v2/Relationships/$relationshipId/Changes/$changeId/Accept',
-        data: {'content': content},
+
+  Future<ConnectorResponse<RelationshipDTO>> acceptRelationship(String relationshipId) => put(
+        '/api/v2/Relationships/$relationshipId/Accept',
+        transformer: relationshipTransformer,
+      );
+
+  Future<ConnectorResponse<RelationshipDTO>> rejectRelationship(String relationshipId) => put(
+        '/api/v2/Relationships/$relationshipId/Reject',
+        transformer: relationshipTransformer,
+      );
+
+  Future<ConnectorResponse<RelationshipDTO>> revokeRelationship(String relationshipId) => put(
+        '/api/v2/Relationships/$relationshipId/Revoke',
+        transformer: relationshipTransformer,
+      );
+
+  Future<ConnectorResponse<RelationshipDTO>> requestRelationshipReactivation(String relationshipId) => put(
+        '/api/v2/Relationships/$relationshipId/Reactivate',
+        transformer: relationshipTransformer,
+      );
+
+  Future<ConnectorResponse<RelationshipDTO>> acceptRelationshipReactivation(String relationshipId) => put(
+        '/api/v2/Relationships/$relationshipId/Reactivate/Accept',
+        transformer: relationshipTransformer,
+      );
+
+  Future<ConnectorResponse<RelationshipDTO>> rejectRelationshipReactivation(String relationshipId) => put(
+        '/api/v2/Relationships/$relationshipId/Reactivate/Reject',
         transformer: relationshipTransformer,
       );
 
-  Future<ConnectorResponse<RelationshipDTO>> rejectRelationshipChange({
-    required String relationshipId,
-    required String changeId,
-    required Map<String, dynamic> content,
-  }) =>
-      put(
-        '/api/v2/Relationships/$relationshipId/Changes/$changeId/Reject',
-        data: {'content': content},
+  Future<ConnectorResponse<RelationshipDTO>> revokeRelationshipReactivation(String relationshipId) => put(
+        '/api/v2/Relationships/$relationshipId/Reactivate/Revoke',
         transformer: relationshipTransformer,
       );
 

packages/enmeshed_runtime_bridge/integration_test/services/facades/consumption/attributes_facade_test.dart

@@ -894,7 +894,11 @@ void run(EnmeshedRuntime runtime) {
         eventBus,
       );
 
-      final query = ThirdPartyRelationshipAttributeQuery(key: 'aKey', owner: senderAddress, thirdParty: [thirdPartyAddress]);
+      final query = ThirdPartyRelationshipAttributeQuery(
+        key: 'aKey',
+        owner: ThirdPartyRelationshipAttributeQueryOwner.recipient,
+        thirdParty: [thirdPartyAddress],
+      );
       final requestItem = ReadAttributeRequestItem(mustBeAccepted: true, query: query);
 
       final senderThirdPartyOwnedRelationshipAttribute = await executeFullRequestAndShareThirdPartyRelationshipAttributeFlow(
@@ -1108,7 +1112,11 @@ void run(EnmeshedRuntime runtime) {
       );
 
       final receivedAttributeResult = await recipient.consumptionServices.attributes.executeThirdPartyRelationshipAttributeQuery(
-        query: ThirdPartyRelationshipAttributeQuery(key: 'website', owner: account1.address!, thirdParty: [account1.address!]),
+        query: ThirdPartyRelationshipAttributeQuery(
+          key: 'website',
+          owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty,
+          thirdParty: [account1.address!],
+        ),
       );
 
       expect(receivedAttributeResult, isSuccessful<List<LocalAttributeDTO>>());
@@ -1609,7 +1617,11 @@ void run(EnmeshedRuntime runtime) {
       final senderOwnSharedRelationshipAttribute =
           (await sender.consumptionServices.attributes.getAttribute(attributeId: thirdPartyOwnSharedRelationshipAttribute.id)).value;
 
-      final query = ThirdPartyRelationshipAttributeQuery(key: 'aKey', owner: thirdPartyAddress, thirdParty: [thirdPartyAddress]);
+      final query = ThirdPartyRelationshipAttributeQuery(
+        key: 'aKey',
+        owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty,
+        thirdParty: [thirdPartyAddress],
+      );
       final requestItem = ReadAttributeRequestItem(mustBeAccepted: true, query: query);
 
       final senderThirdPartyOwnedRelationshipAttribute = await executeFullRequestAndShareThirdPartyRelationshipAttributeFlow(
@@ -1639,7 +1651,11 @@ void run(EnmeshedRuntime runtime) {
       final senderOwnSharedRelationshipAttribute =
           (await sender.consumptionServices.attributes.getAttribute(attributeId: thirdPartyOwnSharedRelationshipAttribute.id)).value;
 
-      final query = ThirdPartyRelationshipAttributeQuery(key: 'aKey', owner: thirdPartyAddress, thirdParty: [thirdPartyAddress]);
+      final query = ThirdPartyRelationshipAttributeQuery(
+        key: 'aKey',
+        owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty,
+        thirdParty: [thirdPartyAddress],
+      );
       final requestItem = ReadAttributeRequestItem(mustBeAccepted: true, query: query);
 
       final senderThirdPartyOwnedRelationshipAttribute = await executeFullRequestAndShareThirdPartyRelationshipAttributeFlow(
@@ -1672,7 +1688,11 @@ void run(EnmeshedRuntime runtime) {
       final senderOwnSharedRelationshipAttribute =
           (await sender.consumptionServices.attributes.getAttribute(attributeId: thirdPartyOwnSharedRelationshipAttribute.id)).value;
 
-      final query = ThirdPartyRelationshipAttributeQuery(key: 'aKey', owner: thirdPartyAddress, thirdParty: [thirdPartyAddress]);
+      final query = ThirdPartyRelationshipAttributeQuery(
+        key: 'aKey',
+        owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty,
+        thirdParty: [thirdPartyAddress],
+      );
       final requestItem = ReadAttributeRequestItem(mustBeAccepted: true, query: query);
 
       final senderThirdPartyOwnedRelationshipAttribute = await executeFullRequestAndShareThirdPartyRelationshipAttributeFlow(
@@ -1715,7 +1735,11 @@ void run(EnmeshedRuntime runtime) {
       final senderOwnSharedRelationshipAttribute =
           (await sender.consumptionServices.attributes.getAttribute(attributeId: thirdPartyOwnSharedRelationshipAttribute.id)).value;
 
-      final query = ThirdPartyRelationshipAttributeQuery(key: 'aKey', owner: thirdPartyAddress, thirdParty: [thirdPartyAddress]);
+      final query = ThirdPartyRelationshipAttributeQuery(
+        key: 'aKey',
+        owner: ThirdPartyRelationshipAttributeQueryOwner.thirdParty,
+        thirdParty: [thirdPartyAddress],
+      );
       final requestItem = ReadAttributeRequestItem(mustBeAccepted: true, query: query);
 
       final senderThirdPartyOwnedRelationshipAttribute = await executeFullRequestAndShareThirdPartyRelationshipAttributeFlow(

packages/enmeshed_runtime_bridge/integration_test/services/facades/consumption/requests_facade_test.dart

@@ -83,7 +83,7 @@ void run(EnmeshedRuntime runtime) {
         final result = await recipient.consumptionServices.incomingRequests.canAccept(
           params: DecideRequestParameters(requestId: rLocalRequest.id, items: [
             AcceptReadAttributeRequestItemParametersWithNewAttribute(
-              newAttribute: IdentityAttribute(owner: account1.address!, value: const CityAttributeValue(value: 'aCity')),
+              newAttribute: IdentityAttribute(owner: account2.address!, value: const CityAttributeValue(value: 'aCity')),
             ),
           ]),
         );
@@ -98,7 +98,7 @@ void run(EnmeshedRuntime runtime) {
         final result = await recipient.consumptionServices.incomingRequests.accept(
           params: DecideRequestParameters(requestId: rLocalRequest.id, items: [
             AcceptReadAttributeRequestItemParametersWithNewAttribute(
-              newAttribute: IdentityAttribute(owner: account1.address!, value: const CityAttributeValue(value: 'aCity')),
+              newAttribute: IdentityAttribute(owner: account2.address!, value: const CityAttributeValue(value: 'aCity')),
             ),
           ]),
         );
@@ -285,7 +285,7 @@ void run(EnmeshedRuntime runtime) {
         final result = await recipient.consumptionServices.incomingRequests.canAccept(
           params: DecideRequestParameters(requestId: rLocalRequest.id, items: [
             AcceptReadAttributeRequestItemParametersWithNewAttribute(
-              newAttribute: IdentityAttribute(owner: account1.address!, value: const CityAttributeValue(value: 'aCity')),
+              newAttribute: IdentityAttribute(owner: account2.address!, value: const CityAttributeValue(value: 'aCity')),
             ),
           ]),
         );
@@ -300,7 +300,7 @@ void run(EnmeshedRuntime runtime) {
         final result = await recipient.consumptionServices.incomingRequests.accept(
           params: DecideRequestParameters(requestId: rLocalRequest.id, items: [
             AcceptReadAttributeRequestItemParametersWithNewAttribute(
-              newAttribute: IdentityAttribute(owner: account1.address!, value: const CityAttributeValue(value: 'aCity')),
+              newAttribute: IdentityAttribute(owner: account2.address!, value: const CityAttributeValue(value: 'aCity')),
             ),
           ]),
         );

packages/enmeshed_runtime_bridge/integration_test/services/facades/transport/account_facade_test.dart

@@ -23,9 +23,8 @@ void run(EnmeshedRuntime runtime) {
       final identityInfoResult = await session.transportServices.account.getIdentityInfo();
 
       expect(identityInfoResult, isSuccessful<GetIdentityInfoResponse>());
-      expect(identityInfoResult.value.address.length, lessThanOrEqualTo(36));
-      expect(identityInfoResult.value.address.length, greaterThanOrEqualTo(35));
-      expect(identityInfoResult.value.address, contains('id1'));
+      final regExp = RegExp(r'^did:e:[a-zA-Z0-9.-]+:dids:[0-9a-f]{22}$');
+      expect(regExp.hasMatch(identityInfoResult.value.address), true);
       expect(identityInfoResult.value.publicKey.length, equals(82));
     });
   });

packages/enmeshed_runtime_bridge/integration_test/services/facades/transport/messages_facade_test.dart

@@ -192,7 +192,7 @@ void run(EnmeshedRuntime runtime) {
   });
 
   group('Message errors', () {
-    const fakeAddress = 'id1PNvUP4jHD74qo6usnWNoaFGFf33MXZi6c';
+    const fakeAddress = 'did:e:a-domain:dids:fef1992c5e529adc413288';
     test('should throw correct error for empty "to" in the Message', () async {
       final result = await session1.transportServices.messages.sendMessage(
         recipients: [fakeAddress],