fix(pool): fixes pool org delete incorrect use of username

This fixes pool org delete command, which didnt use the username flag in a proper way

fixes #1388

Author: azlam-abdulsalam

packages/sfpowerscripts-cli/src/commands/pool/org/delete.ts

@@ -3,7 +3,13 @@ import SfpowerscriptsCommand from '../../../SfpowerscriptsCommand';
 import PoolOrgDeleteImpl from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolOrgDeleteImpl';
 import SFPLogger from '@dxatscale/sfp-logger';
 import { Messages } from '@salesforce/core';
-import { loglevel, orgApiVersionFlagSfdxStyle, targetdevhubusername, requiredUserNameFlag } from '../../../flags/sfdxflags';
+import {
+    loglevel,
+    orgApiVersionFlagSfdxStyle,
+    targetdevhubusername,
+    requiredUserNameFlag,
+} from '../../../flags/sfdxflags';
+import { AliasAccessor } from '@salesforce/core/lib/stateAggregator';
 
 // Initialize Messages with the current plugin directory
 Messages.importMessagesDirectory(__dirname);
@@ -20,10 +26,10 @@ export default class Delete extends SfpowerscriptsCommand {
     public static examples = [`$ sfp pool:org:delete -u [email protected] -v devhub`];
 
     public static flags = {
-        'apiversion': orgApiVersionFlagSfdxStyle,
-        requiredUserNameFlag,
+        apiversion: orgApiVersionFlagSfdxStyle,
+        targetusername: requiredUserNameFlag,
         targetdevhubusername,
-        loglevel
+        loglevel,
     };
 
     public async execute(): Promise<AnyJson> {
@@ -32,10 +38,19 @@ export default class Delete extends SfpowerscriptsCommand {
 
         this.flags.apiversion = this.flags.apiversion || (await hubConn.retrieveMaxApiVersion());
 
-        let poolOrgDeleteImpl = new PoolOrgDeleteImpl(this.hubOrg, this.flags.username);
+        let aliasAccessor = await AliasAccessor.create();
+        let resolvedAliasOrUserName:string;
+        if (aliasAccessor.resolveAlias(this.flags.targetusername)) {
+            resolvedAliasOrUserName = aliasAccessor.resolveUsername(this.flags.targetusername);
+        } else {
+            resolvedAliasOrUserName = this.flags.targetusername;
+        }
+
+        let poolOrgDeleteImpl = new PoolOrgDeleteImpl(this.hubOrg, resolvedAliasOrUserName);
 
         await poolOrgDeleteImpl.execute();
-        if (!this.flags.json) SFPLogger.log(`Scratch org with username ${this.flags.username} is deleted successfully`);
+        if (!this.flags.json)
+            SFPLogger.log(`Scratch org with username or alias ${this.flags.targetusername} is deleted successfully`);
 
         return { username: this.flags.username, messages: 'Scratch Org deleted Succesfully' } as AnyJson;
     }