@forge/cli

14.2.0-next.11-experimental-e03cc8514.2.0-next.19
out/service/extensions-service.js
~out/service/extensions-service.jsModified
+10−8
Index: package/out/service/extensions-service.js
===================================================================
--- package/out/service/extensions-service.js
+++ package/out/service/extensions-service.js
@@ -15,17 +15,17 @@
 })(ExtensionType || (ExtensionType = {}));
 class ExtensionsService {
     getAppConfig;
     appEnvironmentClient;
-    graphQLClient;
+    getTenantBasedGraphQLClient;
     installationsClient;
-    constructor(getAppConfig, appEnvironmentClient, graphQLClient, installationsClient) {
+    constructor(getAppConfig, appEnvironmentClient, getTenantBasedGraphQLClient, installationsClient) {
         this.getAppConfig = getAppConfig;
         this.appEnvironmentClient = appEnvironmentClient;
-        this.graphQLClient = graphQLClient;
+        this.getTenantBasedGraphQLClient = getTenantBasedGraphQLClient;
         this.installationsClient = installationsClient;
     }
-    async getExtensions({ appId, envId, contextId, filterExtensionTypes }) {
+    async getExtensions({ appId, envId, contextId, installation, filterExtensionTypes }) {
         const query = (0, cli_shared_1.graphql)(`
       query forge_cli_listDeployedWebtriggerExtensionKeys($contextId: ID!, $filter: [ExtensionContextsFilter!]!) {
         extensionContext(contextId: $contextId) {
           extensions(filter: $filter) {
@@ -46,22 +46,24 @@
         const variables = {
             contextId,
             filter
         };
-        const { extensionContext, requestId } = await this.graphQLClient.query(query, variables);
+        const graphQLClient = this.getTenantBasedGraphQLClient(installation);
+        const { extensionContext, requestId } = await graphQLClient.query(query, variables);
         if (extensionContext === undefined || extensionContext === null) {
             throw new DeployedExtensionWebTriggerListError(requestId);
         }
         return extensionContext.extensions.map((extension) => extension.key);
     }
     async getWebtriggerExtensions(installationId) {
         const { id: appId } = await this.getAppConfig();
-        const { environmentKey, context: contextId } = await this.installationsClient.getInstallation(appId, installationId);
-        const envId = await this.appEnvironmentClient.getAppEnvironmentId(appId, environmentKey);
+        const installation = await this.installationsClient.getInstallation(appId, installationId);
+        const envId = await this.appEnvironmentClient.getAppEnvironmentId(appId, installation.environmentKey);
         return await this.getExtensions({
             appId: ari_1.EcosystemAppAri.parse(appId).appId,
-            contextId,
+            contextId: installation.context,
             envId,
+            installation,
             filterExtensionTypes: [ExtensionType.WEB_TRIGGER]
         });
     }
 }