@salesforce/core 3.12.0 → 3.13.0

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.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
+
+- more FormData with buffers and headers ([5ebf78f](https://github.com/forcedotcom/sfdx-core/commit/5ebf78fe2b037df395c87197b90ee06a0d34d5d0))
+
 ## [3.12.0](https://github.com/forcedotcom/sfdx-core/compare/v3.11.1...v3.12.0) (2022-04-04)
 
 ### Features

package/lib/deviceOauthService.d.ts

@@ -1,6 +1,6 @@
 import { AsyncCreatable } from '@salesforce/kit';
 import { OAuth2Config } from 'jsforce/lib/oauth2';
-import { Nullable, JsonMap } from '@salesforce/ts-types';
+import { JsonMap, Nullable } from '@salesforce/ts-types';
 import { AuthInfo } from './org/authInfo';
 export interface DeviceCodeResponse extends JsonMap {
     device_code: string;

package/lib/deviceOauthService.js

@@ -9,10 +9,10 @@
 /* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceOauthService = void 0;
-const url_1 = require("url");
 const transport_1 = require("jsforce/lib/transport");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
+const FormData = require("form-data");
 const logger_1 = require("./logger");
 const authInfo_1 = require("./org/authInfo");
 const sfError_1 = require("./sfError");
@@ -82,8 +82,7 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
         const deviceFlowRequestUrl = this.getDeviceFlowRequestUrl();
         const pollingOptions = this.getPollingOptions(deviceFlowRequestUrl, loginData.device_code);
         const interval = kit_1.Duration.seconds(loginData.interval).milliseconds;
-        const response = await this.pollForDeviceApproval(pollingOptions, interval);
-        return response;
+        return await this.pollForDeviceApproval(pollingOptions, interval);
     }
     /**
      * Creates and saves new AuthInfo
@@ -108,27 +107,27 @@ class DeviceOauthService extends kit_1.AsyncCreatable {
         this.logger.debug(`this.options.loginUrl: ${this.options.loginUrl}`);
     }
     getLoginOptions(url) {
-        const body = new url_1.URLSearchParams();
-        body.append('client_id', (0, ts_types_1.ensureString)(this.options.clientId));
-        body.append('response_type', DeviceOauthService.RESPONSE_TYPE);
-        body.append('scope', DeviceOauthService.SCOPE);
+        const form = new FormData();
+        form.append('client_id', (0, ts_types_1.ensureString)(this.options.clientId));
+        form.append('response_type', DeviceOauthService.RESPONSE_TYPE);
+        form.append('scope', DeviceOauthService.SCOPE);
         return {
             url,
-            headers: connection_1.SFDX_HTTP_HEADERS,
+            headers: { ...connection_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
             method: 'POST',
-            body,
+            body: form.getBuffer(),
         };
     }
     getPollingOptions(url, code) {
-        const body = new url_1.URLSearchParams();
-        body.append('client_id', (0, ts_types_1.ensureString)(this.options.clientId));
-        body.append('grant_type', DeviceOauthService.GRANT_TYPE);
-        body.append('code', code);
+        const form = new FormData();
+        form.append('client_id', (0, ts_types_1.ensureString)(this.options.clientId));
+        form.append('grant_type', DeviceOauthService.GRANT_TYPE);
+        form.append('code', code);
         return {
             url,
-            headers: connection_1.SFDX_HTTP_HEADERS,
+            headers: { ...connection_1.SFDX_HTTP_HEADERS, ...form.getHeaders() },
             method: 'POST',
-            body,
+            body: form.getBuffer(),
         };
     }
     getDeviceFlowRequestUrl() {

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.0",
+  "version": "3.13.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",