@openfin/core 28.71.17 → 28.71.18

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfin/core",
-    "version": "28.71.17",
+    "version": "28.71.18",
     "license": "Apache-2.0",
     "main": "./src/mock.js",
     "types": "./src/mock.d.ts",

package/src/api/interop/InteropBroker.js

@@ -315,6 +315,9 @@ class InteropBroker extends base_1.Base {
         this.wire.sendAction('interop-broker-join-context-group').catch((e) => {
             // don't expose, analytics-only call
         });
+        if (this.sessionContextGroupMap.has(contextGroupId)) {
+            throw new Error(utils_1.BROKER_ERRORS.joinSessionContextGroupWithJoinContextGroup);
+        }
         if (target) {
             // If an endpointId is provided, use that. This will likely be used by external adapters.
             if (InteropBroker.hasEndpointId(target)) {

package/src/api/interop/fdc3/fdc3-1.2.js

@@ -160,7 +160,17 @@ class Fdc3Module extends base_1.Base {
         this.wire.sendAction('fdc3-join-channel').catch((e) => {
             // we do not want to expose this error, just continue if this analytics-only call fails
         });
-        this.fin.me.interop.joinContextGroup(channelId);
+        try {
+            await this.fin.me.interop.joinContextGroup(channelId);
+        }
+        catch (error) {
+            if (error.message === utils_2.BROKER_ERRORS.joinSessionContextGroupWithJoinContextGroup) {
+                throw new Error('The Channel you have tried to join is an App Channel. Custom Channels can only be defined by the Interop Broker through code or manifest configuration. Please use getOrCreateChannel.');
+            }
+            else {
+                throw new Error(error.message);
+            }
+        }
     }
     /**
      * Removes the specified target from a context group.

package/src/api/interop/utils.d.ts

@@ -8,5 +8,6 @@ export declare const BROKER_ERRORS: {
     fireIntentForContext: string;
     getInfoForIntent: string;
     getInfoForIntentsByContext: string;
+    joinSessionContextGroupWithJoinContextGroup: string;
 };
 export declare const wrapIntentHandler: (handler: OpenFin.IntentHandler, handlerId: string) => (intent: OpenFin.Intent) => Promise<void>;

package/src/api/interop/utils.js

@@ -32,7 +32,8 @@ exports.BROKER_ERRORS = {
     fireIntent: exports.generateOverrideError('fireIntent', 'handleFiredIntent'),
     fireIntentForContext: exports.generateOverrideError('fireIntentForContext', 'handleFiredIntentForContext'),
     getInfoForIntent: exports.generateOverrideError('getInfoForIntent', 'handleInfoForIntent'),
-    getInfoForIntentsByContext: exports.generateOverrideError('getInfoForIntentsByContext', 'handleInfoForIntentsByContext')
+    getInfoForIntentsByContext: exports.generateOverrideError('getInfoForIntentsByContext', 'handleInfoForIntentsByContext'),
+    joinSessionContextGroupWithJoinContextGroup: 'The Context Group you have tried to join is a Session Context Group. Custom Context Groups can only be defined by the Interop Broker through code or manifest configuration. Please use joinSessionContextGroup.'
 };
 exports.wrapIntentHandler = (handler, handlerId) => {
     return async (intent) => {