chore: redo isSandbox check to follow Org

Author: WillieRuemmele

src/commands/force/org/delete.ts

@@ -4,9 +4,8 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, loglevel } from '@salesforce/sf-plugins-core';
+import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand } from '@salesforce/sf-plugins-core';
 import { AuthInfo, AuthRemover, Messages, Org, StateAggregator } from '@salesforce/core';
-import { SandboxAccessor } from '@salesforce/core/lib/stateAggregator/accessors/sandboxAccessor';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-org', 'delete');
@@ -65,8 +64,9 @@ export class Delete extends SfCommand<DeleteResult> {
       throw messages.createError('missingUsername');
     }
 
-    const isSandbox = (await SandboxAccessor.create({ username: resolvedUsername })).has(resolvedUsername);
     const orgId = (await AuthInfo.create({ username: resolvedUsername })).getFields().orgId as string;
+    const isSandbox = await (await StateAggregator.getInstance()).sandboxes.hasFile(orgId);
+
     // read the config file for the org to be deleted, if it has a PROD_ORG_USERNAME entry, it's a sandbox
     // we either need permission to proceed without a prompt OR get the user to confirm
     if (

src/commands/org/delete/sandbox.ts

@@ -4,8 +4,8 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Messages, SfError } from '@salesforce/core';
-import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
+import { AuthInfo, AuthRemover, Messages, Org, SfError, StateAggregator } from '@salesforce/core';
+import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-org', 'delete_sandbox');
@@ -14,16 +14,19 @@ export interface SandboxDeleteResponse {
   orgId: string;
   username: string;
 }
+
 export default class EnvDeleteSandbox extends SfCommand<SandboxDeleteResponse> {
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
   public static readonly aliases = ['env:delete:sandbox'];
   public static readonly deprecateAliases = true;
   public static readonly flags = {
-    'target-org': Flags.requiredOrg({
-      summary: messages.getMessage('flags.target-org.summary'),
+    'target-org': Flags.string({
+      // we're recreating the flag without all the validation
+      // eslint-disable-next-line sf-plugin/dash-o
       char: 'o',
+      summary: messages.getMessage('flags.target-org.summary'),
       required: true,
     }),
     'no-prompt': Flags.boolean({
@@ -34,28 +37,40 @@ export default class EnvDeleteSandbox extends SfCommand<SandboxDeleteResponse> {
 
   public async run(): Promise<SandboxDeleteResponse> {
     const flags = (await this.parse(EnvDeleteSandbox)).flags;
-    const org = flags['target-org'];
-    const username = org.getUsername();
+    const username = // from -o alias -> -o username -> [default username]
+      (await StateAggregator.getInstance()).aliases.getUsername(flags['target-org'] ?? '') ??
+      flags['target-org'] ??
+      (this.configAggregator.getPropertyValue('target-org') as string);
     if (!username) {
       throw new SfError('The org does not have a username.');
     }
 
-    if (!(await org.isSandbox())) {
+    const orgId = (await AuthInfo.create({ username })).getFields().orgId as string;
+    const isSandbox = await (await StateAggregator.getInstance()).sandboxes.hasFile(orgId);
+
+    if (!isSandbox) {
       throw messages.createError('error.isNotSandbox', [username]);
     }
 
     if (flags['no-prompt'] || (await this.confirm(messages.getMessage('prompt.confirm', [username])))) {
       try {
+        const org = await Org.create({ aliasOrUsername: username });
         await org.delete();
         this.logSuccess(messages.getMessage('success', [username]));
       } catch (e) {
-        if (e instanceof Error && e.name === 'SandboxNotFound') {
+        if (e instanceof Error && e.name === 'DomainNotFoundError') {
+          // the org has expired, so remote operations won't work
+          // let's clean up the files locally
+          const authRemover = await AuthRemover.create();
+          await authRemover.removeAuth(username);
+          this.logSuccess(messages.getMessage('success.Idempotent', [username]));
+        } else if (e instanceof Error && e.name === 'SandboxNotFound') {
           this.logSuccess(messages.getMessage('success.Idempotent', [username]));
         } else {
           throw e;
         }
       }
     }
-    return { username, orgId: org.getOrgId() };
+    return { username, orgId };
   }
 }

src/commands/org/delete/scratch.ts

@@ -58,7 +58,6 @@ export default class EnvDeleteScratch extends SfCommand<ScratchDeleteResponse> {
         if (e instanceof Error && e.name === 'DomainNotFoundError') {
           // the org has expired, so remote operations won't work
           // let's clean up the files locally
-          // but first read the orgId from the auth file
           const authRemover = await AuthRemover.create();
           await authRemover.removeAuth(resolvedUsername);
           this.logSuccess(messages.getMessage('success', [resolvedUsername]));