Make app Ids fully qualified

package.json

@@ -15,7 +15,7 @@
     "build-static": "npm run compile && npm run copy"
   },
   "dependencies": {
-    "@kite9/fdc3-get-agent": "file:../../FDC3/packages/fdc3-get-agent",
+    "@kite9/fdc3-get-agent": "^2.2.0-beta.29",
     "buffer": "^6.0.3",
     "chai": "^4.3.6",
     "fdc3_1_2": "npm:@finos/fdc3@^1.2.0",
@@ -41,4 +41,4 @@
     "webpack": "^5.69.1",
     "webpack-cli": "^4.9.2"
   }
-}
+}

src/mock/v2.0/general.ts

@@ -16,7 +16,7 @@ onFdc3Ready().then(async () => {
     type: "fdc3-conformance-opened",
   };
 
-  if (appId !== "MockAppId") {
+  if (appId !== "MockAppId@localhost") {
     appOpenedContext.errorMessage = `Incorrect appId retrieved from getInfo(). Expected MockAppId, got ${appId}`;
   }
 

src/test/common/control/open-control.ts

@@ -18,25 +18,25 @@ export interface OpenControl<X> {
 export const openApp = {
   a: {
     name: "IntentAppA",
-    id: "IntentAppAId",
+    id: "IntentAppAId@localhost",
   },
   b: {
     name: "MockApp",
-    id: "MockAppId",
+    id: "MockAppId@localhost",
   },
   c: {
     name: "IntentAppC",
-    id: "IntentAppCId",
+    id: "IntentAppCId@localhost",
   },
   d: {
-    id: "OpenAppAId",
+    id: "OpenAppAId@localhost",
   },
   e: {
-    id: "OpenAppBId",
+    id: "OpenAppBId@localhost",
   },
   f: {
     name: "IntentAppB",
-    id: "IntentAppBId",
+    id: "IntentAppBId@localhost",
   },
 };
 

src/test/v1.2/advanced/fdc3.raiseIntent-NoAppsFound.ts

@@ -34,7 +34,7 @@ export default () =>
           {
             type: ContextType.testContextY,
           },
-          { name: IntentApp.IntentAppA, appId: "IntentAppAId" }
+          { name: IntentApp.IntentAppA, appId: "IntentAppAId@localhost" }
         );
         assert.fail("Error was not thrown");
       } catch (ex) {

src/test/v1.2/advanced/fdc3.raiseIntent.ts

@@ -67,7 +67,7 @@ export default () =>
         {
           type: ContextType.testContextX,
         },
-        { name: IntentApp.IntentAppA, appId: "IntentAppAId" }
+        { name: IntentApp.IntentAppA, appId: "IntentAppAId@localhost" }
       );
       validateIntentResolution(IntentApp.IntentAppA, intentResolution);
       await result;

src/test/v1.2/support/intent-support-1.2.ts

@@ -11,7 +11,7 @@ export enum Intent {
 }
 
 export enum IntentApp {
-  IntentAppA = "IntentAppA",
-  IntentAppB = "IntentAppB",
-  IntentAppC = "IntentAppC",
+  IntentAppA = "IntentAppA@localhost",
+  IntentAppB = "IntentAppB@localhost",
+  IntentAppC = "IntentAppC@localhost",
 }

src/test/v2.0/support/channels-support-2.0.ts

@@ -70,7 +70,7 @@ export class ChannelControl2_0 implements ChannelControl<Channel, Context, Liste
     }
 
     //Open ChannelsApp then execute commands in order
-    await fdc3.open({ appId: "ChannelsAppId" }, buildChannelsAppContext(commands, channelsAppConfig));
+    await fdc3.open({ appId: "ChannelsAppId@localhost" }, buildChannelsAppContext(commands, channelsAppConfig));
   };
 
   async closeMockApp(testId: string) {

src/test/v2.0/support/intent-support-2.0.ts

@@ -205,18 +205,18 @@ export enum IntentResultType {
 }
 
 export enum IntentApp {
-  IntentAppA = "IntentAppAId",
-  IntentAppB = "IntentAppBId",
-  IntentAppC = "IntentAppCId",
-  IntentAppD = "IntentAppDId",
-  IntentAppE = "IntentAppEId",
-  IntentAppF = "IntentAppFId",
-  IntentAppG = "IntentAppGId",
-  IntentAppH = "IntentAppHId",
-  IntentAppI = "IntentAppIId",
-  IntentAppJ = "IntentAppJId",
-  IntentAppK = "IntentAppKId",
-  IntentAppL = "IntentAppLId",
+  IntentAppA = "IntentAppAId@localhost",
+  IntentAppB = "IntentAppBId@localhost",
+  IntentAppC = "IntentAppCId@localhost",
+  IntentAppD = "IntentAppDId@localhost",
+  IntentAppE = "IntentAppEId@localhost",
+  IntentAppF = "IntentAppFId@localhost",
+  IntentAppG = "IntentAppGId@localhost",
+  IntentAppH = "IntentAppHId@localhost",
+  IntentAppI = "IntentAppIId@localhost",
+  IntentAppJ = "IntentAppJId@localhost",
+  IntentAppK = "IntentAppKId@localhost",
+  IntentAppL = "IntentAppLId@localhost",
 }
 
 export enum ContextType {

src/test/v2.0/support/metadata-support-2.0.ts

@@ -41,25 +41,25 @@ export class MetadataFdc3Api {
     if (contextType) {
       return await fdc3.open(
         {
-          appId: "MetadataAppId",
+          appId: "MetadataAppId@localhost",
         },
         { type: contextType }
       );
     } else {
       return await fdc3.open({
-        appId: "MetadataAppId",
+        appId: "MetadataAppId@localhost",
       });
     }
   }
 
   async getAppInstances(): Promise<AppIdentifier[]> {
-    return await fdc3.findInstances({ appId: "MetadataAppId" });
+    return await fdc3.findInstances({ appId: "MetadataAppId@localhost" });
   }
 
   async getAppMetadata(appIdentifier?: AppIdentifier): Promise<AppMetadata> {
     if (!appIdentifier) {
       appIdentifier = {
-        appId: "MetadataAppId",
+        appId: "MetadataAppId@localhost",
       };
     }