@salesforce/core 8.6.4 → 8.8.0

package/lib/org/authInfo.js

@@ -239,7 +239,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @param sfdxAuthUrl
      */
     static parseSfdxAuthUrl(sfdxAuthUrl) {
-        const match = sfdxAuthUrl.match(/^force:\/\/([a-zA-Z0-9._-]+={0,2}):([a-zA-Z0-9._-]*={0,2}):([a-zA-Z0-9._-]+={0,2})@([a-zA-Z0-9._-]+)/);
+        const match = sfdxAuthUrl.match(/^force:\/\/([a-zA-Z0-9._-]+={0,2}):([a-zA-Z0-9._-]*={0,2}):([a-zA-Z0-9._-]+={0,2})@([a-zA-Z0-9:._-]+)/);
         if (!match) {
             throw new sfError_1.SfError(messages.getMessage('invalidSfdxAuthUrlError'), 'INVALID_SFDX_AUTH_URL');
         }
@@ -516,14 +516,12 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * **See** [SFDX Authorization](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_auth.htm#cli_reference_force_auth)
      */
     getSfdxAuthUrl() {
-        const decryptedFields = this.getFields(true);
-        const instanceUrl = (0, ts_types_1.ensure)(decryptedFields.instanceUrl, 'undefined instanceUrl').replace(/^https?:\/\//, '');
-        let sfdxAuthUrl = 'force://';
-        if (decryptedFields.clientId) {
-            sfdxAuthUrl += `${decryptedFields.clientId}:${decryptedFields.clientSecret ?? ''}:`;
-        }
-        sfdxAuthUrl += `${(0, ts_types_1.ensure)(decryptedFields.refreshToken, 'undefined refreshToken')}@${instanceUrl}`;
-        return sfdxAuthUrl;
+        const { clientId, clientSecret, refreshToken, instanceUrl } = this.getFields(true);
+        // host includes an optional port on the instanceUrl
+        const url = new URL((0, ts_types_1.ensure)(instanceUrl, 'undefined instanceUrl')).host;
+        const clientIdAndSecret = clientId ? `${clientId}:${clientSecret ?? ''}` : '';
+        const token = (0, ts_types_1.ensure)(refreshToken, 'undefined refreshToken');
+        return `force://${clientIdAndSecret}:${token}@${url}`;
     }
     /**
      * Convenience function to handle typical side effects encountered when dealing with an AuthInfo.

package/lib/status/myDomainResolver.js

@@ -73,25 +73,25 @@ class MyDomainResolver extends kit_1.AsyncOptionalCreatable {
         const self = this;
         const pollingOptions = {
             async poll() {
-                const { host } = self.options.url;
+                const { hostname } = self.options.url;
                 let dnsResult;
                 try {
-                    self.logger.debug(`Attempting to resolve url: ${host}`);
+                    self.logger.debug(`Attempting to resolve url: ${hostname}`);
                     if (new sfdcUrl_1.SfdcUrl(self.options.url).isLocalUrl()) {
                         return {
                             completed: true,
                             payload: '127.0.0.1',
                         };
                     }
-                    dnsResult = await (0, node_util_1.promisify)(node_dns_1.lookup)(host);
-                    self.logger.debug(`Successfully resolved host: ${host} result: ${JSON.stringify(dnsResult)}`);
+                    dnsResult = await (0, node_util_1.promisify)(node_dns_1.lookup)(hostname);
+                    self.logger.debug(`Successfully resolved host: ${hostname} result: ${JSON.stringify(dnsResult)}`);
                     return {
                         completed: true,
                         payload: dnsResult.address,
                     };
                 }
                 catch (e) {
-                    self.logger.debug(`An error occurred trying to resolve: ${host}`);
+                    self.logger.debug(`An error occurred trying to resolve: ${hostname}`);
                     self.logger.debug(`Error: ${e.message}`);
                     self.logger.debug('Re-trying dns lookup again....');
                     return {

package/lib/util/sfdcUrl.js

@@ -119,7 +119,7 @@ class SfdcUrl extends node_url_1.URL {
             '.stm.salesforce.ms',
             '.pc-rnd.force.com',
             '.pc-rnd.salesforce.com',
-            '.wc.crm.dev', // workspaces container
+            '.crm.dev', // workspaces container
         ];
         return (this.origin.startsWith('https://gs1.') ||
             this.isLocalUrl() ||

package/package.json

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