fix: scratch org create/resume Id should be orgId, not SOI Id

Author: mshanemc

src/commands/org/create/scratch.ts

@@ -190,7 +190,7 @@ export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
         this.logSuccess(messages.getMessage('success'));
       }
 
-      return { username, scratchOrgInfo, authFields, warnings, orgId: scratchOrgInfo.Id };
+      return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };
     } catch (error) {
       if (error instanceof SfError && error.name === 'ScratchOrgInfoTimeoutError') {
         this.spinner.stop(lastStatus);

src/commands/org/resume/scratch.ts

@@ -70,6 +70,6 @@ export default class EnvResumeScratch extends SfCommand<ScratchCreateResponse> {
 
     this.log();
     this.logSuccess(messages.getMessage('success'));
-    return { username, scratchOrgInfo, authFields, warnings, orgId: scratchOrgInfo?.Id };
+    return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };
   }
 }

test/nut/async-create-resume.nut.ts

@@ -74,6 +74,7 @@ describe('env:create:scratch async/resume', () => {
         if (resp.status === 0) {
           done = true;
           expect(resp.result).to.have.all.keys(completeKeys);
+          expect(resp.result.orgId).to.match(/^00D.{15}/);
         } else if (resp.name === 'StillInProgressError') {
           // eslint-disable-next-line no-await-in-loop
           await sleep(Duration.seconds(30));

test/nut/scratchCreate.nut.ts

@@ -69,6 +69,7 @@ describe('env create scratch NUTs', () => {
       }).jsonOutput?.result;
       expect(resp).to.have.all.keys(keys);
       assert(resp?.username);
+      expect(resp?.orgId).to.match(/^00D.{15}/);
       const stateAggregator = await StateAggregator.create();
       expect(await stateAggregator.orgs.read(resp.username)).to.have.property('tracksSource', true);
       StateAggregator.clearInstance();
@@ -81,6 +82,7 @@ describe('env create scratch NUTs', () => {
         }
       ).jsonOutput?.result;
       expect(resp).to.have.all.keys(keys);
+      expect(resp?.orgId).to.match(/^00D.{15}/);
     });
     it('creates an org from config file with "override" flags ', () => {
       const expectedUsername = genUniqueString('%[email protected]');