@forge/cli-shared 0.0.0-experimental-9489df9 → 0.0.0-experimental-52c2a24

package/out/ui/text.js

@@ -7,14 +7,18 @@ const terminal_link_1 = tslib_1.__importDefault(require("terminal-link"));
 const case_1 = require("case");
 const log_symbols_1 = tslib_1.__importDefault(require("./log-symbols"));
 const log_color_1 = require("./log-color");
-const reinstallCmd = chalk_1.default.bold('npm install -g @forge/cli');
 const ctrlC = 'Press Ctrl+C to cancel.';
+const gettingStartedDACLink = 'https://go.atlassian.com/dac/platform/forge/getting-started/#log-in-with-an-atlassian-api-token';
 const encryptedValue = '****';
 const greenTick = `${chalk_1.default.bold(chalk_1.default.green('✔'))}`;
-const buildTerminalLink = (text) => terminal_link_1.default(chalk_1.default.bold(text), text, { fallback: () => chalk_1.default.underline.bold(text) });
+const buildTerminalLink = (text) => (0, terminal_link_1.default)(chalk_1.default.bold(text), text, { fallback: () => chalk_1.default.underline.bold(text) });
+const autoSpaceSentences = (...sentences) => sentences
+    .filter((sentence) => sentence.length > 0)
+    .join(' ');
 const fatalError = (message) => chalk_1.default.bold(chalk_1.default.red(message));
 const keytarAccessErrorBase = (message) => `Keytar error detected: ${message}`;
-exports.capitalise = (word) => word.charAt(0).toUpperCase() + word.slice(1);
+const capitalise = (word) => word.charAt(0).toUpperCase() + word.slice(1);
+exports.capitalise = capitalise;
 const getLintMessage = (line, column, message, level, colourFunction, reference) => `${chalk_1.default.dim(`${line}:${column}`.padEnd(7))} ${colourFunction(level.padEnd(8))} ${message}  ${chalk_1.default.dim(reference)}\n`;
 const checkLintTotalPlurals = (numErrors, numWarnings, numFixableErrors, numFixableWarnings) => ({
     pluralCheckedErrors: `${numErrors} ${numErrors === 1 ? 'error' : 'errors'}`,
@@ -23,13 +27,20 @@ const checkLintTotalPlurals = (numErrors, numWarnings, numFixableErrors, numFixa
     pluralCheckedFixableErrors: `${numFixableErrors} ${numFixableErrors === 1 ? 'error' : 'errors'}`,
     pluralCheckedFixableWarnings: `${numFixableWarnings} ${numFixableWarnings === 1 ? 'warning' : 'warnings'}`
 });
+const platformKeytarRecommendations = () => {
+    switch (process.platform) {
+        case 'darwin':
+            return 'Ensure you enable access to the macOS keychain when prompted.';
+        case 'linux':
+            return `Ensure you have ${chalk_1.default.bold('libsecret')} installed.`;
+        default:
+            return '';
+    }
+};
 exports.Text = {
     error: {
-        noKeytar: "The Forge CLI couldn't load the library for securely storing your login credentials. " +
-            (process.platform !== 'linux'
-                ? `Make sure you have libsecret, then install the CLI again with ${reinstallCmd}.`
-                : `To fix this, install the CLI again with ${reinstallCmd}.`),
-        noTokenInKeytarOrCache: `Not logged in. Run ${chalk_1.default.bold('forge login')} before trying again.`,
+        noKeytar: autoSpaceSentences(`The CLI couldn't securely store your login credentials in a local keychain.`, platformKeytarRecommendations(), `If a local keychain is not available, use environment variables before trying again. See ${buildTerminalLink(gettingStartedDACLink)} for more.`),
+        noTokenStored: `Not logged in. If a local keychain is available, run ${chalk_1.default.bold('forge login')}, otherwise set environment variables before trying again. See ${buildTerminalLink(gettingStartedDACLink)} for more.`,
         keytarAccessError: {
             other: (message) => keytarAccessErrorBase(message),
             mac: (message) => keytarAccessErrorBase(message) +
@@ -43,7 +54,7 @@ exports.Text = {
         outdatedNodeVersion: (compatibleNodeVersion, currentNodeVersion) => fatalError(`Unsupported Node.js version. The CLI requires Node.js ${compatibleNodeVersion}, but you're using Node.js ${currentNodeVersion}.`),
         invalidProduct: 'Invalid product. Rerun the command with a valid product.',
         invalidSite: 'The site you entered is not an Atlassian site. Rerun the command with the URL to an Atlassian site to install the app.',
-        invalidTokenInKeytarOrCache: `Your API token is no longer valid. Run ${chalk_1.default.bold('forge login')} to reset your login credentials.`,
+        invalidTokenInKeytar: `Your API token is no longer valid. Run ${chalk_1.default.bold('forge login')} to reset your login credentials.`,
         invalidTokenInEnv: (instructionsUrl, emailVar, tokenVar) => `The API token on your machine is no longer valid.` +
             `\n    1) Get a new API token: ${instructionsUrl}` +
             `\n    2) Set your email and the token to ${emailVar} and ${tokenVar} environment variables.`,
@@ -53,11 +64,15 @@ exports.Text = {
         resourceDefinitionMissing: (resourceKeys) => `The following resources are declared but are improperly defined in the manifest.yml file:\n - ${resourceKeys.join('\n - ')}`,
         resourceDirectoryMissing: (resourceKey, directory) => `Resource ${resourceKey} at: ${directory} not found`,
         resourceDirectoryEmpty: (resourceKey, directory) => `Resource ${resourceKey} at: ${directory} is an empty directory`,
-        templateFetchFailed: 'Failed to fetch templates, try running the command again.'
+        templateFetchFailed: 'Failed to fetch templates, try running the command again.',
+        handlerFormat: (handler) => `Function handler "${handler}" must be in format <module>.<function>, example: index.run`
     },
     warning: {
-        unsupportedNodeVersion: (userNodeVersion) => log_color_1.LogColor.warn(`Warning: Forge CLI currently supports Active LTS or Maintenance LTS releases of Node.js only. ` +
-            `\nUpdate Node.js from version ${chalk_1.default.bold(userNodeVersion)} to an LTS release to continue using Forge CLI.` +
+        plaintextCredentialsFound: (url) => `Your credentials were stored in plaintext by a previous version of the Forge CLI. For additional security, revoke your existing API token by visting this URL ${buildTerminalLink(url)}.`,
+        plaintextCredentialsMigrated: 'The credentials found in plaintext have been migrated to your local keychain.',
+        plaintextCredentialsNotMigrated: autoSpaceSentences(`The CLI couldn't securely store your login credentials in a local keychain.`, platformKeytarRecommendations(), `If a local keychain is not available, use environment variables instead. See ${buildTerminalLink(gettingStartedDACLink)} for more information.`),
+        unsupportedNodeVersion: (userNodeVersion, supportedNodeVersions) => log_color_1.LogColor.warn(`Warning: Forge CLI requires Node.js ${supportedNodeVersions} installed. ` +
+            `\nUpdate Node.js from version ${chalk_1.default.bold(userNodeVersion)} to a supported Node.js version to continue using Forge CLI.` +
             `\nLearn more about LTS releases at https://nodejs.org/en/about/releases. ` +
             `\n`)
     },
@@ -65,7 +80,8 @@ exports.Text = {
         overviewProduct: 'Select the product your app uses.\n',
         promptProduct: 'Select a product:',
         overviewSite: '\nEnter your site. For example, your-domain.atlassian.net\n',
-        promptSite: 'Enter the site URL:'
+        promptSite: 'Enter the site URL:',
+        promptWorkspace: 'Enter the workspace URL:'
     },
     upgradeContext: {
         overview: `To upgrade your app to use the latest scopes, select it from the list.\n${ctrlC}`,
@@ -74,12 +90,11 @@ exports.Text = {
     optionSite: 'site URL (example.atlassian.net)',
     optionProduct: (supportedProducts) => `product (${supportedProducts.join(', ')})`,
     optionVerbose: 'enable verbose mode',
+    optionJson: 'output results in JSON format',
     invalidCmd: (command) => `’${command}’ is not a Forge command.`,
     invalidCmdHelp: `Run ${chalk_1.default.bold('forge --help')} to see the full list of available commands.`,
-    extraArguments: (commandName) => `Unexpected argument. Run ${chalk_1.default.bold(`forge ${commandName} --help`)} for a list of available arguments.`,
     rerunningWithVerbose: 'Rerunning the command with --verbose may give more details.',
     ctrlC,
-    deprecate: (newCommand) => `This command is deprecated. Consider using "${newCommand}" command instead.`,
     graphQL: {
         request: (url, query, variables) => `▶️  GraphQL ${url}\nQuery: ${query}\nVariables: ${variables}`,
         response: (result, requestId) => `◀️  GraphQL\nRequest ID: ${requestId || 'unknown'}\nResult: ${result}`,
@@ -288,6 +303,49 @@ What do you like or don't like about Forge? Share your feedback below or press C
         optionClientSecret: 'client secret',
         promptClientSecret: 'Enter the client secret:'
     },
+    contributors: {
+        desc: 'manage who has access to your app'
+    },
+    addContributor: {
+        cmd: {
+            desc: 'add a new contributor to your app',
+            start: 'Adding contributor to your app',
+            success: 'If an Atlassian account is associated with this email address, they can now access your app.'
+        },
+        overview: 'Adding a new contributor to your app',
+        optionSkipConfirmation: 'skip confirmation of email before adding a new contributor to the app',
+        optionContributorEmail: 'email address associated with Atlassian account (your-name@your-domain.com)',
+        contributorEmailInfo: "Enter the email address associated with the contributor's Atlassian account. For example, your-name@your-domain.com",
+        promptContributorEmail: 'Enter their email:',
+        confirmationInfo: 'This contributor will have full access to your app via the CLI and developer console.',
+        learnMore: 'To learn more about access and permissions, go to: https://go.atlassian.com/contributor-permissions',
+        promptConfirmation: 'Do you want to continue?'
+    },
+    listContributors: {
+        cmd: {
+            desc: 'list all contributors for your app'
+        },
+        banner: '\nShowing all current contributors for your app:',
+        noContributors: 'No users have been assigned contributor status for your app',
+        appOwner: `${chalk_1.default.bold('(App owner)')}`,
+        userInactive: '(Deactivated)',
+        missingAppContributors: `Cannot list contributors for the app: something went wrong with fetching app contributors.`
+    },
+    removeContributors: {
+        cmd: {
+            desc: 'remove contributors from your app',
+            start: 'Removing contributor(s) from your app...',
+            success: 'Contributor(s) removed successfully'
+        },
+        overview: 'To remove a contributor from your app, select them from the list.\nPress Ctrl+C to cancel.',
+        optionSkipConfirmation: 'skip confirmation before removing contributors from the app',
+        optionContributorEmail: 'email address associated with Atlassian account (your-name@your-domain.com)',
+        promptContributorEmail: 'Select contributor(s) to remove from the app',
+        confirmationInfo: 'You are removing the following contributor(s). They will no longer have access to your app via the CLI and developer console:',
+        promptConfirmation: 'Do you want to continue?',
+        commandSuccessMessage: (name) => `${chalk_1.default.bold(name.join(', '))} can no longer access your app.`,
+        addContributorMessage: "There are no contributors for this app. To add a contributor, run the 'contributors add' command."
+    },
     artifact: {
         error: {
             noDeployUrl: "Couldn't find deployment URL",
@@ -338,9 +396,8 @@ What do you like or don't like about Forge? Share your feedback below or press C
         taskPackage: {
             title: 'Packaging app files',
             archiverWarning: (err) => `Packaging warning: ${err.message}`,
-            fileAddedToArchive: (filePath) => `File added to archive: ${filePath}`,
             packageBundledFiles: 'Packaging bundled files',
-            packageFile: (fileName, filePath) => `Packaging the ${fileName} file from ${filePath}`,
+            packageFile: (fileName, filePath) => `File added to archive: ${filePath}` + fileName ? `, from ${fileName}` : '',
             archiveCreated: (archivePath) => `Archive created: ${archivePath}`
         },
         taskUpload: {
@@ -412,9 +469,9 @@ What do you like or don't like about Forge? Share your feedback below or press C
         listEgressAddresses: (egressAddresses) => `Your app will exchange data with the following urls:\n${egressAddresses.map((url) => `- ${url}`).join('\n')}\n`,
         permissionsMismatch: (environment) => `The scopes or egress URLs in the manifest are different from the scopes in your most recent deployment to ${environment}. Try running ${chalk_1.default.bold(`forge deploy -e ${environment}`)} before installing.\n`,
         multiProductScopesDetected: (productsToInstall, productsToUpgrade, site, environment, environmentToOption) => `\nWe detected your app requires scopes across multiple products.\nRun ${chalk_1.default.bold('forge install')} for each of the following:\n${productsToUpgrade
-            .map((product) => `- forge install --upgrade -p ${case_1.capital(product)} -s ${site} -e ${environmentToOption(environment)}`)
+            .map((product) => `- forge install --upgrade -p ${(0, case_1.capital)(product)} -s ${site} -e ${environmentToOption(environment)}`)
             .join('\n')}${productsToUpgrade.length !== 0 && productsToInstall.length !== 0 ? '\n' : ''}${productsToInstall
-            .map((product) => `- forge install -p ${case_1.capital(product)} -s ${site} -e ${environmentToOption(environment)}`)
+            .map((product) => `- forge install -p ${(0, case_1.capital)(product)} -s ${site} -e ${environmentToOption(environment)}`)
             .join('\n')}`,
         promptForPermissionsConfirmation: (permissionsMismatchInDevelopment) => permissionsMismatchInDevelopment
             ? 'Are you sure you want to continue installing the app?'
@@ -426,6 +483,9 @@ What do you like or don't like about Forge? Share your feedback below or press C
             invalidAtlassianSite: (url) => `The URL you entered doesn't belong to an Atlassian site: ` +
                 `\n${url.toString()} ` +
                 `\n\nRun the command using a different URL.`,
+            invalidWorkspace: (url) => `The URL you entered is not a valid workspace: ` +
+                `\n${url.toString()} ` +
+                `\n\nRun the command using a different URL.`,
             url: (url) => `Site URL is invalid: ${url}`,
             site: (url) => `Site is invalid: ${url}`,
             alreadyInstalledError: `Installation error: App is already installed.\nIf you're trying to upgrade your app, use the ${chalk_1.default.bold('forge install --upgrade')} command.`,
@@ -492,7 +552,7 @@ ${buildTerminalLink(link)}\n`,
     installList: {
         cmd: 'list app installations',
         banner: `\nShowing all the current installations of your app:`,
-        noCloudId: 'Unknown site with no cloud ID',
+        noResourceId: 'Unknown site with no resource ID',
         noInstallations: `The app is not installed anywhere.\nRun ${chalk_1.default.bold('forge install')} to install your app on an Atlassian site.\n`
     },
     tunnel: {
@@ -505,11 +565,16 @@ ${buildTerminalLink(link)}\n`,
         startedTunnel: (tunnelUrl) => `Started tunnel at address: ${tunnelUrl}`,
         stoppingTunnel: 'Stopping tunnel...',
         stoppedTunnel: 'Tunnel stopped.',
+        tunnelStatusChange: (status) => `Tunnel connection status changed: ${status}`,
         snapshotting: 'Snapshotting functions...',
         snapshottingNoLogs: 'No log output.',
-        startedInspector: (serverAddress) => `Chrome inspector URL (add "debugger;" statement to your app to pause):\ndevtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=${serverAddress}\n`,
+        startedInspector: (serverAddress) => `Add "debugger;" statement to your app to pause.
+Debugging in Google Chrome:
+- Open Inspect page: chrome://inspect/
+- Select "Open dedicated DevTools for Node"
+- Open inspector URL: devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=${serverAddress}
+  `,
         invoke: (requestId, handler) => `invocation: ${requestId} ${handler}`,
-        reloaded: 'App code reloaded.',
         customUI: {
             fileServed: (filename, resourceKey) => `Serving file ${filename} for resource ${resourceKey}`,
             fileProxied: (filename, resourceKey, tunnelPort) => `Received proxy request. ${exports.Text.tunnel.customUI.fileServed(filename, resourceKey)} from specified address http://localhost:${tunnelPort}`,
@@ -523,16 +588,17 @@ ${buildTerminalLink(link)}\n`,
         lintFailed: chalk_1.default.red(`${chalk_1.default.bold('Error:')} Linting failed due to errors in the app code.`),
         bundlingHeader: 'Bundling code...',
         bundlingSucceeded: 'App code bundled.',
+        resourcesBundlingSucceeded: `${greenTick} Resources bundled.`,
+        functionsBundlingSucceeded: `${greenTick} Functions bundled.`,
         error: {
             create: (message) => `Couldn't create tunnel, message: ${message}`,
             delete: (message) => `Couldn't delete tunnel, message: ${message}`,
             ngrok: `Failed to start tunnel, could not establish a connection.`,
             handler: {
-                format: (handler) => `Function handler "${handler}" must be in format <module>.<function>, example: index.run`,
                 notFound: (handler) => `Function with handler "${handler}" was not found`
             },
             pullDocker: `Checking Docker image... failed`,
-            tunnelPackageMissing: 'To run tunnel without Docker please: npm install -g @forge/tunnel',
+            tunnelPackageMissing: 'To run tunnel without Docker please: npm install -g @forge/sandbox-tunnel',
             dockerNotInstalled: (dockerDownloadLink) => 'Cannot find Docker. The tunnel command requires Docker to run your app locally. ' +
                 `Get Docker at the following URL before rerunning the tunnel command:\n\n${dockerDownloadLink}`,
             dockerOutOfDate: (dockerDownloadLink) => 'The installed version of Docker should be 17.03 or greater. ' +

package/out/ui/ui.d.ts

@@ -8,9 +8,20 @@ export interface Prompt {
     promptForTable(message: string, infoMessage: string, columns: string[], choices: object[]): Promise<number[]>;
     promptForSingleChoiceTable(message: string, infoMessage: string, columns: string[], choices: object[]): Promise<number>;
 }
+export declare type TableCell = string | boolean | null | undefined;
+export declare type TableOptions<Key extends string> = {
+    json?: boolean;
+    emptyMessage?: string;
+    preMessage?: string;
+    postMessage?: string;
+    format?: {
+        [K in Key]?: (value: TableCell) => string;
+    };
+};
 export interface UI extends Logger, Prompt {
     emptyLine(): void;
     displayProgress<Result>(progress: () => Promise<Result>, startText: string, successText: string | ((result: Result) => string | ProgressResult)): Promise<Result>;
     displayTemporaryMessage<Result>(progress: () => Promise<Result>, waitText: string): Promise<Result>;
+    table<Key extends string>(head: [Key, string][], data: Record<Key, TableCell>[] | undefined | null, options?: TableOptions<Key>): void;
 }
 //# sourceMappingURL=ui.d.ts.map

package/out/ui/ui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../src/ui/ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,MAAM;IACrB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9G,0BAA0B,CACxB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,MAAM,WAAW,EAAG,SAAQ,MAAM,EAAE,MAAM;IACxC,SAAS,IAAI,IAAI,CAAC;IAElB,eAAe,CAAC,MAAM,EACpB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,cAAc,CAAC,GAClE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnB,uBAAuB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACrG"}
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../src/ui/ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,MAAM;IACrB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9G,0BAA0B,CACxB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,oBAAY,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;AAE5D,oBAAY,YAAY,CAAC,GAAG,SAAS,MAAM,IAAI;IAC7C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE;SAAG,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,MAAM;KAAE,CAAC;CACxD,CAAC;AAEF,MAAM,WAAW,EAAG,SAAQ,MAAM,EAAE,MAAM;IACxC,SAAS,IAAI,IAAI,CAAC;IAElB,eAAe,CAAC,MAAM,EACpB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,cAAc,CAAC,GAClE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnB,uBAAuB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpG,KAAK,CAAC,GAAG,SAAS,MAAM,EACtB,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EACrB,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,GAAG,SAAS,GAAG,IAAI,EACjD,OAAO,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,GAC1B,IAAI,CAAC;CACT"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli-shared",
-  "version": "0.0.0-experimental-9489df9",
+  "version": "0.0.0-experimental-52c2a24",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -12,14 +12,15 @@
     "generate-graphql-types": "graphql-codegen --config src/graphql/codegen.yml"
   },
   "dependencies": {
-    "@forge/manifest": "0.0.0-experimental-9489df9",
-    "@forge/util": "1.2.0",
+    "@forge/manifest": "0.0.0-experimental-52c2a24",
+    "@forge/util": "1.2.1",
+    "@sentry/node": "^7.29.0",
     "array.prototype.flatmap": "^1.2.3",
     "case": "^1.6.2",
     "chalk": "^2.4.2",
     "cheerio": "^0.22.0",
     "cli-table3": "^0.6.1",
-    "conf": "^6.2.0",
+    "conf": "^6.2.4",
     "cross-spawn": "^7.0.1",
     "env-paths": "^2.2.0",
     "figures": "^3.2.0",
@@ -30,40 +31,37 @@
     "graphql": "^15.8.0",
     "graphql-request": "3.4.0",
     "ignore-walk": "^3.0.3",
-    "inquirer": "^7.0.4",
+    "inquirer": "^8.2.5",
     "io-ts": "^2.0.6",
+    "keytar": "^7.9.0",
     "launchdarkly-node-client-sdk": "^2.0.3",
-    "node-fetch": "2.6.1",
+    "node-fetch": "2.6.7",
     "ora": "^4.0.3",
     "recursive-readdir": "^2.2.2",
     "terminal-link": "^2.1.1",
     "tmp": "^0.1.0",
-    "typescript": "^3.9.7",
+    "typescript": "^4.8.4",
     "unzipper": "^0.10.8",
     "yaml": "^1.10.0"
   },
-  "optionalDependencies": {
-    "keytar": "^7.0.0"
-  },
   "devDependencies": {
     "@graphql-codegen/add": "^2.0.1",
     "@graphql-codegen/cli": "^1.21.6",
     "@graphql-codegen/typescript": "^1.17.10",
     "@graphql-codegen/typescript-operations": "^1.17.8",
     "@types/array.prototype.flatmap": "^1.2.1",
-    "@types/cheerio": "^0.22.21",
-    "@types/cross-spawn": "^6.0.1",
+    "@types/cheerio": "^0.22.31",
+    "@types/cross-spawn": "^6.0.2",
     "@types/fs-extra": "^8.0.1",
     "@types/get-folder-size": "^2.0.0",
     "@types/ignore-walk": "^3.0.1",
-    "@types/inquirer": "^6.5.0",
-    "@types/jest": "^26.0.0",
+    "@types/inquirer": "^8.2.6",
+    "@types/jest": "^29.1.2",
     "@types/js-yaml": "^3.12.2",
     "@types/node-fetch": "^2.5.7",
     "@types/recursive-readdir": "^2.2.0",
     "@types/tmp": "^0.1.0",
     "@types/unzipper": "^0.10.1",
-    "aws-lambda": "^1.0.6",
     "graphql-tools": "^6.2.4",
     "jest-fixtures": "^0.6.0"
   }

package/out/auth/credentials-store-provider.d.ts

@@ -1,4 +0,0 @@
-import { UI } from '../ui';
-import { PersonalApiCredentialsStore } from './personal';
-export declare const getCredentialsStoreProvider: (ui: UI) => PersonalApiCredentialsStore;
-//# sourceMappingURL=credentials-store-provider.d.ts.map

package/out/auth/credentials-store-provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"credentials-store-provider.d.ts","sourceRoot":"","sources":["../../src/auth/credentials-store-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAC3B,OAAO,EAKL,2BAA2B,EAC5B,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,2BAA2B,OAAQ,EAAE,KAAG,2BAMpD,CAAC"}

package/out/auth/credentials-store-provider.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCredentialsStoreProvider = void 0;
-const graphql_1 = require("../graphql");
-const personal_1 = require("./personal");
-exports.getCredentialsStoreProvider = (ui) => {
-    const graphqlGateway = graphql_1.getGraphqlGateway();
-    return personal_1.hasKeytar()
-        ? new personal_1.KeytarPersonalApiCredentialsStore(graphqlGateway, () => personal_1.getKeytar(ui))
-        : new personal_1.CachePersonalApiCredentialsStore(graphqlGateway);
-};

package/out/auth/personal/abstract-token-store-getter.d.ts

@@ -1,13 +0,0 @@
-import { PersonalApiCredentialsGetter, PersonalApiCredentialsValidated } from './token-store';
-export declare const EMAIL_KEY = "FORGE_EMAIL";
-export declare const API_TOKEN_KEY = "FORGE_API_TOKEN";
-export declare const AAID_KEY = "FORGE_AAID";
-export declare abstract class AbstractPersonalApiCredentialsGetter implements PersonalApiCredentialsGetter {
-    protected readonly graphqlGateway: string;
-    protected constructor(graphqlGateway: string);
-    getCredentials: () => Promise<PersonalApiCredentialsValidated>;
-    abstract getCredentialsImpl(): Promise<PersonalApiCredentialsValidated>;
-    getInstructionsWhenInvalid: () => string;
-    abstract getInstructionsWhenInvalidImpl(): string;
-}
-//# sourceMappingURL=abstract-token-store-getter.d.ts.map

package/out/auth/personal/abstract-token-store-getter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"abstract-token-store-getter.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/abstract-token-store-getter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,4BAA4B,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAE9F,eAAO,MAAM,SAAS,gBAAgB,CAAC;AACvC,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAC/C,eAAO,MAAM,QAAQ,eAAe,CAAC;AAErC,8BAAsB,oCAAqC,YAAW,4BAA4B;IAC1E,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM;IAA/D,SAAS,aAAgC,cAAc,EAAE,MAAM;IAE/D,cAAc,QAAO,OAAO,CAAC,+BAA+B,CAAC,CAU3D;IAEF,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,+BAA+B,CAAC;IAEvE,0BAA0B,QAAO,MAAM,CAMrC;IAEF,QAAQ,CAAC,8BAA8B,IAAI,MAAM;CAClD"}

package/out/auth/personal/abstract-token-store-getter.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbstractPersonalApiCredentialsGetter = exports.AAID_KEY = exports.API_TOKEN_KEY = exports.EMAIL_KEY = void 0;
-const instruction_1 = require("../instruction");
-const ui_1 = require("../../ui");
-exports.EMAIL_KEY = 'FORGE_EMAIL';
-exports.API_TOKEN_KEY = 'FORGE_API_TOKEN';
-exports.AAID_KEY = 'FORGE_AAID';
-class AbstractPersonalApiCredentialsGetter {
-    constructor(graphqlGateway) {
-        this.graphqlGateway = graphqlGateway;
-        this.getCredentials = () => {
-            if (process.env[exports.API_TOKEN_KEY] && process.env[exports.EMAIL_KEY]) {
-                return Promise.resolve({
-                    email: process.env[exports.EMAIL_KEY],
-                    token: process.env[exports.API_TOKEN_KEY],
-                    accountId: process.env[exports.AAID_KEY] || ''
-                });
-            }
-            return this.getCredentialsImpl();
-        };
-        this.getInstructionsWhenInvalid = () => {
-            if (process.env[exports.API_TOKEN_KEY] && process.env[exports.EMAIL_KEY]) {
-                const instructionsUrl = instruction_1.getInstructionsUrl(this.graphqlGateway);
-                return ui_1.Text.error.invalidTokenInEnv(instructionsUrl, exports.EMAIL_KEY, exports.API_TOKEN_KEY);
-            }
-            return this.getInstructionsWhenInvalidImpl();
-        };
-    }
-}
-exports.AbstractPersonalApiCredentialsGetter = AbstractPersonalApiCredentialsGetter;

package/out/auth/personal/token-store-cache.d.ts

@@ -1,12 +0,0 @@
-import { AbstractPersonalApiCredentialsGetter } from './abstract-token-store-getter';
-import { PersonalApiCredentialsDeleter, PersonalApiCredentialsSetter, PersonalApiCredentialsValidated } from './token-store';
-export declare class CachePersonalApiCredentialsStore extends AbstractPersonalApiCredentialsGetter implements PersonalApiCredentialsSetter, PersonalApiCredentialsDeleter {
-    protected readonly graphqlGateway: string;
-    private cachedConfig;
-    constructor(graphqlGateway: string);
-    getCredentialsImpl(): Promise<PersonalApiCredentialsValidated>;
-    getInstructionsWhenInvalidImpl(): string;
-    deleteCredentials(): Promise<void>;
-    setCredentials(credentials: PersonalApiCredentialsValidated): Promise<void>;
-}
-//# sourceMappingURL=token-store-cache.d.ts.map

package/out/auth/personal/token-store-cache.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"token-store-cache.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/token-store-cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAEL,6BAA6B,EAC7B,4BAA4B,EAC5B,+BAA+B,EAChC,MAAM,eAAe,CAAC;AAOvB,qBAAa,gCAAiC,SAAQ,oCACpD,YAAW,4BAA4B,EAAE,6BAA6B;IAG1D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM;IAFrD,OAAO,CAAC,YAAY,CAAa;gBAEF,cAAc,EAAE,MAAM;IAK9C,kBAAkB,IAAI,OAAO,CAAC,+BAA+B,CAAC;IAU9D,8BAA8B,IAAI,MAAM;IAI/C,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOlC,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;CAM5E"}

package/out/auth/personal/token-store-cache.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CachePersonalApiCredentialsStore = void 0;
-const ui_1 = require("../../ui");
-const abstract_token_store_getter_1 = require("./abstract-token-store-getter");
-const token_store_1 = require("./token-store");
-const cache_1 = require("../../cache");
-const FORGE_CLI_PACKAGE = '@forge/cli';
-const CACHE_CREDENTIALS_KEY = 'forge-credentials';
-class CachePersonalApiCredentialsStore extends abstract_token_store_getter_1.AbstractPersonalApiCredentialsGetter {
-    constructor(graphqlGateway) {
-        super(graphqlGateway);
-        this.graphqlGateway = graphqlGateway;
-        this.cachedConfig = cache_1.CachedConf.getCache(FORGE_CLI_PACKAGE);
-    }
-    getCredentialsImpl() {
-        return new Promise((resolve, reject) => {
-            const credentials = this.cachedConfig.get(CACHE_CREDENTIALS_KEY);
-            if (!credentials) {
-                return reject(new token_store_1.NoTokenInStoreError());
-            }
-            resolve(credentials);
-        });
-    }
-    getInstructionsWhenInvalidImpl() {
-        return ui_1.Text.error.invalidTokenInKeytarOrCache;
-    }
-    deleteCredentials() {
-        return new Promise((resolve) => {
-            this.cachedConfig.delete(CACHE_CREDENTIALS_KEY);
-            resolve();
-        });
-    }
-    setCredentials(credentials) {
-        return new Promise((resolve) => {
-            this.cachedConfig.set(CACHE_CREDENTIALS_KEY, credentials);
-            resolve();
-        });
-    }
-}
-exports.CachePersonalApiCredentialsStore = CachePersonalApiCredentialsStore;

package/out/auth/personal/token-store-keytar.d.ts

@@ -1,23 +0,0 @@
-import { UI } from '../../ui';
-import { AbstractPersonalApiCredentialsGetter } from './abstract-token-store-getter';
-import { PersonalApiCredentialsDeleter, PersonalApiCredentialsSetter, PersonalApiCredentialsValidated } from './token-store';
-export interface Keytar {
-    getPassword(service: string, account: string): Promise<string | null>;
-    setPassword(service: string, account: string, password: string): Promise<void>;
-    deletePassword(service: string, account: string): Promise<void>;
-}
-export declare function getKeytar(ui: UI): Keytar | never;
-export declare const hasKeytar: () => boolean;
-export declare class KeytarPersonalApiCredentialsStore extends AbstractPersonalApiCredentialsGetter implements PersonalApiCredentialsSetter, PersonalApiCredentialsDeleter {
-    protected readonly graphqlGateway: string;
-    private readonly keytarProvider;
-    private keytarAccount;
-    constructor(graphqlGateway: string, keytarProvider: () => Keytar);
-    private getKeytarAccount;
-    getCredentialsImpl(): Promise<PersonalApiCredentialsValidated>;
-    getInstructionsWhenInvalidImpl(): string;
-    setCredentials(credentials: PersonalApiCredentialsValidated): Promise<void>;
-    deleteCredentials(): Promise<void>;
-    private wrapKeytarError;
-}
-//# sourceMappingURL=token-store-keytar.d.ts.map

package/out/auth/personal/token-store-keytar.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"token-store-keytar.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/token-store-keytar.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AAG9B,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAEL,6BAA6B,EAC7B,4BAA4B,EAC5B,+BAA+B,EAEhC,MAAM,eAAe,CAAC;AAKvB,MAAM,WAAW,MAAM;IACrB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACtE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE;AASD,wBAAgB,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,GAAG,KAAK,CAOhD;AAED,eAAO,MAAM,SAAS,QAAO,OAO5B,CAAC;AAGF,qBAAa,iCAAkC,SAAQ,oCACrD,YAAW,4BAA4B,EAAE,6BAA6B;IAI1D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM;IAAE,OAAO,CAAC,QAAQ,CAAC,cAAc;IAHtF,OAAO,CAAC,aAAa,CAAS;gBAGC,cAAc,EAAE,MAAM,EAAmB,cAAc,EAAE,MAAM,MAAM;IAKpG,OAAO,CAAC,gBAAgB;IAQX,kBAAkB,IAAI,OAAO,CAAC,+BAA+B,CAAC;IA4BpE,8BAA8B,IAAI,MAAM;IAIxC,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;IAM3E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzC,OAAO,CAAC,eAAe;CAkBxB"}

package/out/auth/personal/token-store-keytar.js

@@ -1,101 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeytarPersonalApiCredentialsStore = exports.hasKeytar = exports.getKeytar = void 0;
-const Either_1 = require("fp-ts/lib/Either");
-const shared_1 = require("../../shared");
-const ui_1 = require("../../ui");
-const os_1 = require("os");
-const abstract_token_store_getter_1 = require("./abstract-token-store-getter");
-const token_store_1 = require("./token-store");
-const KEYTAR_SERVICE = 'Atlassian';
-const KEYTAR_ACCOUNT = 'Ecosystem';
-function getKeytar(ui) {
-    try {
-        return require('keytar');
-    }
-    catch (_a) {
-        const error = new Error(ui_1.Text.error.noKeytar);
-        return shared_1.exitOnError(ui)(error);
-    }
-}
-exports.getKeytar = getKeytar;
-exports.hasKeytar = () => {
-    try {
-        require('keytar');
-        return true;
-    }
-    catch (_a) {
-        return false;
-    }
-};
-class KeytarPersonalApiCredentialsStore extends abstract_token_store_getter_1.AbstractPersonalApiCredentialsGetter {
-    constructor(graphqlGateway, keytarProvider) {
-        super(graphqlGateway);
-        this.graphqlGateway = graphqlGateway;
-        this.keytarProvider = keytarProvider;
-        this.keytarAccount = this.getKeytarAccount(graphqlGateway);
-    }
-    getKeytarAccount(graphqlGateway) {
-        const isStaging = graphqlGateway.includes('.dev.') || graphqlGateway.includes('.stg.');
-        if (isStaging) {
-            return `${KEYTAR_ACCOUNT}-staging`;
-        }
-        return KEYTAR_ACCOUNT;
-    }
-    async getCredentialsImpl() {
-        let stringifiedPersonalApiCredentials;
-        try {
-            stringifiedPersonalApiCredentials = await this.keytarProvider().getPassword(KEYTAR_SERVICE, this.keytarAccount);
-        }
-        catch (e) {
-            this.wrapKeytarError(e);
-        }
-        if (!stringifiedPersonalApiCredentials) {
-            throw new token_store_1.NoTokenInStoreError();
-        }
-        let personalApiCredentials;
-        try {
-            personalApiCredentials = JSON.parse(stringifiedPersonalApiCredentials);
-        }
-        catch (_a) {
-            throw new token_store_1.NoTokenInStoreError();
-        }
-        const decodeResult = token_store_1.personalApiCredentialsValidatedShape.decode(personalApiCredentials);
-        if (Either_1.isLeft(decodeResult)) {
-            throw new token_store_1.NoTokenInStoreError();
-        }
-        return decodeResult.right;
-    }
-    getInstructionsWhenInvalidImpl() {
-        return ui_1.Text.error.invalidTokenInKeytarOrCache;
-    }
-    setCredentials(credentials) {
-        return this.keytarProvider()
-            .setPassword(KEYTAR_SERVICE, this.keytarAccount, JSON.stringify(credentials))
-            .catch((e) => this.wrapKeytarError(e));
-    }
-    deleteCredentials() {
-        return this.keytarProvider()
-            .deletePassword(KEYTAR_SERVICE, this.keytarAccount)
-            .catch((e) => this.wrapKeytarError(e));
-    }
-    wrapKeytarError(e) {
-        let error;
-        const currentPlatform = os_1.platform();
-        switch (currentPlatform) {
-            case 'darwin':
-                error = ui_1.Text.error.keytarAccessError.mac(e.message);
-                break;
-            case 'linux':
-                error = ui_1.Text.error.keytarAccessError.linux(e.message);
-                break;
-            case 'win32':
-                error = ui_1.Text.error.keytarAccessError.windows(e.message);
-                break;
-            default:
-                error = ui_1.Text.error.keytarAccessError.other(e.message);
-        }
-        throw new Error(error);
-    }
-}
-exports.KeytarPersonalApiCredentialsStore = KeytarPersonalApiCredentialsStore;

package/out/auth/personal/token-store.d.ts

@@ -1,28 +0,0 @@
-import * as t from 'io-ts';
-export declare const personalApiCredentialsShape: t.TypeC<{
-    email: t.StringC;
-    token: t.StringC;
-}>;
-export declare const personalApiCredentialsValidatedShape: t.TypeC<{
-    email: t.StringC;
-    token: t.StringC;
-    accountId: t.StringC;
-}>;
-export declare type PersonalApiCredentials = t.TypeOf<typeof personalApiCredentialsShape>;
-export declare type PersonalApiCredentialsValidated = t.TypeOf<typeof personalApiCredentialsValidatedShape>;
-export declare class NoTokenInStoreError extends Error {
-    constructor();
-}
-export interface PersonalApiCredentialsGetter {
-    getCredentials(): Promise<PersonalApiCredentialsValidated>;
-    getInstructionsWhenInvalid(): string;
-}
-export interface PersonalApiCredentialsSetter {
-    setCredentials(credentials: PersonalApiCredentialsValidated): Promise<void>;
-}
-export interface PersonalApiCredentialsDeleter {
-    deleteCredentials(): Promise<void>;
-}
-export interface PersonalApiCredentialsStore extends PersonalApiCredentialsGetter, PersonalApiCredentialsSetter, PersonalApiCredentialsDeleter {
-}
-//# sourceMappingURL=token-store.d.ts.map

package/out/auth/personal/token-store.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"token-store.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/token-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAC;AAG3B,eAAO,MAAM,2BAA2B;;;EAGtC,CAAC;AAEH,eAAO,MAAM,oCAAoC;;;;EAI/C,CAAC;AAEH,oBAAY,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAClF,oBAAY,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oCAAoC,CAAC,CAAC;AAEpG,qBAAa,mBAAoB,SAAQ,KAAK;;CAI7C;AAED,MAAM,WAAW,4BAA4B;IAC3C,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAC3D,0BAA0B,IAAI,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,4BAA4B;IAC3C,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7E;AAED,MAAM,WAAW,6BAA6B;IAC5C,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,2BACf,SAAQ,4BAA4B,EAClC,4BAA4B,EAC5B,6BAA6B;CAAG"}