fix: can delete default being an alias

Author: WillieRuemmele

src/commands/force/org/delete.ts

@@ -55,9 +55,12 @@ export class Delete extends SfCommand<DeleteResult> {
   public async run(): Promise<DeleteResult> {
     const { flags } = await this.parse(Delete);
     const resolvedUsername =
-      // from -o alias -> -o username -> [default username]
+      // from -o alias -> -o username -> [default username resolved an alias] -> [default username]
       (await StateAggregator.getInstance()).aliases.getUsername(flags['target-org'] ?? '') ??
       flags['target-org'] ??
+      (await StateAggregator.getInstance()).aliases.getUsername(
+        this.configAggregator.getPropertyValue('target-org') as string
+      ) ??
       (this.configAggregator.getPropertyValue('target-org') as string);
 
     if (!resolvedUsername) {

src/commands/org/delete/sandbox.ts

@@ -37,9 +37,13 @@ export default class EnvDeleteSandbox extends SfCommand<SandboxDeleteResponse> {
 
   public async run(): Promise<SandboxDeleteResponse> {
     const flags = (await this.parse(EnvDeleteSandbox)).flags;
-    const username = // from -o alias -> -o username -> [default username]
+    const username =
+      // from -o alias -> -o username -> [default username resolved an alias] -> [default username]
       (await StateAggregator.getInstance()).aliases.getUsername(flags['target-org'] ?? '') ??
       flags['target-org'] ??
+      (await StateAggregator.getInstance()).aliases.getUsername(
+        this.configAggregator.getPropertyValue('target-org') as string
+      ) ??
       (this.configAggregator.getPropertyValue('target-org') as string);
     if (!username) {
       throw new SfError('The org does not have a username.');

src/commands/org/delete/scratch.ts

@@ -6,7 +6,7 @@
  */
 
 import { AuthInfo, AuthRemover, Messages, Org, StateAggregator } from '@salesforce/core';
-import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
+import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-org', 'delete_scratch');
@@ -41,9 +41,12 @@ export default class EnvDeleteScratch extends SfCommand<ScratchDeleteResponse> {
   public async run(): Promise<ScratchDeleteResponse> {
     const flags = (await this.parse(EnvDeleteScratch)).flags;
     const resolvedUsername =
-      // from -o alias -> -o username -> [default username]
+      // from -o alias -> -o username -> [default username resolved an alias] -> [default username]
       (await StateAggregator.getInstance()).aliases.getUsername(flags['target-org'] ?? '') ??
       flags['target-org'] ??
+      (await StateAggregator.getInstance()).aliases.getUsername(
+        this.configAggregator.getPropertyValue('target-org') as string
+      ) ??
       (this.configAggregator.getPropertyValue('target-org') as string);
     const orgId = (await AuthInfo.create({ username: resolvedUsername })).getFields().orgId as string;
 

test/nut/scratchDelete.nut.ts

@@ -14,6 +14,7 @@ import { ScratchDeleteResponse } from '../../src/commands/org/delete/scratch';
 describe('env:delete:scratch NUTs', () => {
   const scratchOrgAlias = 'scratch-org';
   const scratchOrgAlias2 = 'scratch-org-2';
+  const scratchOrgAlias3 = 'scratch-org-3';
   let session: TestSession;
 
   before(async () => {
@@ -33,6 +34,7 @@ describe('env:delete:scratch NUTs', () => {
         },
         {
           setDefault: true,
+          alias: scratchOrgAlias3,
           duration: 1,
           config: path.join('config', 'project-scratch-def.json'),
         },

test/unit/force/org/delete.test.ts

@@ -7,7 +7,7 @@
 import { ConfigAggregator, Messages, Org, SfError } from '@salesforce/core';
 import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup';
 
-import { expect, config } from 'chai';
+import { config, expect } from 'chai';
 import { stubPrompter, stubSfCommandUx } from '@salesforce/sf-plugins-core';
 import { SandboxAccessor } from '@salesforce/core/lib/stateAggregator/accessors/sandboxAccessor';
 import { Config } from '@oclif/core';
@@ -52,7 +52,7 @@ describe('org:delete', () => {
   it('will prompt before attempting to delete', async () => {
     const deleteCommand = new Delete([], {} as Config);
     deleteCommand.configAggregator = await ConfigAggregator.create();
-    $$.SANDBOX.stub(deleteCommand.configAggregator, 'getPropertyValue').onSecondCall().returns(testOrg.username);
+    $$.SANDBOX.stub(deleteCommand.configAggregator, 'getPropertyValue').onThirdCall().returns(testOrg.username);
     const res = await deleteCommand.run();
     expect(prompterStubs.confirm.calledOnce).to.equal(true);
     expect(prompterStubs.confirm.firstCall.args[0]).to.equal(
@@ -61,6 +61,23 @@ describe('org:delete', () => {
     expect(res).to.deep.equal({ orgId: testOrg.orgId, username: testOrg.username });
   });
 
+  it('will resolve a default alias', async () => {
+    const deleteCommand = new Delete([], {} as Config);
+    deleteCommand.configAggregator = await ConfigAggregator.create();
+    await $$.stubConfig({ 'target-org': 'myAlias' });
+    $$.stubAliases({ myAlias: testOrg.username });
+    const getPropertyValueStub = $$.SANDBOX.stub(deleteCommand.configAggregator, 'getPropertyValue')
+      .onSecondCall()
+      .returns('myAlias');
+    const res = await deleteCommand.run();
+    expect(prompterStubs.confirm.calledOnce).to.equal(true);
+    expect(prompterStubs.confirm.firstCall.args[0]).to.equal(
+      messages.getMessage('confirmDelete', ['scratch', testOrg.username])
+    );
+    expect(getPropertyValueStub.calledTwice).to.be.true;
+    expect(res).to.deep.equal({ orgId: testOrg.orgId, username: testOrg.username });
+  });
+
   it('will determine sandbox vs scratch org and delete sandbox', async () => {
     $$.SANDBOX.stub(SandboxAccessor.prototype, 'hasFile').resolves(true);
     const res = await Delete.run(['--target-org', testOrg.username]);