@salesforce/core 3.12.2 → 3.13.0

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.13.0](https://github.com/forcedotcom/sfdx-core/compare/v3.12.2...v3.13.0) (2022-04-20)
+
+### Features
+
+- detect if org is a devhub at auth time ([#560](https://github.com/forcedotcom/sfdx-core/issues/560)) ([958e2e7](https://github.com/forcedotcom/sfdx-core/commit/958e2e7317e670b738b3e7c82260ef741e1416d2))
+
 ### [3.12.2](https://github.com/forcedotcom/sfdx-core/compare/v3.12.1...v3.12.2) (2022-04-14)
 
 ### Bug Fixes

package/lib/org/authInfo.d.ts

@@ -303,6 +303,12 @@ export declare class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
      * @private
      */
     private throwUserGetException;
+    /**
+     * Returns `true` if the org is a Dev Hub.
+     *
+     * Check access to the ScratchOrgInfo object to determine if the org is a dev hub.
+     */
+    private determineIfDevHub;
 }
 export declare namespace AuthInfo {
     /**

package/lib/org/authInfo.js

@@ -614,6 +614,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                     }
                 }
             }
+            authConfig.isDevHub = await this.determineIfDevHub((0, ts_types_1.ensureString)(authConfig.instanceUrl), (0, ts_types_1.ensureString)(authConfig.accessToken));
             // Update the auth fields WITH encryption
             this.update(authConfig);
         }
@@ -844,6 +845,32 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
         throw new sfError_1.SfError(errorMsg);
     }
+    /**
+     * Returns `true` if the org is a Dev Hub.
+     *
+     * Check access to the ScratchOrgInfo object to determine if the org is a dev hub.
+     */
+    async determineIfDevHub(instanceUrl, accessToken) {
+        // Make a REST call for the ScratchOrgInfo obj directly.  Normally this is done via a connection
+        // but we don't want to create circular dependencies or lots of snowflakes
+        // within this file to support it.
+        const apiVersion = 'v51.0'; // hardcoding to v51.0 just for this call is okay.
+        const instance = (0, ts_types_1.ensure)(instanceUrl);
+        const baseUrl = new sfdcUrl_1.SfdcUrl(instance);
+        const scratchOrgInfoUrl = `${baseUrl}/services/data/${apiVersion}/query?q=SELECT%20Id%20FROM%20ScratchOrgInfo%20limit%201`;
+        const headers = Object.assign({ Authorization: `Bearer ${accessToken}` }, connection_1.SFDX_HTTP_HEADERS);
+        try {
+            const res = await new transport_1.default().httpRequest({ url: scratchOrgInfoUrl, method: 'GET', headers });
+            if (res.statusCode >= 400) {
+                return false;
+            }
+            return true;
+        }
+        catch (err) {
+            /* Not a dev hub */
+            return false;
+        }
+    }
 }
 exports.AuthInfo = AuthInfo;
 //# sourceMappingURL=authInfo.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.12.2",
+  "version": "3.13.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",