Phale/w 9749255 (#222)

* fix: prevent expired or from being used in interactive mode

@W-9749255@

* chore: use env from core

* chore: improve question set around expired org

* chore: update yarn.lock

Author: peternhale

messages/deploy.metadata.md

@@ -108,7 +108,19 @@ All child components are included. If you specify this flag, don’t specify --m
 
 Deploying to %s using %s API.
 
+# save.as.default
+
+Save %s as default target-org?
+
 # errors.NoOrgsToSelect
 
 Can't find any active scratch orgs, Dev Hubs, or other orgs.
 Either log into an org or create a scratch org, and then try again.
+
+# error.UserTerminatedDeployForExpiredOrg
+
+The target-org found in the configuration is expired. The user terminated the deploy.
+
+# warning.TargetOrgIsExpired
+
+The target-org, "%s", is expired. Do you want to pick another org?

package.json

@@ -37,7 +37,7 @@
     "eslint-config-salesforce-license": "^0.1.6",
     "eslint-config-salesforce-typescript": "^0.2.8",
     "eslint-plugin-header": "^3.1.1",
-    "eslint-plugin-import": "2.24.2",
+    "eslint-plugin-import": "2.25.4",
     "eslint-plugin-jsdoc": "^35.5.1",
     "eslint-plugin-prettier": "^3.4.1",
     "husky": "^7.0.4",
@@ -48,7 +48,7 @@
     "prettier": "^2.5.1",
     "pretty-quick": "^3.1.3",
     "shx": "0.3.4",
-    "sinon": "11.1.1",
+    "sinon": "11.1.2",
     "ts-node": "^10.7.0",
     "typescript": "^4.6.2"
   },

src/commands/deploy/metadata.ts

@@ -92,7 +92,8 @@ export default class DeployMetadata extends SfCommand<DeployMetadataResult> {
     'ENVIRONMENT VARIABLES',
     EnvironmentVariable.SF_TARGET_ORG,
     EnvironmentVariable.SFDX_DEFAULTUSERNAME,
-    EnvironmentVariable.SFDX_USE_PROGRESS_BAR
+    EnvironmentVariable.SFDX_USE_PROGRESS_BAR,
+    EnvironmentVariable.SF_USE_PROGRESS_BAR
   );
 
   public async run(): Promise<DeployMetadataResult> {

src/utils/metadataDeployer.ts

@@ -6,7 +6,7 @@
  */
 
 import { EOL } from 'os';
-import { cyan } from 'chalk';
+import { cyan, red } from 'chalk';
 import { Duration } from '@salesforce/kit';
 import {
   AuthInfo,
@@ -142,7 +142,32 @@ export class MetadataDeployer extends Deployer {
     const aliasOrUsername = ConfigAggregator.getValue(OrgConfigProperties.TARGET_ORG)?.value as string;
     const globalInfo = await GlobalInfo.getInstance();
     const allAliases = globalInfo.aliases.getAll();
-    if (!aliasOrUsername) {
+    let targetOrgAuth: OrgAuthorization;
+    // make sure the "target-org" can be used in this deploy
+    if (aliasOrUsername) {
+      targetOrgAuth = (
+        await AuthInfo.listAllAuthorizations(
+          (a) => a.username === aliasOrUsername || a.aliases.some((alias) => alias === aliasOrUsername)
+        )
+      ).find((a) => a);
+      if (targetOrgAuth) {
+        if (targetOrgAuth?.isExpired) {
+          const continueAnswer = await this.prompt<{ continue: boolean }>([
+            {
+              name: 'continue',
+              type: 'confirm',
+              message: red(messages.getMessage('warning.TargetOrgIsExpired', [aliasOrUsername])),
+            },
+          ]);
+          if (!continueAnswer.continue) {
+            throw messages.createError('error.UserTerminatedDeployForExpiredOrg');
+          }
+        } else {
+          return globalInfo.aliases.resolveUsername(aliasOrUsername);
+        }
+      }
+    }
+    if (!aliasOrUsername || targetOrgAuth?.isExpired) {
       const authorizations = (
         await AuthInfo.listAllAuthorizations((orgAuth) => !orgAuth.error && orgAuth.isExpired !== true)
       ).map((orgAuth) => {
@@ -170,12 +195,23 @@ export class MetadataDeployer extends Deployer {
             choices: generateTableChoices(columns, options, false),
           },
         ]);
+        if (targetOrgAuth?.isExpired) {
+          const setTargetOrg = await this.prompt<{ save: boolean }>([
+            {
+              name: 'save',
+              type: 'confirm',
+              message: messages.getMessage('save.as.default', [username]),
+            },
+          ]);
+          if (setTargetOrg.save) {
+            const authInfo = await AuthInfo.create({ username });
+            await authInfo.setAsDefault({ org: true });
+          }
+        }
         return username;
       } else {
         throw messages.createError('errors.NoOrgsToSelect');
       }
-    } else {
-      return globalInfo.aliases.resolveUsername(aliasOrUsername);
     }
   }
 

src/utils/progressBar.ts

@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { env } from '@salesforce/kit';
+import { envVars as env, EnvironmentVariable } from '@salesforce/core';
 import { MetadataApiDeploy } from '@sf/sdr';
 import { Messages } from '@salesforce/core';
 import { Progress } from '@salesforce/sf-plugins-core';
@@ -23,7 +23,7 @@ export class DeployProgress extends Progress {
   };
 
   public constructor(private deploy: MetadataApiDeploy, jsonEnabled = false) {
-    super(!jsonEnabled && env.getBoolean('SF_USE_PROGRESS_BAR', true));
+    super(!jsonEnabled && env.getBoolean(EnvironmentVariable.SF_USE_PROGRESS_BAR, true));
   }
 
   public start(): void {