@salesforce/core 3.11.0 → 3.12.1

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.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
+
+- move common authinfo utils to core ([01b8cf3](https://github.com/forcedotcom/sfdx-core/commit/01b8cf3fa38162380da5ce15f6dee1d2a5d2d72d))
+
+### [3.11.1](https://github.com/forcedotcom/sfdx-core/compare/v3.11.0...v3.11.1) (2022-04-01)
+
 ## [3.11.0](https://github.com/forcedotcom/sfdx-core/compare/v3.10.1...v3.11.0) (2022-03-30)
 
 ### 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

@@ -171,6 +171,19 @@ export declare class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
      * @param sfdxAuthUrl
      */
     static parseSfdxAuthUrl(sfdxAuthUrl: string): Pick<AuthFields, 'clientId' | 'clientSecret' | 'refreshToken' | 'loginUrl'>;
+    /**
+     * Given a set of decrypted fields and an authInfo, determine if the org belongs to an available
+     * dev hub.
+     *
+     * @param fields
+     * @param orgAuthInfo
+     */
+    static identifyPossibleScratchOrgs(fields: AuthFields, orgAuthInfo: AuthInfo): Promise<void>;
+    /**
+     * Find all dev hubs available in the local environment.
+     */
+    static getDevHubAuthInfos(): Promise<OrgAuthorization[]>;
+    private static queryScratchOrg;
     /**
      * Get the username.
      */

package/lib/org/authInfo.js

@@ -26,6 +26,7 @@ const messages_1 = require("../messages");
 const sfdcUrl_1 = require("../util/sfdcUrl");
 const connection_1 = require("./connection");
 const orgConfigProperties_1 = require("./orgConfigProperties");
+const org_1 = require("./org");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'core', [
     'authInfoCreationError',
@@ -246,6 +247,61 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             loginUrl: `https://${loginUrl}`,
         };
     }
+    /**
+     * Given a set of decrypted fields and an authInfo, determine if the org belongs to an available
+     * dev hub.
+     *
+     * @param fields
+     * @param orgAuthInfo
+     */
+    static async identifyPossibleScratchOrgs(fields, orgAuthInfo) {
+        // fields property is passed in because the consumers of this method have performed the decrypt.
+        // This is so we don't have to call authInfo.getFields(true) and decrypt again OR accidentally save an
+        // authInfo before it is necessary.
+        const logger = await logger_1.Logger.child('Common', { tag: 'identifyPossibleScratchOrgs' });
+        // return if we already know the hub org we know it is a devhub or prod-like or no orgId present
+        if (fields.isDevHub || fields.devHubUsername || !fields.orgId)
+            return;
+        logger.debug('getting devHubs');
+        // TODO: return if url is not sandbox-like to avoid constantly asking about production orgs
+        // TODO: someday we make this easier by asking the org if it is a scratch org
+        const hubAuthInfos = await AuthInfo.getDevHubAuthInfos();
+        logger.debug(`found ${hubAuthInfos.length} DevHubs`);
+        if (hubAuthInfos.length === 0)
+            return;
+        // ask all those orgs if they know this orgId
+        await Promise.all(hubAuthInfos.map(async (hubAuthInfo) => {
+            try {
+                const data = await AuthInfo.queryScratchOrg(hubAuthInfo.username, fields.orgId);
+                if (data.totalSize > 0) {
+                    // if any return a result
+                    logger.debug(`found orgId ${fields.orgId} in devhub ${hubAuthInfo.username}`);
+                    try {
+                        await orgAuthInfo.save({ ...fields, devHubUsername: hubAuthInfo.username });
+                        logger.debug(`set ${hubAuthInfo.username} as devhub for scratch org ${orgAuthInfo.getUsername()}`);
+                    }
+                    catch (error) {
+                        logger.debug(`error updating auth file for ${orgAuthInfo.getUsername()}`, error);
+                    }
+                }
+            }
+            catch (error) {
+                logger.error(`Error connecting to devhub ${hubAuthInfo.username}`, error);
+            }
+        }));
+    }
+    /**
+     * Find all dev hubs available in the local environment.
+     */
+    static async getDevHubAuthInfos() {
+        return (await AuthInfo.listAllAuthorizations()).filter((possibleHub) => possibleHub === null || possibleHub === void 0 ? void 0 : possibleHub.isDevHub);
+    }
+    static async queryScratchOrg(devHubUsername, scratchOrgId) {
+        const devHubOrg = await org_1.Org.create({ aliasOrUsername: devHubUsername });
+        const conn = devHubOrg.getConnection();
+        const data = await conn.query(`select Id from ScratchOrgInfo where ScratchOrg = '${sfdc_1.sfdc.trimTo15(scratchOrgId)}'`);
+        return data;
+    }
     /**
      * Get the username.
      */

package/lib/testSetup.js

@@ -480,8 +480,8 @@ class MockTestOrgData {
         this.userId = `user_id_${this.testId}`;
         this.orgId = `${this.testId}`;
         this.username = (options === null || options === void 0 ? void 0 : options.username) || `admin_${this.testId}@gb.org`;
-        this.loginUrl = `http://login.${this.testId}.salesforce.com`;
-        this.instanceUrl = `http://instance.${this.testId}.salesforce.com`;
+        this.loginUrl = `https://login.${this.testId}.salesforce.com`;
+        this.instanceUrl = `https://instance.${this.testId}.salesforce.com`;
         this.clientId = `${this.testId}/client_id`;
         this.clientSecret = `${this.testId}/client_secret`;
         this.authcode = `${this.testId}/authcode`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.11.0",
+  "version": "3.12.1",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -34,7 +34,6 @@
     "!lib/**/*.map"
   ],
   "dependencies": {
-    "@oclif/core": "^1.5.1",
     "@salesforce/bunyan": "^2.0.0",
     "@salesforce/kit": "^1.5.34",
     "@salesforce/schemas": "^1.1.0",