@salesforce/core 6.7.1 → 6.7.3

package/lib/{exported.js → index.js}

@@ -111,4 +111,4 @@ var scratchOrgCache_1 = require("./org/scratchOrgCache");
 Object.defineProperty(exports, "ScratchOrgCache", { enumerable: true, get: function () { return scratchOrgCache_1.ScratchOrgCache; } });
 // Utility sub-modules
 __exportStar(require("./util/sfdc"), exports);
-//# sourceMappingURL=exported.js.map
+//# sourceMappingURL=index.js.map

package/lib/util/checkLightningDomain.d.ts

@@ -1 +1,2 @@
+/** @deprecated.  Use sfdcUrl.checkLightningdomain */
 export default function checkLightningDomain(url: string): Promise<boolean>;

package/lib/util/checkLightningDomain.js

@@ -10,6 +10,7 @@ const node_url_1 = require("node:url");
 const kit_1 = require("@salesforce/kit");
 const myDomainResolver_1 = require("../status/myDomainResolver");
 const sfdcUrl_1 = require("./sfdcUrl");
+/** @deprecated.  Use sfdcUrl.checkLightningdomain */
 async function checkLightningDomain(url) {
     const domain = `https://${/https?:\/\/([^.]*)/.exec(url)?.slice(1, 2).pop()}.lightning.force.com`;
     const quantity = new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240) ?? 0;

package/lib/util/sfdcUrl.js

@@ -90,6 +90,7 @@ class SfdcUrl extends node_url_1.URL {
             '.salesforceliveagent.com',
             '.secure.force.com',
             'crmforce.mil',
+            '.sfcrmproducts.cn',
         ];
         const allowlistOfSalesforceHosts = ['developer.salesforce.com', 'trailhead.salesforce.com'];
         return allowlistOfSalesforceDomainPatterns.some((pattern) => this.hostname.endsWith(pattern) || allowlistOfSalesforceHosts.includes(this.hostname));
@@ -135,6 +136,10 @@ class SfdcUrl extends node_url_1.URL {
         if (this.origin.endsWith('.my-salesforce.com')) {
             return this.origin.replace('.my-salesforce.com', '.my-lightning.com');
         }
+        // CN Specific domains for Alibaba Cloud
+        if (this.origin.endsWith('.my.sfcrmproducts.cn')) {
+            return this.origin.replace('.my.sfcrmproducts.cn', '.lightning.sfcrmapps.cn');
+        }
         // all non-mil domains
         return `https://${(0, ts_types_1.ensureArray)(/https?:\/\/([^.]*)/.exec(this.origin))
             .slice(1, 2)
@@ -185,7 +190,7 @@ class SfdcUrl extends node_url_1.URL {
      * @returns {boolean} true if this domain is a lightning domain
      */
     isLightningDomain() {
-        return this.origin.includes('.lightning.force.com') || this.origin.includes('.lightning.crmforce.mil');
+        return this.origin.includes('.lightning.force.com') || this.origin.includes('.lightning.crmforce.mil') || this.origin.includes('.lightning.sfcrmapps.cn');
     }
 }
 exports.SfdcUrl = SfdcUrl;

package/lib/webOAuthServer.d.ts

@@ -141,6 +141,13 @@ export declare class WebServer extends AsyncCreatable<WebServer.Options> {
      * @param response the HTTP response.
      */
     reportSuccess(response: http.ServerResponse): void;
+    /**
+     * Preflight request:
+     *
+     * https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request
+     * https://www.w3.org/TR/2020/SPSD-cors-20200602/#resource-preflight-requests
+     */
+    handlePreflightRequest(response: http.ServerResponse): void;
     handleSuccess(response: http.ServerResponse): Promise<void>;
     handleError(response: http.ServerResponse): Promise<void>;
     protected init(): Promise<void>;

package/lib/webOAuthServer.js

@@ -212,6 +212,11 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
                             reject(new sfError_1.SfError(errMessage, errName));
                         }
                     }
+                    else if (request.method === 'OPTIONS' &&
+                        request.headers['access-control-request-private-network'] === 'true' &&
+                        request.headers['access-control-request-method']) {
+                        this.webServer.handlePreflightRequest(response);
+                    }
                     else {
                         this.webServer.sendError(405, 'Unsupported http methods', response);
                         const errName = 'invalidRequestMethod';
@@ -392,6 +397,21 @@ class WebServer extends kit_1.AsyncCreatable {
         response.end(body);
         this.redirectStatus.emit('complete');
     }
+    /**
+     * Preflight request:
+     *
+     * https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request
+     * https://www.w3.org/TR/2020/SPSD-cors-20200602/#resource-preflight-requests
+     */
+    handlePreflightRequest(response) {
+        // We don't validate the origin here because:
+        // 1. The default login URL (login.salesforce.com) will not match after a redirect or if user choose a custom domain in login.
+        // 2. There's no fixed list of auth URLs we could check against.
+        response.statusCode = 204; // No Content response
+        response.setHeader('Access-Control-Allow-Methods', 'GET');
+        response.setHeader('Access-Control-Request-Headers', 'GET');
+        response.end();
+    }
     async handleSuccess(response) {
         return this.handleRedirect(response, '/OauthSuccess');
     }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@salesforce/core",
-  "version": "6.7.1",
+  "version": "6.7.3",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
-  "main": "lib/exported",
-  "types": "lib/exported.d.ts",
+  "main": "lib/index",
+  "types": "lib/index.d.ts",
   "license": "BSD-3-Clause",
   "engines": {
     "node": ">=18.0.0"