@forge/cli 0.0.0-experimental-819498d → 0.0.0-experimental-a9f00a0

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

@@ -21,7 +21,9 @@ 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 {
 }
@@ -40,22 +42,18 @@ export declare class InstallationsGraphqlClient implements InstallAppClient, Lis
     private readonly pause;
     static buildInstallationContext(product: string, cloudId: string): string;
     constructor(graphqlClient: GraphQLClient, pause: Pause);
-    installAppIntoSite({ environmentKey, site, product, appId }: AppInstallSiteDetails): Promise<{
-        installationId: string;
-    }>;
-    upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<{
-        installationId: string;
-    }>;
+    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,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;AAetD,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,+BAAgC,SAAQ,KAAK;CAAG;AAC7D,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;;;IAmDlF,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB;;;IA6CnF,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;YAwB1B,6BAA6B;YAqC7B,mBAAmB;YAsCnB,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":";AAAA,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;AAatD,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;AAeD,qBAAa,0BACX,YAAW,gBAAgB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,6BAA6B;IAK9F,OAAO,CAAC,QAAQ,CAAC,aAAa;IAAiB,OAAO,CAAC,QAAQ,CAAC,KAAK;WAJnE,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;gBAI1C,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,6BAA6B;YAI7B,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,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InstallationsGraphqlClient = exports.InvalidAtlassianSiteError = exports.UnknownSiteWithoutCloudIdError = exports.InstallationNotFoundError = exports.MissingAppUninstallTask = exports.MissingAppError = exports.MissingInstallationDetailsError = 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");
+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 cli_shared_1 = require("@forge/cli-shared");
 const cli_shared_2 = require("@forge/cli-shared");
 const cli_shared_3 = require("@forge/cli-shared");
@@ -36,9 +35,12 @@ exports.UpgradeError = UpgradeError;
 class EnvironmentNotFoundError extends Error {
 }
 exports.EnvironmentNotFoundError = EnvironmentNotFoundError;
-class MissingInstallationDetailsError extends Error {
+class MissingTaskIdError extends Error {
 }
-exports.MissingInstallationDetailsError = MissingInstallationDetailsError;
+exports.MissingTaskIdError = MissingTaskIdError;
+class InstallationRequestFailedError extends Error {
+}
+exports.InstallationRequestFailedError = InstallationRequestFailedError;
 class MissingAppError extends Error {
 }
 exports.MissingAppError = MissingAppError;
@@ -60,12 +62,6 @@ class InvalidAtlassianSiteError extends Error {
     }
 }
 exports.InvalidAtlassianSiteError = InvalidAtlassianSiteError;
-const tenantToHostname = (tenantInfo) => {
-    if (!tenantInfo) {
-        return null;
-    }
-    return tenantInfo.hostName || null;
-};
 const tenantContextsToCloudId = (url, contexts) => {
     if (!contexts.length) {
         throw new InvalidAtlassianSiteError(url);
@@ -82,27 +78,22 @@ class InstallationsGraphqlClient {
         this.pause = pause;
     }
     static buildInstallationContext(product, cloudId) {
-        const ari = new cs_ari_1.ResourceIdentifier({
-            resourceOwner: product.toLowerCase(),
-            resourceType: 'site',
-            resourceId: cloudId
-        });
-        return ari.toString();
+        return '';
     }
     async installAppIntoSite({ environmentKey, site, product, appId }) {
         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
+          taskId
           errors {
             message
             extensions {
               errorType
             }
           }
-          installationId
         }
       }
     `;
@@ -110,39 +101,40 @@ class InstallationsGraphqlClient {
             input: {
                 installationContext,
                 appId,
-                environmentKey
+                environmentKey,
+                async: true
             }
         };
-        const { response: { installApp: { success, installationId, errors } }, 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 (error.code === ALREADY_INSTALLED_CODE) {
                 throw new AlreadyInstalledError();
             }
             if (error.code === PERMISSION_DENIED) {
-                throw new PermissionDeniedError(requestId, cs_ari_1.parse(appId).resourceId);
+                throw new Error();
             }
             throw new InstallationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
-        if (!installationId) {
-            throw new MissingInstallationDetailsError(error.message);
+        if (!taskId) {
+            throw new MissingTaskIdError(error.message);
         }
-        return { installationId };
+        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
+          taskId
           errors {
             message
             extensions {
               errorType
             }
           }
-          installationId
         }
       }
     `;
@@ -150,22 +142,35 @@ class InstallationsGraphqlClient {
             input: {
                 installationContext,
                 appId,
-                environmentKey
+                environmentKey,
+                async: true
             }
         };
-        const { response: { upgradeApp: { success, installationId, errors } }, 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(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
-        if (!installationId) {
-            throw new MissingInstallationDetailsError(error.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 };
     }
     async uninstallApp(input) {
         const query = `
-      mutation uninstallApp($input: AppUninstallationInput!) {
+      mutation forge_cli_uninstallApplication($input: AppUninstallationInput!) {
         uninstallApp(input: $input) {
           success
           taskId
@@ -215,7 +220,7 @@ class InstallationsGraphqlClient {
     }
     async getAppInstallationTask(taskId) {
         const query = `
-      query appInstallationTask($id: ID!) {
+      query forge_cli_getInstallationTask($id: ID!) {
         appInstallationTask(id: $id) {
           state
           errors {
@@ -252,56 +257,12 @@ class InstallationsGraphqlClient {
         }
         return true;
     }
-    async createCloudIdToHostnameMap(cloudIds) {
-        const cloudIdToHostname = {};
-        const query = `
-      query tenantContexts($cloudIds: [ID!]!) {
-        tenantContexts(cloudIds: $cloudIds) {
-          hostName
-        }
-      }
-    `;
-        const result = await this.graphqlClient.query(query, {
-            cloudIds
-        });
-        const tenantContexts = result.tenantContexts || [];
-        cloudIds.forEach((cloudId, index) => {
-            const maybeHostname = tenantToHostname(tenantContexts[index]);
-            cloudIdToHostname[cloudId] = maybeHostname || cloudId;
-        });
-        return cloudIdToHostname;
-    }
     async resolveInstallationsHostnames(installations) {
-        if (!installations.length) {
-            return [];
-        }
-        const installationContexts = installations.map(({ installation }) => {
-            const context = cs_ari_1.parse(installation.installationContext);
-            const cloudId = context.resourceId;
-            if (!cloudId) {
-                throw new UnknownSiteWithoutCloudIdError();
-            }
-            return context;
-        });
-        const uniqueCloudIds = [...new Set(installationContexts.map((context) => context.resourceId))];
-        const cloudIdToHostname = await this.createCloudIdToHostnameMap(uniqueCloudIds);
-        return installationContexts.map((context, i) => {
-            const { environment, installation } = installations[i];
-            const site = cloudIdToHostname[context.resourceId];
-            return {
-                id: installation.id,
-                product: context.resourceOwner,
-                environmentKey: environment,
-                site,
-                version: installation.version || {
-                    isLatest: false
-                }
-            };
-        });
+        return [];
     }
     async getAllInstallations(appId) {
         const query = `
-      query app($id: ID!) {
+      query forge_cli_getApplicationInstallations($id: ID!) {
         app(id: $id) {
           environments {
             key
@@ -335,7 +296,7 @@ class InstallationsGraphqlClient {
     }
     async getCloudId(site) {
         const query = `
-      query tenantContexts($hostNames: [String!]) {
+      query forge_cli_getCloudIfForTenantContexts($hostNames: [String!]) {
         tenantContexts(hostNames: $hostNames) {
           cloudId
         }
@@ -347,24 +308,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

@@ -9,19 +9,13 @@ export interface TriggerAppSiteInstallDetails {
 export interface AppInstallSiteDetails extends TriggerAppSiteInstallDetails {
     appId: string;
 }
-export interface InstallationResult {
-    installationId: 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;
-        appName: string;
-    }>;
+    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,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;CACxB;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;;;;CAWrF"}
+{"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

@@ -7,14 +7,13 @@ class InstallAppSiteCommand {
         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
         });
-        return Object.assign({ appName }, result);
     }
 }
 exports.InstallAppSiteCommand = InstallAppSiteCommand;

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

@@ -2,7 +2,6 @@ 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;

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,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;IAa5D,YAAY,CACvB,eAAe,GAAE,MAAM,EAAO,EAC9B,iBAAiB,CAAC,EAAE,YAAY,EAAE,GACjC,OAAO,CAAC,kBAAkB,EAAE,CAAC;CA6BjC"}
+{"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,11 +7,10 @@ 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);
         const success = await this.client.uninstallApp({ appId, environmentKey, installationId, async: true });
         return {
-            appName,
             product,
             site,
             environmentKey,
@@ -19,7 +18,7 @@ class UninstallAppCommand {
         };
     }
     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;
@@ -34,7 +33,6 @@ class UninstallAppCommand {
             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"}

package/out/migration-keys/graphql-client.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphqlClient = void 0;
+const cli_shared_1 = require("@forge/cli-shared");
+class GraphqlClient {
+    constructor(graphqlClient) {
+        this.graphqlClient = graphqlClient;
+    }
+    async getLatestMigrationKeys(appId, environmentKey) {
+        var _a, _b;
+        const query = `
+          query forge_cli_getMigrationKeys($id: ID!, $key: String!) {
+            app(id: $id) {
+              environmentByKey(key: $key) {
+                id
+                versions(first: 1) {
+                  edges {
+                    node {
+                      isLatest
+                      migrationKeys {
+                        jira
+                        confluence
+                      }
+                    }
+                  }
+                }
+              }
+              marketplaceApp {
+                appKey
+              }
+            }
+          }
+     `;
+        const result = await this.graphqlClient.query(query, {
+            id: appId,
+            key: environmentKey
+        });
+        if (!result.app) {
+            throw new cli_shared_1.MissingAppError();
+        }
+        if (!result.app.environmentByKey) {
+            throw new cli_shared_1.MissingAppEnvironmentError();
+        }
+        const mpacAppKey = (_a = result.app.marketplaceApp) === null || _a === void 0 ? void 0 : _a.appKey;
+        const versions = result.app.environmentByKey.versions;
+        let migrationKeys;
+        for (const edge of (versions === null || versions === void 0 ? void 0 : versions.edges) || []) {
+            if (edge) {
+                migrationKeys = (_b = edge.node) === null || _b === void 0 ? void 0 : _b.migrationKeys;
+            }
+        }
+        return { migrationKeys, mpacAppKey };
+    }
+}
+exports.GraphqlClient = GraphqlClient;

package/out/providers/configure-provider.d.ts

@@ -0,0 +1,19 @@
+import { AppConfigProvider } from '@forge/cli-shared';
+export interface ProviderDetails {
+    environment: string;
+    providerKey: string;
+    clientSecret: string;
+}
+export interface AppProviderDetails extends ProviderDetails {
+    appId: string;
+}
+export interface ConfigureProviderClient {
+    configureProvider(details: AppProviderDetails): Promise<void>;
+}
+export declare class ConfigureProviderCommand {
+    private readonly client;
+    private readonly getAppConfig;
+    constructor(client: ConfigureProviderClient, getAppConfig: AppConfigProvider);
+    execute(details: ProviderDetails): Promise<void>;
+}
+//# sourceMappingURL=configure-provider.d.ts.map

package/out/providers/configure-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"configure-provider.d.ts","sourceRoot":"","sources":["../../src/providers/configure-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D;AAED,qBAAa,wBAAwB;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAA2B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAA9D,MAAM,EAAE,uBAAuB,EAAmB,YAAY,EAAE,iBAAiB;IAEjG,OAAO,CAAC,OAAO,EAAE,eAAe;CAO9C"}

package/out/providers/configure-provider.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfigureProviderCommand = void 0;
+class ConfigureProviderCommand {
+    constructor(client, getAppConfig) {
+        this.client = client;
+        this.getAppConfig = getAppConfig;
+    }
+    async execute(details) {
+        const { id: appId } = await this.getAppConfig();
+        await this.client.configureProvider(Object.assign(Object.assign({}, details), { appId }));
+    }
+}
+exports.ConfigureProviderCommand = ConfigureProviderCommand;

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

@@ -0,0 +1,12 @@
+import { GraphQLClient } from '@forge/cli-shared';
+import { AppProviderDetails, ConfigureProviderClient } from './configure-provider';
+export declare class MissingAppError extends Error {
+}
+export declare class MissingAppEnvironmentError extends Error {
+}
+export declare class GraphqlClient implements ConfigureProviderClient {
+    private readonly graphqlClient;
+    constructor(graphqlClient: GraphQLClient);
+    configureProvider(details: AppProviderDetails): Promise<void>;
+}
+//# sourceMappingURL=graphql-client.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/providers/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,aAAa,EAAwB,MAAM,mBAAmB,CAAC;AAElF,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEnF,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,0BAA2B,SAAQ,KAAK;CAAG;AAExD,qBAAa,aAAc,YAAW,uBAAuB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;CA0C3D"}

package/out/providers/graphql-client.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphqlClient = exports.MissingAppEnvironmentError = exports.MissingAppError = void 0;
+const cli_shared_1 = require("@forge/cli-shared");
+class MissingAppError extends Error {
+}
+exports.MissingAppError = MissingAppError;
+class MissingAppEnvironmentError extends Error {
+}
+exports.MissingAppEnvironmentError = MissingAppEnvironmentError;
+class GraphqlClient {
+    constructor(graphqlClient) {
+        this.graphqlClient = graphqlClient;
+    }
+    async configureProvider(details) {
+        const mutation = `
+      mutation forge_cli_setExternalAuthCredentials($input: SetExternalAuthCredentialsInput!) {
+        setExternalAuthCredentials(input: $input) {
+          success
+          errors {
+            message
+            extensions {
+              errorType
+            }
+          }
+        }
+      }
+    `;
+        const { response: { setExternalAuthCredentials: { success, errors } }, requestId } = await this.graphqlClient.mutate(mutation, {
+            input: {
+                environment: {
+                    appId: details.appId,
+                    key: details.environment
+                },
+                serviceKey: details.providerKey,
+                credentials: {
+                    clientSecret: details.clientSecret
+                }
+            }
+        });
+        const error = cli_shared_1.getError(errors);
+        if (!success) {
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
+        }
+    }
+}
+exports.GraphqlClient = GraphqlClient;

package/out/service/installation-service.d.ts

@@ -1,25 +1,26 @@
 /// <reference types="node" />
 import { AppConfigProvider, AppEnvironment } from '@forge/cli-shared';
-import { AppInstallSiteDetails } from '../installations/install-app-site';
 import { URL } from 'url';
+import { AppInstallSiteDetails } from '../installations/install-app-site';
 export interface Installation {
     id: string;
     product: string;
     site: string;
     environmentKey: string;
+    context: string;
     version: {
         isLatest: boolean;
     };
 }
 export interface AppInstallation {
-    name: string;
     installations: Installation[];
 }
-export interface AppUpgradeResult {
-    installationId: string;
+export interface AppEnvironmentVersionPermissions {
+    scopes: string[];
+    egressAddresses: string[];
 }
-export interface AlreadyUpgradedResult {
-    alreadyUpdated: true;
+export interface AppEnvironmentPermissions extends AppEnvironmentVersionPermissions {
+    addedScopes: string[];
 }
 interface InstallationFilterOptions {
     site?: string;
@@ -28,10 +29,10 @@ interface InstallationFilterOptions {
 }
 export interface ListAppInstallationsClient {
     listInstallations(appId: string): Promise<Installation[]>;
-    getScopes(appId: string, environmentKey: string): Promise<AppEnvironment['scopes']>;
+    getVersions(appId: string, environmentKey: string, firstN: number): Promise<AppEnvironment['versions']>;
 }
 export interface UpgradeAppInstallationsClient {
-    upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<AppUpgradeResult>;
+    upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<void>;
 }
 export declare class InstallationService {
     private readonly getAppConfig;
@@ -40,10 +41,11 @@ export declare class InstallationService {
     constructor(getAppConfig: AppConfigProvider, listInstallationsClient: ListAppInstallationsClient, upgradeAppInstallationsClient: UpgradeAppInstallationsClient);
     private filterInstallations;
     listAppInstallations(filter?: InstallationFilterOptions): Promise<AppInstallation>;
-    listNonIdentityAppInstallations(filter?: InstallationFilterOptions): Promise<AppInstallation>;
+    listNonTechnicalAppInstallations(filter?: InstallationFilterOptions): Promise<AppInstallation>;
     hasOutdatedProductInstallation(environment: string): Promise<boolean>;
-    upgradeInstallation(site: URL, product: string, environmentKey: string, appId: string): Promise<AppUpgradeResult | AlreadyUpgradedResult>;
-    getScopes(appId: string, environmentKey: string): Promise<string[] | null | undefined>;
+    upgradeInstallation(site: URL, product: string, environmentKey: string, appId: string): Promise<boolean>;
+    private getPermissionsFromAppEnvironmentVersion;
+    getAppEnvironmentPermissions(appId: string, environmentKey: string): Promise<AppEnvironmentPermissions | undefined>;
 }
 export {};
 //# sourceMappingURL=installation-service.d.ts.map