@salesforce/core 3.12.1 → 3.13.1

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 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.1](https://github.com/forcedotcom/sfdx-core/compare/v3.13.0...v3.13.1) (2022-04-21)
+
+### Bug Fixes
+
+- log rotation errors ([#564](https://github.com/forcedotcom/sfdx-core/issues/564)) ([8a4c9de](https://github.com/forcedotcom/sfdx-core/commit/8a4c9de85840ae0efa0ee8a27494d63a61545da5))
+
+## [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
+
+- sandbox cname recognition ([#556](https://github.com/forcedotcom/sfdx-core/issues/556)) ([2f85709](https://github.com/forcedotcom/sfdx-core/commit/2f8570912cae38fb0ddeaa37836395444c47611a))
+
 ### [3.12.1](https://github.com/forcedotcom/sfdx-core/compare/v3.12.0...v3.12.1) (2022-04-05)
 
 ### Bug Fixes

package/lib/config/config.js

@@ -42,7 +42,6 @@ const messages = messages_1.Messages.load('@salesforce/core', 'config', [
     'instanceUrl',
     'disable-telemetry',
 ]);
-const log = logger_1.Logger.childFromRoot('core:config');
 const SFDX_CONFIG_FILE_NAME = 'sfdx-config.json';
 const CONFIG_FILE_NAME = 'config.json';
 var SfConfigProperties;
@@ -277,9 +276,12 @@ class Config extends configFile_1.ConfigFile {
      */
     static addAllowedProperties(metas) {
         const currentMetaKeys = Object.keys(Config.propertyConfigMap());
+        // If logger is needed elsewhere in this file, do not move this outside of the Config class.
+        // It was causing issues with Bunyan log rotation. See https://github.com/forcedotcom/sfdx-core/pull/562
+        const logger = logger_1.Logger.childFromRoot('core:config');
         metas.forEach((meta) => {
             if (currentMetaKeys.includes(meta.key)) {
-                log.info(`Key ${meta.key} already exists in allowedProperties, skipping.`);
+                logger.info(`Key ${meta.key} already exists in allowedProperties, skipping.`);
                 return;
             }
             Config.allowedProperties.push(meta);

package/lib/globalInfo/sfdxDataHandler.js

@@ -31,10 +31,8 @@ class SfdxDataHandler {
         this.handlers = [new AuthHandler(), new AliasesHandler()];
     }
     async write(latest = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
-        for (const handler of this.handlers) {
-            await handler.write(latest, this.original);
-            this.setOriginal(latest);
-        }
+        await Promise.all(this.handlers.map((handler) => handler.write(latest, this.original)));
+        this.setOriginal(latest);
     }
     async merge(sfData = globalInfoConfig_1.GlobalInfo.emptyDataModel) {
         let merged = (0, globalInfoConfig_1.deepCopy)(sfData);
@@ -103,17 +101,17 @@ class AuthHandler extends BaseHandler {
     }
     async write(latest, original) {
         const { changed, deleted } = await this.findChanges(latest, original);
-        for (const [username, authData] of Object.entries(changed)) {
-            if (authData) {
-                const config = await this.createAuthFileConfig(username);
-                config.setContentsFromObject(authData);
-                await config.write();
-            }
-        }
-        for (const username of deleted) {
+        await Promise.all(Object.entries(changed)
+            .filter(([, authData]) => authData)
+            .map(async ([username, authData]) => {
             const config = await this.createAuthFileConfig(username);
-            await config.unlink();
-        }
+            config.setContentsFromObject(authData);
+            return config.write();
+        }));
+        await Promise.all(deleted.map(async (username) => {
+            const config = await this.createAuthFileConfig(username);
+            return config.unlink();
+        }));
     }
     async findChanges(latest, original) {
         var _a;
@@ -146,16 +144,14 @@ class AuthHandler extends BaseHandler {
     }
     async listAllAuthorizations() {
         const filenames = await this.listAllAuthFiles();
-        const auths = [];
-        for (const filename of filenames) {
-            const username = (0, path_1.basename)(filename, (0, path_1.extname)(filename));
+        return Promise.all(filenames
+            .map((f) => (0, path_1.basename)(f, (0, path_1.extname)(f)))
+            .map(async (username) => {
             const configFile = await this.createAuthFileConfig(username);
             const contents = configFile.getContents();
             const stat = await configFile.stat();
-            const auth = Object.assign(contents, { timestamp: stat.mtime.toISOString() });
-            auths.push(auth);
-        }
-        return auths;
+            return { ...contents, timestamp: stat.mtime.toISOString() };
+        }));
     }
 }
 exports.AuthHandler = AuthHandler;

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/lib/util/sfdcUrl.js

@@ -165,6 +165,8 @@ class SfdcUrl extends url_1.URL {
             this.origin.endsWith('sandbox.my.salesforce.mil') ||
             /sandbox\.my\.salesforce\.com/gi.test(this.origin) || // enhanced domains >= 230
             /(cs[0-9]+(\.my|)\.salesforce\.com)/gi.test(this.origin) || // my domains on CS instance OR CS instance without my domain
+            /(cs[0-9]+\.force\.com)/gi.test(this.origin) || // sandboxes have cnames like cs123.force.com
+            /(\w+--\w+\.my\.salesforce\.com)/gi.test(this.origin) || // sandboxes myDomain like foo--bar.my.salesforce.com
             /([a-z]{3}[0-9]+s\.sfdc-.+\.salesforce\.com)/gi.test(this.origin) || // falcon sandbox ex: usa2s.sfdc-whatever.salesforce.com
             /([a-z]{3}[0-9]+s\.sfdc-.+\.force\.com)/gi.test(this.origin) || // falcon sandbox ex: usa2s.sfdc-whatever.force.com
             this.hostname === 'test.salesforce.com');

package/package.json

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