Merge branch 'main' into fix-vulnerable-deps

Author: kriswest

CHANGELOG.md

@@ -50,6 +50,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Updated Conformance tests to allow agents that fully qualify app Ids (as recommended in the Standard) to pass the conformance tests ([#1767](https://github.com/finos/FDC3/pull/1767))
 * Fixed import file extensions and module type to be esm module compliant ([#1677](https://github.com/finos/FDC3/pull/1677))
 * Added mising context types to types and enums in. ContextTypes.ts and implemented tests to ensure they stay in sync with the fdc3-context package ([#1796](https://github.com/finos/FDC3/pull/1796))
+* Allowed retrieval of User channels as App channels via getOrCreateChannel and getCurrentChannel in fdc3-web-impl. ([#1835](https://github.com/finos/FDC3/pull/1835))
 * Corrected description of UCBasic3 in the fdc-conformance framework implementation. ([#1823](https://github.com/finos/FDC3/pull/1823))
 * Fixed a race condition in fdc3-workbench's context store which caused the context listeners on user channels to miss replay of current context in some cases. ([#1823](https://github.com/finos/FDC3/pull/1823))
 * Fixed lint in the fdc3-workbench implementation. ([#1823](https://github.com/finos/FDC3/pull/1823))

toolbox/fdc3-for-web/fdc3-web-impl/src/handlers/BroadcastHandler.ts

@@ -540,16 +540,18 @@ export class BroadcastHandler implements MessageHandler {
       this.state.push(channel);
     }
 
-    if (channel.type != ChannelType.app) {
-      errorResponse(sc, arg0, from, ChannelError.AccessDenied, 'getOrCreateChannelResponse');
-    } else {
+    //only allow retrieval of app channels or user channels
+    if (channel.type == ChannelType.app || channel.type == ChannelType.user) {
       successResponse(
         sc,
         arg0,
         from,
-        { channel: { id: channel.id, type: channel.type } },
+        { channel: { id: channel.id, type: this.convertChannelTypeToString(channel.type) } },
         'getOrCreateChannelResponse'
       );
+    } else {
+      //block retrieval of private channels
+      errorResponse(sc, arg0, from, ChannelError.AccessDenied, 'getOrCreateChannelResponse');
     }
   }
 

toolbox/fdc3-for-web/fdc3-web-impl/test/features/broadcast.feature

@@ -33,6 +33,18 @@ Feature: Relaying Broadcast messages
       | contextListenerUnsubscribeResponse | App2     | a2            | {null}                   |
       | broadcastResponse                  | App1     | a1            | {null}                   |
 
+  Scenario: Retrieve an existing user channel via getOrCreateChannel
+    When "App1/a1" creates or gets an app channel called "one"
+    Then messaging will have outgoing posts
+      | msg.matches_type           | to.instanceId | msg.payload.channel.id | msg.payload.channel.type | msg.payload.error |
+      | getOrCreateChannelResponse | a1            | one                    | user                     | {null}            |
+
+  Scenario: Retrieve a new app channel via getOrCreateChannel
+    When "App1/a1" creates or gets an app channel called "myAppChannel"
+    Then messaging will have outgoing posts
+      | msg.matches_type           | to.instanceId | msg.payload.channel.id | msg.payload.channel.type | msg.payload.error |
+      | getOrCreateChannelResponse | a1            | myAppChannel           | app                      | {null}            |
+
   Scenario: Get The Latest Context From A Channel
     Given "App1/a1" broadcasts "fdc3.instrument" on "one"
     And "App1/a1" asks for the latest context on "one" with type "fdc3.instrument"

toolbox/fdc3-for-web/fdc3-web-impl/test/features/private-channel.feature

@@ -74,6 +74,14 @@ Feature: Relaying Private Channel Broadcast messages
       | msg.type                   | to.appId | to.instanceId | msg.payload.error |
       | getOrCreateChannelResponse | App2     | a2            | AccessDenied      |
 
+  Scenario: A newly created private channel cannot be retrieved via getOrCreateChannel
+    When "App1/a1" creates a private channel
+    And I refer to "uuid6" as "channel2Id"
+    And "App2/a2" creates or gets an app channel called "{channel2Id}"
+    Then messaging will have outgoing posts
+      | msg.type                   | to.appId | to.instanceId | msg.payload.error |
+      | getOrCreateChannelResponse | App2     | a2            | AccessDenied      |
+
   Scenario: Subscribe to a non-existent channel
     When "App2/a2" adds a context listener on "IDontExist" with type "fdc3.instrument"
     Then messaging will have outgoing posts

toolbox/fdc3-for-web/fdc3-web-impl/test/features/user-channels.feature

@@ -130,6 +130,16 @@ Feature: Relaying Private Channel Broadcast messages
       | {null}                | {null}                   | broadcastResponse | {null}                           | {null}                                |
       | {null}                | {null}                   | broadcastResponse | {null}                           | {null}                                |
 
+  Scenario: A user channel retrieved via getOrCreateChannel is the same channel
+    When "App/a1" joins user channel "one"
+    And "App/a1" adds a user-channel context listener with type "fdc3.instrument"
+    And "App2/a2" creates or gets an app channel called "one"
+    And "App2/a2" broadcasts "fdc3.instrument" on "one"
+    Then messaging will have outgoing posts
+      | msg.payload.channelId | msg.payload.context.type | msg.matches_type  | to.instanceId | msg.payload.originatingApp.appId | msg.payload.originatingApp.instanceId |
+      | one                   | fdc3.instrument          | broadcastEvent    | a1            | App2                             | a2                                    |
+      | {null}                | {null}                   | broadcastResponse | a2            | {null}                           | {null}                                |
+
   Scenario: You can get the details of the last context type when none is set
     When "App/a1" joins user channel "one"
     And "App/a1" gets the latest context on "one" with type "fdc3.instrument"