fix: do not query server if cached

src/org.ts

@@ -241,12 +241,20 @@ export class Org extends AsyncCreatable<Org.Options> {
    *
    * Use a cached value. If the cached value is not set, then check access to the
    * ScratchOrgInfo object to determine if the org is a dev hub.
+   *
+   * @param forceServerCheck Ignore the cached value and go straight to the server
+   * which will be required if the org flips on the dev hub after the value is already
+   * cached locally.
    */
-  public async determineIfDevHubOrg() {
+  public async determineIfDevHubOrg(forceServerCheck = false) {
+    const cachedIsDevHub = this.getField(Org.Fields.IS_DEV_HUB);
+    if (!forceServerCheck && isBoolean(cachedIsDevHub)) {
+      return cachedIsDevHub;
+    }
     if (this.isDevHubOrg()) {
       return true;
     }
-
+    this.logger.debug('isDevHub is not cached - querying server...');
     const conn = this.getConnection();
     let isDevHub = false;
     try {

test/unit/orgTest.ts

@@ -643,5 +643,28 @@ describe('Org Tests', () => {
       expect(await org.determineIfDevHubOrg()).to.be.false;
       expect(org.isDevHubOrg()).to.be.false;
     });
+    it('should not call server is cached', async () => {
+      $$.configStubs.AuthInfoConfig.contents = {
+        isDevHub: false
+      };
+      const org: Org = await Org.create({ aliasOrUsername: testData.username });
+      const spy = $$.SANDBOX.spy();
+      $$.fakeConnectionRequest = spy;
+      expect(org.isDevHubOrg()).to.be.false;
+      expect(await org.determineIfDevHubOrg()).to.be.false;
+      expect(spy.called).to.be.false;
+    });
+    it('should call server is cached but forced', async () => {
+      $$.configStubs.AuthInfoConfig.contents = {
+        isDevHub: false
+      };
+      const org: Org = await Org.create({ aliasOrUsername: testData.username });
+      const spy = $$.SANDBOX.stub().returns(Promise.resolve({ records: [] }));
+      $$.fakeConnectionRequest = spy;
+      expect(org.isDevHubOrg()).to.be.false;
+      expect(await org.determineIfDevHubOrg(true)).to.be.true;
+      expect(spy.called).to.be.true;
+      expect(org.isDevHubOrg()).to.be.true;
+    });
   });
 });