@forge/cli 0.0.0-experimental-383053a → 0.0.0-experimental-3b4aabe

package/out/installations/graphql-client.d.ts

@@ -1,11 +1,15 @@
 /// <reference types="node" />
 import { URL } from 'url';
-import { AppEnvironment, GraphQLClient, GraphQlMutationError } from '@forge/cli-shared';
+import { AppEnvironment, GraphQLClient, GraphQlMutationError, Pause } from '@forge/cli-shared';
 import { AppUninstallationInput } from '@forge/cli-shared';
 import { AppInstallSiteDetails, InstallAppClient } from './install-app-site';
 import { Installation, ListAppInstallationsClient, UpgradeAppInstallationsClient } from '../service/installation-service';
 import { UninstallAppClient, UninstallAppOutput } from './uninstall-app';
+export declare const UNINSTALLATION_EVENT_POLL_INTERVAL = 500;
 export declare const ALREADY_UPGRADED_CODE = "INSTALLATION_ALREADY_UPGRADED";
+export declare class PermissionDeniedError extends GraphQlMutationError {
+    constructor(requestId?: string, appId?: string);
+}
 export declare class AlreadyInstalledError extends GraphQlMutationError {
     constructor();
 }
@@ -17,10 +21,14 @@ export declare class UpgradeError extends GraphQlMutationError {
 }
 export declare class EnvironmentNotFoundError extends Error {
 }
-export declare class MissingInstallationDetailsError extends Error {
+export declare class MissingTaskIdError extends Error {
+}
+export declare class InstallationRequestFailedError extends Error {
 }
 export declare class MissingAppError extends Error {
 }
+export declare class MissingAppUninstallTask extends Error {
+}
 export declare class InstallationNotFoundError extends Error {
 }
 export declare class UnknownSiteWithoutCloudIdError extends Error {
@@ -31,24 +39,22 @@ export declare class InvalidAtlassianSiteError extends Error {
 }
 export declare class InstallationsGraphqlClient implements InstallAppClient, ListAppInstallationsClient, UninstallAppClient, UpgradeAppInstallationsClient {
     private readonly graphqlClient;
+    private readonly pause;
     static buildInstallationContext(product: string, cloudId: string): string;
-    constructor(graphqlClient: GraphQLClient);
-    installAppIntoSite({ environmentKey, site, product, appId }: AppInstallSiteDetails): Promise<{
-        installationId: string;
-        authorizationUrl: any;
-    }>;
-    upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<{
-        installationId: string;
-        authorizationUrl: string | null | undefined;
-    }>;
-    uninstallApp(input: AppUninstallationInput): Promise<void>;
+    constructor(graphqlClient: GraphQLClient, pause: Pause);
+    installAppIntoSite({ environmentKey, site, product, appId }: AppInstallSiteDetails): Promise<void>;
+    upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<void>;
+    private monitorAppInstallOrUpgrade;
+    uninstallApp(input: AppUninstallationInput): Promise<boolean>;
     uninstallMultipleApps(apps: AppUninstallationInput[]): Promise<Partial<UninstallAppOutput>[]>;
     listInstallations(appId: string): Promise<Installation[]>;
     getInstallation(appId: string, installationId: string): Promise<Installation>;
+    private getAppInstallationTask;
+    private monitorUninstallApp;
     private createCloudIdToHostnameMap;
     private resolveInstallationsHostnames;
     private getAllInstallations;
     private getCloudId;
-    getScopes(appId: string, environmentKey: string): Promise<AppEnvironment['scopes']>;
+    getVersions(appId: string, environmentKey: string, firstN?: number): Promise<AppEnvironment['versions']>;
 }
 //# sourceMappingURL=graphql-client.d.ts.map

package/out/installations/graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,oBAAoB,EAA0B,MAAM,mBAAmB,CAAC;AAChH,OAAO,EAEL,sBAAsB,EAOvB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAgBzE,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAIrE,qBAAa,qBAAsB,SAAQ,oBAAoB;;CAI9D;AAED,qBAAa,iBAAkB,SAAQ,oBAAoB;gBAC7C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,YAAa,SAAQ,oBAAoB;gBACxC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,wBAAyB,SAAQ,KAAK;CAAG;AACtD,qBAAa,+BAAgC,SAAQ,KAAK;CAAG;AAC7D,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,yBAA0B,SAAQ,KAAK;CAAG;AAEvD,qBAAa,8BAA+B,SAAQ,KAAK;;CAIxD;AAED,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,GAAG,EAAE,GAAG;CAGrB;AAuBD,qBAAa,0BACX,YAAW,gBAAgB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,6BAA6B;IAW9F,OAAO,CAAC,QAAQ,CAAC,aAAa;WAV5B,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;gBAU1C,aAAa,EAAE,aAAa;IAE5C,kBAAkB,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;;;;IAgDlF,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB;;;;IA4CnF,YAAY,CAAC,KAAK,EAAE,sBAAsB;IA4B1C,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAiB7F,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAKzD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAS5E,0BAA0B;YAwB1B,6BAA6B;YAqC7B,mBAAmB;YAoCnB,UAAU;IAgBX,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;CAsBjG"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EACL,cAAc,EAGd,aAAa,EACb,oBAAoB,EAEpB,KAAK,EACN,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,sBAAsB,EAQvB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,eAAO,MAAM,kCAAkC,MAAM,CAAC;AAgBtD,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAMrE,qBAAa,qBAAsB,SAAQ,oBAAoB;gBACjD,SAAS,SAAY,EAAE,KAAK,SAAY;CAGrD;AAED,qBAAa,qBAAsB,SAAQ,oBAAoB;;CAI9D;AAED,qBAAa,iBAAkB,SAAQ,oBAAoB;gBAC7C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,YAAa,SAAQ,oBAAoB;gBACxC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,wBAAyB,SAAQ,KAAK;CAAG;AACtD,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAChD,qBAAa,8BAA+B,SAAQ,KAAK;CAAG;AAC5D,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AACrD,qBAAa,yBAA0B,SAAQ,KAAK;CAAG;AAEvD,qBAAa,8BAA+B,SAAQ,KAAK;;CAIxD;AAED,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,GAAG,EAAE,GAAG;CAGrB;AAuBD,qBAAa,0BACX,YAAW,gBAAgB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,6BAA6B;IAW9F,OAAO,CAAC,QAAQ,CAAC,aAAa;IAAiB,OAAO,CAAC,QAAQ,CAAC,KAAK;WAVnE,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;gBAU1C,aAAa,EAAE,aAAa,EAAmB,KAAK,EAAE,KAAK;IAE3E,kBAAkB,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;IAoDlF,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB;YA8ClF,0BAA0B;IAe3B,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgC7D,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAmB7F,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAKzD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAS5E,sBAAsB;YA8BtB,mBAAmB;YAiBnB,0BAA0B;YAsC1B,6BAA6B;YAqC7B,mBAAmB;YAsCnB,UAAU;IAgBX,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;CAqCjH"}

package/out/installations/graphql-client.js

@@ -1,50 +1,65 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InstallationsGraphqlClient = exports.InvalidAtlassianSiteError = exports.UnknownSiteWithoutCloudIdError = exports.InstallationNotFoundError = exports.MissingAppError = exports.MissingInstallationDetailsError = exports.EnvironmentNotFoundError = exports.UpgradeError = exports.InstallationError = exports.AlreadyInstalledError = exports.ALREADY_UPGRADED_CODE = void 0;
+exports.InstallationsGraphqlClient = exports.InvalidAtlassianSiteError = exports.UnknownSiteWithoutCloudIdError = exports.InstallationNotFoundError = exports.MissingAppUninstallTask = exports.MissingAppError = exports.InstallationRequestFailedError = exports.MissingTaskIdError = exports.EnvironmentNotFoundError = exports.UpgradeError = exports.InstallationError = exports.AlreadyInstalledError = exports.PermissionDeniedError = exports.ALREADY_UPGRADED_CODE = exports.UNINSTALLATION_EVENT_POLL_INTERVAL = void 0;
 const cs_ari_1 = require("@forge/util/packages/cs-ari");
 const cli_shared_1 = require("@forge/cli-shared");
 const cli_shared_2 = require("@forge/cli-shared");
+const cli_shared_3 = require("@forge/cli-shared");
+exports.UNINSTALLATION_EVENT_POLL_INTERVAL = 500;
 exports.ALREADY_UPGRADED_CODE = 'INSTALLATION_ALREADY_UPGRADED';
 const ALREADY_INSTALLED_CODE = 'APP_ALREADY_INSTALLED';
+const PERMISSION_DENIED = 'PERMISSION_DENIED';
+class PermissionDeniedError extends cli_shared_1.GraphQlMutationError {
+    constructor(requestId = 'unknown', appId = 'unknown') {
+        super(cli_shared_3.Text.install.error.permissionsDeniedInstructions(requestId, appId), PERMISSION_DENIED);
+    }
+}
+exports.PermissionDeniedError = PermissionDeniedError;
 class AlreadyInstalledError extends cli_shared_1.GraphQlMutationError {
     constructor() {
-        super(cli_shared_2.Text.install.error.alreadyInstalledError, ALREADY_INSTALLED_CODE);
+        super(cli_shared_3.Text.install.error.alreadyInstalledError, ALREADY_INSTALLED_CODE);
     }
 }
 exports.AlreadyInstalledError = AlreadyInstalledError;
 class InstallationError extends cli_shared_1.GraphQlMutationError {
     constructor(message, code) {
-        super(cli_shared_2.Text.install.error.serverSideInstallationError(message), code);
+        super(cli_shared_3.Text.install.error.serverSideInstallationError(message), code);
     }
 }
 exports.InstallationError = InstallationError;
 class UpgradeError extends cli_shared_1.GraphQlMutationError {
     constructor(message, code) {
-        super(cli_shared_2.Text.upgrade.error.serverSideInstallationError(message), code);
+        super(cli_shared_3.Text.upgrade.error.serverSideInstallationError(message), code);
     }
 }
 exports.UpgradeError = UpgradeError;
 class EnvironmentNotFoundError extends Error {
 }
 exports.EnvironmentNotFoundError = EnvironmentNotFoundError;
-class MissingInstallationDetailsError extends Error {
+class MissingTaskIdError extends Error {
+}
+exports.MissingTaskIdError = MissingTaskIdError;
+class InstallationRequestFailedError extends Error {
 }
-exports.MissingInstallationDetailsError = MissingInstallationDetailsError;
+exports.InstallationRequestFailedError = InstallationRequestFailedError;
 class MissingAppError extends Error {
 }
 exports.MissingAppError = MissingAppError;
+class MissingAppUninstallTask extends Error {
+}
+exports.MissingAppUninstallTask = MissingAppUninstallTask;
 class InstallationNotFoundError extends Error {
 }
 exports.InstallationNotFoundError = InstallationNotFoundError;
 class UnknownSiteWithoutCloudIdError extends Error {
     constructor() {
-        super(cli_shared_2.Text.installList.noCloudId);
+        super(cli_shared_3.Text.installList.noCloudId);
     }
 }
 exports.UnknownSiteWithoutCloudIdError = UnknownSiteWithoutCloudIdError;
 class InvalidAtlassianSiteError extends Error {
     constructor(url) {
-        super(cli_shared_2.Text.install.error.invalidAtlassianSite(url));
+        super(cli_shared_3.Text.install.error.invalidAtlassianSite(url));
     }
 }
 exports.InvalidAtlassianSiteError = InvalidAtlassianSiteError;
@@ -65,8 +80,9 @@ const tenantContextsToCloudId = (url, contexts) => {
     return context.cloudId;
 };
 class InstallationsGraphqlClient {
-    constructor(graphqlClient) {
+    constructor(graphqlClient, pause) {
         this.graphqlClient = graphqlClient;
+        this.pause = pause;
     }
     static buildInstallationContext(product, cloudId) {
         const ari = new cs_ari_1.ResourceIdentifier({
@@ -80,15 +96,16 @@ class InstallationsGraphqlClient {
         const cloudId = await this.getCloudId(site);
         const installationContext = InstallationsGraphqlClient.buildInstallationContext(product, cloudId);
         const query = `
-      mutation installApp($input: AppInstallationInput!) {
+      mutation forge_cli_installApplication($input: AppInstallationInput!) {
         installApp(input: $input) {
           success
-          message
-          errorDetails {
-            code
+          taskId
+          errors {
+            message
+            extensions {
+              errorType
+            }
           }
-          installationId
-          authorizationUrl
         }
       }
     `;
@@ -96,34 +113,40 @@ class InstallationsGraphqlClient {
             input: {
                 installationContext,
                 appId,
-                environmentKey
+                environmentKey,
+                async: true
             }
         };
-        const { response: { installApp: { success, message, installationId, authorizationUrl, errorDetails } }, requestId } = await this.graphqlClient.mutate(query, variables);
+        const { response: { installApp: { success, taskId, errors } }, requestId } = await this.graphqlClient.mutate(query, variables);
+        const error = cli_shared_2.getError(errors);
         if (!success) {
-            if ((errorDetails === null || errorDetails === void 0 ? void 0 : errorDetails.code) === ALREADY_INSTALLED_CODE) {
+            if (error.code === ALREADY_INSTALLED_CODE) {
                 throw new AlreadyInstalledError();
             }
-            throw new InstallationError(`${message} (requestId: ${requestId || 'unknown'})`, errorDetails ? errorDetails.code : undefined);
+            if (error.code === PERMISSION_DENIED) {
+                throw new PermissionDeniedError(requestId, cs_ari_1.parse(appId).resourceId);
+            }
+            throw new InstallationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
-        if (!installationId) {
-            throw new MissingInstallationDetailsError(message);
+        if (!taskId) {
+            throw new MissingTaskIdError(error.message);
         }
-        return { installationId, authorizationUrl };
+        await this.monitorAppInstallOrUpgrade(taskId);
     }
     async upgradeInstallation({ site, product, environmentKey, appId }) {
         const cloudId = await this.getCloudId(site);
         const installationContext = InstallationsGraphqlClient.buildInstallationContext(product, cloudId);
         const query = `
-      mutation upgradeApp($input: AppInstallationUpgradeInput!) {
+      mutation forge_cli_upgradeApplication($input: AppInstallationUpgradeInput!) {
         upgradeApp(input: $input) {
           success
-          message
-          errorDetails {
-            code
+          taskId
+          errors {
+            message
+            extensions {
+              errorType
+            }
           }
-          installationId
-          authorizationUrl
         }
       }
     `;
@@ -131,41 +154,63 @@ class InstallationsGraphqlClient {
             input: {
                 installationContext,
                 appId,
-                environmentKey
+                environmentKey,
+                async: true
             }
         };
-        const { response: { upgradeApp: { success, message, installationId, authorizationUrl, errorDetails } }, requestId } = await this.graphqlClient.mutate(query, variables);
+        const { response: { upgradeApp: { success, errors, taskId } }, requestId } = await this.graphqlClient.mutate(query, variables);
+        const error = cli_shared_2.getError(errors);
         if (!success) {
-            throw new UpgradeError(`${message} (requestId: ${requestId || 'unknown'})`, errorDetails ? errorDetails.code : undefined);
+            throw new UpgradeError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
-        if (!installationId) {
-            throw new MissingInstallationDetailsError(message);
+        if (!taskId) {
+            throw new MissingTaskIdError(error.message);
+        }
+        await this.monitorAppInstallOrUpgrade(taskId);
+    }
+    async monitorAppInstallOrUpgrade(taskId) {
+        let status = cli_shared_1.AppTaskState.Pending;
+        while (status !== cli_shared_1.AppTaskState.Complete) {
+            const { state, errors } = await this.getAppInstallationTask(taskId);
+            status = state;
+            if (status === cli_shared_1.AppTaskState.Failed) {
+                throw new InstallationRequestFailedError((errors === null || errors === void 0 ? void 0 : errors[0].message) || undefined);
+            }
+            if (status !== cli_shared_1.AppTaskState.Complete)
+                await this.pause(exports.UNINSTALLATION_EVENT_POLL_INTERVAL);
         }
-        return { installationId, authorizationUrl };
     }
     async uninstallApp(input) {
         const query = `
-      mutation uninstallApp($input: AppUninstallationInput!) {
+      mutation forge_cli_uninstallApplication($input: AppUninstallationInput!) {
         uninstallApp(input: $input) {
           success
-          message
-          errorDetails {
-            code
+          taskId
+          errors {
+            message
+            extensions {
+              errorType
+            }
           }
         }
       }
     `;
-        const { response: { uninstallApp: { success, message, errorDetails } }, requestId } = await this.graphqlClient.mutate(query, { input });
+        const { response: { uninstallApp: { success, errors, taskId } }, requestId } = await this.graphqlClient.mutate(query, { input });
+        const error = cli_shared_2.getError(errors);
         if (!success) {
-            throw new cli_shared_1.GraphQlMutationError(`${message} (requestId: ${requestId || 'unknown'})`, errorDetails ? errorDetails.code : undefined);
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
+        return this.monitorUninstallApp(taskId);
     }
     async uninstallMultipleApps(apps) {
         const uninstallsResult = [];
         for (const app of apps) {
             try {
-                await Promise.all([this.uninstallApp(app), new Promise((resolve) => setTimeout(resolve, 1000))]);
-                uninstallsResult.push(Object.assign(Object.assign({}, app), { successful: true }));
+                const [success] = await Promise.all([
+                    this.uninstallApp(app),
+                    new Promise((resolve) => setTimeout(resolve, 1000))
+                ]);
+                uninstallsResult.push(Object.assign(Object.assign({}, app), { successful: success }));
             }
             catch (err) {
                 uninstallsResult.push(Object.assign(Object.assign({}, app), { successful: false }));
@@ -183,21 +228,65 @@ class InstallationsGraphqlClient {
         if (matchedInstallation) {
             return matchedInstallation;
         }
-        throw new InstallationNotFoundError(cli_shared_2.Text.installationId.errors.notFound(installationId));
+        throw new InstallationNotFoundError(cli_shared_3.Text.installationId.errors.notFound(installationId));
+    }
+    async getAppInstallationTask(taskId) {
+        const query = `
+      query forge_cli_getInstallationTask($id: ID!) {
+        appInstallationTask(id: $id) {
+          state
+          errors {
+            message
+            extensions {
+              errorType
+            }
+          }
+        }
+      }
+    `;
+        const { appInstallationTask } = await this.graphqlClient.query(query, {
+            id: taskId
+        });
+        if (!appInstallationTask) {
+            throw new MissingAppUninstallTask(cli_shared_3.Text.uninstall.missingUninstallTask);
+        }
+        const { state, errors } = appInstallationTask;
+        return {
+            errors,
+            state
+        };
+    }
+    async monitorUninstallApp(taskId) {
+        let status = cli_shared_1.AppTaskState.Pending;
+        while (status !== cli_shared_1.AppTaskState.Complete) {
+            const { state } = await this.getAppInstallationTask(taskId);
+            status = state;
+            if (status === cli_shared_1.AppTaskState.Failed) {
+                return false;
+            }
+            if (status !== cli_shared_1.AppTaskState.Complete)
+                await this.pause(exports.UNINSTALLATION_EVENT_POLL_INTERVAL);
+        }
+        return true;
     }
     async createCloudIdToHostnameMap(cloudIds) {
-        const cloudIdToHostname = {};
+        const MAX_CLOUD_IDS_AT_ONCE = 20;
+        const cloudIdsChunks = [];
+        for (let i = 0; i < cloudIds.length; i += MAX_CLOUD_IDS_AT_ONCE) {
+            cloudIdsChunks.push(cloudIds.slice(i, i + MAX_CLOUD_IDS_AT_ONCE));
+        }
         const query = `
-      query tenantContexts($cloudIds: [ID!]!) {
+      query forge_cli_getHostnameForTenantContexts($cloudIds: [ID!]!) {
         tenantContexts(cloudIds: $cloudIds) {
           hostName
         }
       }
     `;
-        const result = await this.graphqlClient.query(query, {
-            cloudIds
-        });
-        const tenantContexts = result.tenantContexts || [];
+        const results = await Promise.all(cloudIdsChunks.map((cloudIdsChunk) => this.graphqlClient.query(query, {
+            cloudIds: cloudIdsChunk
+        })));
+        const tenantContexts = [].concat(...results.map((result) => result.tenantContexts || []));
+        const cloudIdToHostname = {};
         cloudIds.forEach((cloudId, index) => {
             const maybeHostname = tenantToHostname(tenantContexts[index]);
             cloudIdToHostname[cloudId] = maybeHostname || cloudId;
@@ -225,6 +314,7 @@ class InstallationsGraphqlClient {
                 id: installation.id,
                 product: context.resourceOwner,
                 environmentKey: environment,
+                context: installation.installationContext,
                 site,
                 version: installation.version || {
                     isLatest: false
@@ -234,7 +324,7 @@ class InstallationsGraphqlClient {
     }
     async getAllInstallations(appId) {
         const query = `
-      query app($id: ID!) {
+      query forge_cli_getApplicationInstallations($id: ID!) {
         app(id: $id) {
           environments {
             key
@@ -255,18 +345,20 @@ class InstallationsGraphqlClient {
         }
         const output = [];
         for (const { key, installations } of result.app.environments) {
-            for (const installation of installations) {
-                output.push({
-                    environment: key,
-                    installation
-                });
+            if (installations) {
+                for (const installation of installations) {
+                    output.push({
+                        environment: key,
+                        installation
+                    });
+                }
             }
         }
         return output;
     }
     async getCloudId(site) {
         const query = `
-      query tenantContexts($hostNames: [String!]) {
+      query forge_cli_getCloudIfForTenantContexts($hostNames: [String!]) {
         tenantContexts(hostNames: $hostNames) {
           cloudId
         }
@@ -278,24 +370,39 @@ class InstallationsGraphqlClient {
         const tenantContexts = result.tenantContexts || [];
         return tenantContextsToCloudId(site, tenantContexts);
     }
-    async getScopes(appId, environmentKey) {
+    async getVersions(appId, environmentKey, firstN = 1) {
         const query = `
-      query app($appId: ID!, $environmentKey: String!) {
+      query forge_cli_getApplicationEnvironmentLatestVersions($appId: ID!, $environmentKey: String!, $firstN: Int!) {
         app(id: $appId) {
           environmentByKey(key: $environmentKey) {
-            scopes
+            versions(first: $firstN) {
+              nodes {
+                permissions {
+                  egress {
+                    addresses
+                  }
+                  scopes {
+                    key
+                  }
+                }
+              }
+            }
           }
         }
       }
     `;
-        const result = await this.graphqlClient.query(query, { appId, environmentKey });
+        const result = await this.graphqlClient.query(query, {
+            appId,
+            environmentKey,
+            firstN
+        });
         if (!result.app) {
             throw new MissingAppError();
         }
         if (!result.app.environmentByKey) {
             throw new EnvironmentNotFoundError();
         }
-        return result.app.environmentByKey.scopes;
+        return result.app.environmentByKey.versions;
     }
 }
 exports.InstallationsGraphqlClient = InstallationsGraphqlClient;

package/out/installations/install-app-site.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 import { URL } from 'url';
 import { AppConfigProvider } from '@forge/cli-shared';
-export declare const REDIRECT_URL_3LO = "https://cli-3lo--app.ap-southeast-2.dev.public.atl-paas.net/result.html";
 export interface TriggerAppSiteInstallDetails {
     site: URL;
     product: string;
@@ -10,22 +9,13 @@ export interface TriggerAppSiteInstallDetails {
 export interface AppInstallSiteDetails extends TriggerAppSiteInstallDetails {
     appId: string;
 }
-export interface InstallationResult {
-    installationId: string;
-    authorizationUrl?: string;
-}
 export interface InstallAppClient {
-    installAppIntoSite(appInstallDetails: AppInstallSiteDetails): Promise<InstallationResult>;
+    installAppIntoSite(appInstallDetails: AppInstallSiteDetails): Promise<void>;
 }
 export declare class InstallAppSiteCommand {
     private readonly getAppConfig;
     private readonly installAppClient;
     constructor(getAppConfig: AppConfigProvider, installAppClient: InstallAppClient);
-    execute({ environmentKey, site, product }: TriggerAppSiteInstallDetails): Promise<{
-        installationId: string;
-        authorizationUrl?: string | undefined;
-        appName: string;
-    }>;
-    private addRedirectUrl;
+    execute({ environmentKey, site, product }: TriggerAppSiteInstallDetails): Promise<void>;
 }
 //# sourceMappingURL=install-app-site.d.ts.map

package/out/installations/install-app-site.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install-app-site.d.ts","sourceRoot":"","sources":["../../src/installations/install-app-site.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,4EAA4E,CAAC;AAE1G,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,qBAAsB,SAAQ,4BAA4B;IACzE,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,CAAC,iBAAiB,EAAE,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;CAC3F;AAED,qBAAa,qBAAqB;IACpB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAAqB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAlE,YAAY,EAAE,iBAAiB,EAAmB,gBAAgB,EAAE,gBAAgB;IAEpG,OAAO,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,4BAA4B;;;;;IAgBpF,OAAO,CAAC,cAAc;CAMvB"}
+{"version":3,"file":"install-app-site.d.ts","sourceRoot":"","sources":["../../src/installations/install-app-site.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,qBAAsB,SAAQ,4BAA4B;IACzE,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,CAAC,iBAAiB,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7E;AAED,qBAAa,qBAAqB;IACpB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAAqB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAlE,YAAY,EAAE,iBAAiB,EAAmB,gBAAgB,EAAE,gBAAgB;IAEpG,OAAO,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,4BAA4B;CASrF"}

package/out/installations/install-app-site.js

@@ -1,30 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InstallAppSiteCommand = exports.REDIRECT_URL_3LO = void 0;
-const url_1 = require("url");
-exports.REDIRECT_URL_3LO = 'https://cli-3lo--app.ap-southeast-2.dev.public.atl-paas.net/result.html';
+exports.InstallAppSiteCommand = void 0;
 class InstallAppSiteCommand {
     constructor(getAppConfig, installAppClient) {
         this.getAppConfig = getAppConfig;
         this.installAppClient = installAppClient;
     }
     async execute({ environmentKey, site, product }) {
-        const { id: appId, name: appName } = await this.getAppConfig();
-        const result = await this.installAppClient.installAppIntoSite({
+        const { id: appId } = await this.getAppConfig();
+        return await this.installAppClient.installAppIntoSite({
             appId,
             environmentKey,
             site,
             product
         });
-        if (result.authorizationUrl) {
-            result.authorizationUrl = this.addRedirectUrl(result.authorizationUrl);
-        }
-        return Object.assign({ appName }, result);
-    }
-    addRedirectUrl(authorizationUrl) {
-        const url = new url_1.URL(authorizationUrl);
-        url.searchParams.append('redirectUrl', exports.REDIRECT_URL_3LO);
-        return url.toString();
     }
 }
 exports.InstallAppSiteCommand = InstallAppSiteCommand;

package/out/installations/uninstall-app.d.ts

@@ -2,16 +2,18 @@ import { AppConfigProvider } from '@forge/cli-shared';
 import { AppUninstallationInput } from '@forge/cli-shared';
 import { Installation } from '../service/installation-service';
 export interface UninstallAppOutput {
-    appName: string;
     product: string;
     site: string;
     environmentKey: string;
     successful?: boolean;
 }
+export interface AsyncAppUninstallationInput extends AppUninstallationInput {
+    async: true;
+}
 export interface UninstallAppClient {
-    uninstallApp(input: AppUninstallationInput): Promise<void>;
-    uninstallMultipleApps(input: AppUninstallationInput[]): Promise<Partial<UninstallAppOutput>[]>;
     getInstallation(appId: string, installationId: string): Promise<Installation>;
+    uninstallApp(input: AsyncAppUninstallationInput): Promise<boolean>;
+    uninstallMultipleApps(input: AsyncAppUninstallationInput[]): Promise<Partial<UninstallAppOutput>[]>;
 }
 export declare class UninstallAppCommand {
     private readonly getAppConfig;

package/out/installations/uninstall-app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uninstall-app.d.ts","sourceRoot":"","sources":["../../src/installations/uninstall-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,qBAAqB,CAAC,KAAK,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;IAC/F,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/E;AAED,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAAqB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAxD,YAAY,EAAE,iBAAiB,EAAmB,MAAM,EAAE,kBAAkB;IAE5F,OAAO,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAY5D,YAAY,CACvB,eAAe,GAAE,MAAM,EAAO,EAC9B,iBAAiB,CAAC,EAAE,YAAY,EAAE,GACjC,OAAO,CAAC,kBAAkB,EAAE,CAAC;CA4BjC"}
+{"version":3,"file":"uninstall-app.d.ts","sourceRoot":"","sources":["../../src/installations/uninstall-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,2BAA4B,SAAQ,sBAAsB;IACzE,KAAK,EAAE,IAAI,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9E,YAAY,CAAC,KAAK,EAAE,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnE,qBAAqB,CAAC,KAAK,EAAE,2BAA2B,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;CACrG;AAED,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAAqB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAxD,YAAY,EAAE,iBAAiB,EAAmB,MAAM,EAAE,kBAAkB;IAE5F,OAAO,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAY5D,YAAY,CACvB,eAAe,GAAE,MAAM,EAAO,EAC9B,iBAAiB,CAAC,EAAE,YAAY,EAAE,GACjC,OAAO,CAAC,kBAAkB,EAAE,CAAC;CA4BjC"}

package/out/installations/uninstall-app.js

@@ -7,18 +7,18 @@ class UninstallAppCommand {
         this.client = client;
     }
     async execute(installationId) {
-        const { id: appId, name: appName } = await this.getAppConfig();
+        const { id: appId } = await this.getAppConfig();
         const { product, site, environmentKey } = await this.client.getInstallation(appId, installationId);
-        await this.client.uninstallApp({ appId, environmentKey, installationId });
+        const success = await this.client.uninstallApp({ appId, environmentKey, installationId, async: true });
         return {
-            appName,
             product,
             site,
-            environmentKey
+            environmentKey,
+            successful: success
         };
     }
     async batchExecute(installationIds = [], installationInfos) {
-        const { id: appId, name: appName } = await this.getAppConfig();
+        const { id: appId } = await this.getAppConfig();
         let appsInstallInfo;
         if (installationInfos && installationInfos.length) {
             appsInstallInfo = installationInfos;
@@ -29,10 +29,10 @@ class UninstallAppCommand {
         const uninstallOutput = await this.client.uninstallMultipleApps(appsInstallInfo.map((installInfo) => ({
             appId,
             environmentKey: installInfo.environmentKey,
-            installationId: installInfo.id
+            installationId: installInfo.id,
+            async: true
         })));
         return appsInstallInfo.map(({ product, site, environmentKey }, index) => ({
-            appName,
             product,
             site,
             environmentKey,

package/out/migration-keys/graphql-client.d.ts

@@ -0,0 +1,8 @@
+import { GraphQLClient } from '@forge/cli-shared';
+import { AppEnvironmentMigrationKeys } from '../service/migration-keys-service';
+export declare class GraphqlClient {
+    private readonly graphqlClient;
+    constructor(graphqlClient: GraphQLClient);
+    getLatestMigrationKeys(appId: string, environmentKey: string): Promise<AppEnvironmentMigrationKeys>;
+}
+//# sourceMappingURL=graphql-client.d.ts.map

package/out/migration-keys/graphql-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/migration-keys/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+C,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAChF,qBAAa,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;CA+CjH"}