Release v7

packages/app-runtime/src/AppStringProcessor.ts

@@ -29,7 +29,7 @@ export class AppStringProcessor {
         url = url.trim();
 
         const parsed = new URL(url);
-        const allowedProtocols = ["http:", "https:", "nmshd:"];
+        const allowedProtocols = ["http:", "https:"];
         if (!allowedProtocols.includes(parsed.protocol)) return Result.fail(AppRuntimeErrors.appStringProcessor.wrongURL());
 
         return await this.processReference(url, account);

packages/app-runtime/test/lib/TestUtil.ts

@@ -129,7 +129,7 @@ export class TestUtil {
             })
         ).value;
 
-        const templateTo = await to.transportServices.relationshipTemplates.loadPeerRelationshipTemplate({ reference: templateFrom.truncatedReference });
+        const templateTo = await to.transportServices.relationshipTemplates.loadPeerRelationshipTemplate({ reference: templateFrom.reference.truncated });
         return templateTo.value;
     }
 

packages/app-runtime/test/modules/MessageEventing.test.ts

@@ -30,8 +30,8 @@ describe("MessageEventingTest", function () {
         const mail: MailJSON = {
             "@type": "Mail",
             to: [recipient],
-            subject: "Hallo Horst",
-            body: "Hallo, hier ist eine Mail."
+            subject: "aSubject",
+            body: "aBody"
         };
         const message = await TestUtil.sendMessage(sessionA, sessionB, mail);
         const eventListener = new EventListener(runtime, [MailReceivedEvent, MessageReceivedEvent]);

packages/app-runtime/test/modules/appEvents/RelationshipTemplateProcessedModule.test.ts

@@ -44,7 +44,7 @@ describe("RelationshipTemplateProcessedModule", function () {
         await TestUtil.createAndLoadPeerTemplate(
             session1,
             session2,
-            RelationshipTemplateContent.from({ onNewRelationship: { items: [AuthenticationRequestItem.from({ mustBeAccepted: false })] } }).toJSON()
+            RelationshipTemplateContent.from({ onNewRelationship: { items: [AuthenticationRequestItem.from({ title: "aTitle", mustBeAccepted: false })] } }).toJSON()
         );
         await eventBus.waitForRunningEventHandlers();
 
@@ -55,15 +55,15 @@ describe("RelationshipTemplateProcessedModule", function () {
         const templateFrom = (
             await session1.transportServices.relationshipTemplates.createOwnRelationshipTemplate({
                 content: RelationshipTemplateContent.from({
-                    onNewRelationship: { expiresAt: CoreDate.utc().add({ seconds: 2 }), items: [AuthenticationRequestItem.from({ mustBeAccepted: false })] }
+                    onNewRelationship: { expiresAt: CoreDate.utc().add({ seconds: 2 }), items: [AuthenticationRequestItem.from({ title: "aTitle", mustBeAccepted: false })] }
                 }).toJSON(),
                 expiresAt: CoreDate.utc().add({ minutes: 5 }).toString(),
                 maxNumberOfAllocations: 1
             })
         ).value;
 
         await sleep(3000);
-        await session2.transportServices.relationshipTemplates.loadPeerRelationshipTemplate({ reference: templateFrom.truncatedReference });
+        await session2.transportServices.relationshipTemplates.loadPeerRelationshipTemplate({ reference: templateFrom.reference.truncated });
         await eventBus.waitForRunningEventHandlers();
 
         expect(uiBridge).showRequestNotCalled();
@@ -78,11 +78,11 @@ describe("RelationshipTemplateProcessedModule", function () {
                 content: RelationshipTemplateContent.from({
                     onNewRelationship: {
                         "@type": "Request",
-                        items: [{ "@type": "AuthenticationRequestItem", mustBeAccepted: false }]
+                        items: [{ "@type": "AuthenticationRequestItem", title: "aTitle", mustBeAccepted: false }]
                     },
                     onExistingRelationship: {
                         "@type": "Request",
-                        items: [{ "@type": "AuthenticationRequestItem", mustBeAccepted: false }],
+                        items: [{ "@type": "AuthenticationRequestItem", title: "aTitle", mustBeAccepted: false }],
                         expiresAt: CoreDate.utc().add({ seconds: 2 }).toString()
                     }
                 }).toJSON(),
@@ -92,7 +92,7 @@ describe("RelationshipTemplateProcessedModule", function () {
         ).value;
 
         await sleep(3000);
-        await session2.transportServices.relationshipTemplates.loadPeerRelationshipTemplate({ reference: templateFrom.truncatedReference });
+        await session2.transportServices.relationshipTemplates.loadPeerRelationshipTemplate({ reference: templateFrom.reference.truncated });
         await eventBus.waitForRunningEventHandlers();
 
         expect(uiBridge).showRequestNotCalled();

packages/app-runtime/test/runtime/AppStringProcessor.test.ts

@@ -43,8 +43,8 @@ describe("AppStringProcessor", function () {
         mockUiBridge.reset();
     });
 
-    test("should process an invalid URL", async function () {
-        const result = await runtime1.stringProcessor.processURL("enmeshed://qr#", runtime1Session.account);
+    test.each(["nmshd", "enmeshed"])("should process the invalid URL scheme %s", async function (scheme) {
+        const result = await runtime1.stringProcessor.processURL(`${scheme}://qr#`, runtime1Session.account);
         expect(result.isError).toBe(true);
 
         expect(result.error.code).toBe("error.appruntime.appStringProcessor.wrongURL");
@@ -53,16 +53,6 @@ describe("AppStringProcessor", function () {
         expect(mockUiBridge).requestAccountSelectionNotCalled();
     });
 
-    test("should process a valid URL with invalid reference", async function () {
-        const result = await runtime1.stringProcessor.processURL("nmshd://qr#", runtime1Session.account);
-        expect(result.isError).toBe(true);
-
-        expect(result.error.code).toBe("error.appruntime.appStringProcessor.invalidReference");
-
-        expect(mockUiBridge).enterPasswordNotCalled();
-        expect(mockUiBridge).requestAccountSelectionNotCalled();
-    });
-
     test("should properly handle a personalized RelationshipTemplate with the correct Identity available", async function () {
         const runtime2SessionAAddress = runtime2SessionA.account.address!;
         assert(runtime2SessionAAddress);
@@ -73,7 +63,7 @@ describe("AppStringProcessor", function () {
             forIdentity: runtime2SessionAAddress
         });
 
-        const result = await runtime2.stringProcessor.processReference(templateResult.value.truncatedReference);
+        const result = await runtime2.stringProcessor.processReference(templateResult.value.reference.truncated);
         expect(result).toBeSuccessful();
 
         await expect(eventBus).toHavePublished(PeerRelationshipTemplateLoadedEvent);
@@ -92,7 +82,7 @@ describe("AppStringProcessor", function () {
             forIdentity: runtime1SessionAddress
         });
 
-        const result = await runtime2.stringProcessor.processReference(templateResult.value.truncatedReference);
+        const result = await runtime2.stringProcessor.processReference(templateResult.value.reference.truncated);
         expect(result).toBeAnError("There is no account matching the given 'forIdentityTruncated'.", "error.appruntime.general.noAccountAvailableForIdentityTruncated");
 
         expect(mockUiBridge).enterPasswordNotCalled();
@@ -109,7 +99,7 @@ describe("AppStringProcessor", function () {
         mockUiBridge.setPasswordToReturnForAttempt(1, "password");
         mockUiBridge.accountIdToReturn = runtime2SessionA.account.id;
 
-        const result = await runtime2.stringProcessor.processReference(templateResult.value.truncatedReference);
+        const result = await runtime2.stringProcessor.processReference(templateResult.value.reference.truncated);
         expect(result).toBeSuccessful();
         expect(result.value).toBeUndefined();
 
@@ -129,7 +119,7 @@ describe("AppStringProcessor", function () {
         mockUiBridge.setPasswordToReturnForAttempt(1, "000000");
         mockUiBridge.accountIdToReturn = runtime2SessionA.account.id;
 
-        const result = await runtime2.stringProcessor.processReference(templateResult.value.truncatedReference);
+        const result = await runtime2.stringProcessor.processReference(templateResult.value.reference.truncated);
         expect(result).toBeSuccessful();
         expect(result.value).toBeUndefined();
 
@@ -149,7 +139,7 @@ describe("AppStringProcessor", function () {
 
         mockUiBridge.setPasswordToReturnForAttempt(1, "password");
 
-        const result = await runtime2.stringProcessor.processReference(templateResult.value.truncatedReference);
+        const result = await runtime2.stringProcessor.processReference(templateResult.value.reference.truncated);
         expect(result).toBeSuccessful();
         expect(result.value).toBeUndefined();
 
@@ -169,7 +159,7 @@ describe("AppStringProcessor", function () {
 
         mockUiBridge.setPasswordToReturnForAttempt(1, "000000");
 
-        const result = await runtime2.stringProcessor.processReference(templateResult.value.truncatedReference);
+        const result = await runtime2.stringProcessor.processReference(templateResult.value.reference.truncated);
         expect(result).toBeSuccessful();
         expect(result.value).toBeUndefined();
 
@@ -191,7 +181,7 @@ describe("AppStringProcessor", function () {
 
         mockUiBridge.accountIdToReturn = runtime2SessionA.account.id;
 
-        const result = await runtime2.stringProcessor.processReference(templateResult.value.truncatedReference);
+        const result = await runtime2.stringProcessor.processReference(templateResult.value.reference.truncated);
         expect(result).toBeSuccessful();
         expect(result.value).toBeUndefined();
 
@@ -212,7 +202,7 @@ describe("AppStringProcessor", function () {
         mockUiBridge.setPasswordToReturnForAttempt(1, "password");
         mockUiBridge.accountIdToReturn = runtime2SessionA.account.id;
 
-        await runtime2.stringProcessor.processReference(templateResult.value.truncatedReference);
+        await runtime2.stringProcessor.processReference(templateResult.value.reference.truncated);
 
         expect(mockUiBridge).enterPasswordCalled("pw", undefined, undefined, PasswordLocationIndicatorOptions.SMS);
     });
@@ -227,7 +217,7 @@ describe("AppStringProcessor", function () {
         mockUiBridge.setPasswordToReturnForAttempt(1, "password");
         mockUiBridge.accountIdToReturn = runtime2SessionA.account.id;
 
-        await runtime2.stringProcessor.processReference(templateResult.value.truncatedReference);
+        await runtime2.stringProcessor.processReference(templateResult.value.reference.truncated);
 
         expect(mockUiBridge).enterPasswordCalled("pw", undefined, undefined, 50);
     });
@@ -252,7 +242,7 @@ describe("AppStringProcessor", function () {
 
             mockUiBridge.setPasswordToReturnForAttempt(1, "password");
 
-            const result = await runtime2.stringProcessor.processDeviceOnboardingReference(tokenResult.value.truncatedReference);
+            const result = await runtime2.stringProcessor.processDeviceOnboardingReference(tokenResult.value.reference.truncated);
             expect(result).toBeSuccessful();
             expect(result.value).toBeUndefined();
 
@@ -267,7 +257,7 @@ describe("AppStringProcessor", function () {
 
             mockUiBridge.setPasswordToReturnForAttempt(1, "password");
 
-            const result = await runtime2.stringProcessor.processDeviceOnboardingReference(tokenResult.value.truncatedReference);
+            const result = await runtime2.stringProcessor.processDeviceOnboardingReference(tokenResult.value.reference.truncated);
             expect(result).toBeSuccessful();
             expect(result.value).toBeUndefined();
 
@@ -423,7 +413,9 @@ describe("AppStringProcessor", function () {
 
         test("get a template using a url", async function () {
             const templateResult = await runtime1Session.transportServices.relationshipTemplates.createOwnRelationshipTemplate({
-                content: RelationshipTemplateContent.from({ onNewRelationship: { items: [AuthenticationRequestItem.from({ mustBeAccepted: false })] } }).toJSON(),
+                content: RelationshipTemplateContent.from({
+                    onNewRelationship: { items: [AuthenticationRequestItem.from({ mustBeAccepted: false, title: "anAuthentication" })] }
+                }).toJSON(),
                 expiresAt: CoreDate.utc().add({ days: 1 }).toISOString()
             });
             const template = templateResult.value;
@@ -439,7 +431,9 @@ describe("AppStringProcessor", function () {
 
         test("get a template using a url including forIdentity and passwordProtection", async function () {
             const templateResult = await runtime1Session.transportServices.relationshipTemplates.createOwnRelationshipTemplate({
-                content: RelationshipTemplateContent.from({ onNewRelationship: { items: [AuthenticationRequestItem.from({ mustBeAccepted: false })] } }).toJSON(),
+                content: RelationshipTemplateContent.from({
+                    onNewRelationship: { items: [AuthenticationRequestItem.from({ mustBeAccepted: false, title: "anAuthentication" })] }
+                }).toJSON(),
                 expiresAt: CoreDate.utc().add({ days: 1 }).toISOString(),
                 forIdentity: runtime4Session.account.address!,
                 passwordProtection: { password: "password" }
@@ -459,7 +453,9 @@ describe("AppStringProcessor", function () {
 
         test("get a template in a token using a url", async function () {
             const templateResult = await runtime1Session.transportServices.relationshipTemplates.createOwnRelationshipTemplate({
-                content: RelationshipTemplateContent.from({ onNewRelationship: { items: [AuthenticationRequestItem.from({ mustBeAccepted: false })] } }).toJSON(),
+                content: RelationshipTemplateContent.from({
+                    onNewRelationship: { items: [AuthenticationRequestItem.from({ mustBeAccepted: false, title: "anAuthentication" })] }
+                }).toJSON(),
                 expiresAt: CoreDate.utc().add({ days: 1 }).toISOString(),
                 forIdentity: runtime4Session.account.address!,
                 passwordProtection: { password: "password" }
@@ -485,7 +481,7 @@ describe("AppStringProcessor", function () {
             expect(runtime4MockUiBridge).showRequestCalled();
         });
 
-        test.each(["nmshd", "http"])("get file using a nmshd url with %s protocol", async function (replacement) {
+        test("get file using a url with http protocol", async function () {
             const fileResult = await runtime1Session.transportServices.files.uploadOwnFile({
                 filename: "aFileName",
                 content: new TextEncoder().encode("aFileContent"),
@@ -494,7 +490,7 @@ describe("AppStringProcessor", function () {
             });
             const file = fileResult.value;
 
-            const result = await runtime4.stringProcessor.processURL(file.reference.url.replace("https", replacement), runtime4Session.account);
+            const result = await runtime4.stringProcessor.processURL(file.reference.url.replace("https", "http"), runtime4Session.account);
             expect(result).toBeSuccessful();
             expect(result.value).toBeUndefined();
 

packages/app-runtime/test/runtime/Onboarding.test.ts

@@ -42,13 +42,13 @@ describe("Onboarding", function () {
             passwordProtection: { password: "aPassword" }
         });
 
-        const token = await runtime2.anonymousServices.tokens.loadPeerToken({ reference: recoveryKitResponse.value.truncatedReference, password: "aPassword" });
+        const token = await runtime2.anonymousServices.tokens.loadPeerToken({ reference: recoveryKitResponse.value.reference.truncated, password: "aPassword" });
         const deviceOnboardingDTO = DeviceMapper.toDeviceOnboardingInfoDTO(DeviceSharedSecret.from(token.value.content.sharedSecret));
 
         const result = await runtime2.accountServices.onboardAccount(deviceOnboardingDTO);
         expect(result.address!).toBe((await services1.transportServices.account.getIdentityInfo()).value.address);
 
-        const anonymousTokenResponse = await runtime2.anonymousServices.tokens.loadPeerToken({ reference: recoveryKitResponse.value.truncatedReference, password: "aPassword" });
+        const anonymousTokenResponse = await runtime2.anonymousServices.tokens.loadPeerToken({ reference: recoveryKitResponse.value.reference.truncated, password: "aPassword" });
         expect(anonymousTokenResponse).toBeAnError(
             "Token not found. Make sure the ID exists and the record is not expired. If a password is required to fetch the record, make sure you passed the correct one.",
             "error.runtime.recordNotFound"
@@ -63,7 +63,7 @@ describe("Onboarding", function () {
             passwordProtection: { password: "aPassword" }
         });
 
-        const token = await runtime3.anonymousServices.tokens.loadPeerToken({ reference: recoveryKitResponse.value.truncatedReference, password: "aPassword" });
+        const token = await runtime3.anonymousServices.tokens.loadPeerToken({ reference: recoveryKitResponse.value.reference.truncated, password: "aPassword" });
         const deviceOnboardingDTO = DeviceMapper.toDeviceOnboardingInfoDTO(DeviceSharedSecret.from(token.value.content.sharedSecret));
 
         const result = await runtime3.accountServices.onboardAccount(deviceOnboardingDTO);

packages/consumption/src/consumption/ConsumptionController.ts

@@ -4,7 +4,6 @@ import {
     CreateAttributeRequestItem,
     DeleteAttributeRequestItem,
     FormFieldRequestItem,
-    FreeTextRequestItem,
     OwnSharedAttributeDeletedByOwnerNotificationItem,
     PeerSharedAttributeDeletedByPeerNotificationItem,
     PeerSharedAttributeSucceededNotificationItem,
@@ -24,7 +23,6 @@ import {
     DeleteAttributeRequestItemProcessor,
     DraftsController,
     FormFieldRequestItemProcessor,
-    FreeTextRequestItemProcessor,
     GenericRequestItemProcessor,
     IdentityMetadataController,
     IncomingRequestsController,
@@ -162,7 +160,6 @@ export class ConsumptionController {
             [ConsentRequestItem, GenericRequestItemProcessor],
             [AuthenticationRequestItem, GenericRequestItemProcessor],
             [RegisterAttributeListenerRequestItem, RegisterAttributeListenerRequestItemProcessor],
-            [FreeTextRequestItem, FreeTextRequestItemProcessor],
             [FormFieldRequestItem, FormFieldRequestItemProcessor],
             [TransferFileOwnershipRequestItem, TransferFileOwnershipRequestItemProcessor]
         ]);

packages/consumption/src/consumption/ConsumptionCoreErrors.ts

@@ -273,6 +273,10 @@ class Attributes {
     public setDefaultRepositoryAttributesIsDisabled() {
         return new CoreError("error.consumption.attributes.setDefaultRepositoryAttributesIsDisabled", "Setting default RepositoryAttributes is disabled for this Account.");
     }
+
+    public invalidTags(tags: string[]): ApplicationError {
+        return new ApplicationError("error.consumption.attributes.invalidTags", `Detected invalidity of the following tags: '${tags.join("', '")}'.`);
+    }
 }
 
 class Requests {