@salesforce/core 8.30.3 → 8.31.0

package/lib/org/authInfo.d.ts

@@ -340,7 +340,6 @@ export declare class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
      * @private
      */
     private throwUserGetException;
-    private getNamespacePrefix;
     /**
      * Returns `true` if the org is a Dev Hub.
      *

package/lib/org/authInfo.js

@@ -54,6 +54,7 @@ const messages_1 = require("../messages");
 const sfdcUrl_1 = require("../util/sfdcUrl");
 const findSuggestion_1 = require("../util/findSuggestion");
 const connection_1 = require("./connection");
+const determineOrg_1 = require("./determineOrg");
 const org_1 = require("./org");
 const orgConfigProperties_1 = require("./orgConfigProperties");
 ;
@@ -267,6 +268,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         // 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' });
+        await (0, determineOrg_1.determineOrg)(orgAuthInfo);
         // return if we already know the hub org, we know it is a devhub or prod-like, or no orgId present
         if (Boolean(fields.isDevHub) || Boolean(fields.devHubUsername) || !fields.orgId)
             return;
@@ -753,14 +755,12 @@ 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));
-            const namespacePrefix = await this.getNamespacePrefix((0, ts_types_1.ensureString)(authConfig.instanceUrl), (0, ts_types_1.ensureString)(authConfig.accessToken));
-            if (namespacePrefix) {
-                authConfig.namespacePrefix = namespacePrefix;
-            }
             if (authConfig.username)
                 await this.stateAggregator.orgs.read(authConfig.username, false, false);
             // Update the auth fields WITH encryption
             this.update(authConfig);
+            // Populate Organization metadata (orgEdition, isScratch, isSandbox, etc.) in a single query.
+            await (0, determineOrg_1.determineOrg)(this);
         }
         return this;
     }
@@ -1029,28 +1029,6 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
         throw new sfError_1.SfError(errorMsg);
     }
-    async getNamespacePrefix(instanceUrl, accessToken) {
-        // Make a REST call for the Organization 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 namespacePrefixOrgUrl = `${baseUrl.toString()}/services/data/${apiVersion}/query?q=Select%20Namespaceprefix%20FROM%20Organization`;
-        const headers = Object.assign({ Authorization: `Bearer ${accessToken}` }, connection_1.SFDX_HTTP_HEADERS);
-        try {
-            const res = await new transport_1.default().httpRequest({ url: namespacePrefixOrgUrl, method: 'GET', headers });
-            if (res.statusCode >= 400) {
-                return;
-            }
-            const namespacePrefix = JSON.parse(res.body);
-            return (0, ts_types_1.ensureString)(namespacePrefix.records[0]?.NamespacePrefix);
-        }
-        catch (err) {
-            /* Doesn't have a namespace */
-            return;
-        }
-    }
     /**
      * Returns `true` if the org is a Dev Hub.
      *

package/lib/org/determineOrg.d.ts

@@ -0,0 +1,2 @@
+import { AuthInfo } from './authInfo';
+export declare function determineOrg(orgAuthInfo: AuthInfo): Promise<void>;

package/lib/org/determineOrg.js

@@ -0,0 +1,42 @@
+"use strict";
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.determineOrg = determineOrg;
+const logger_1 = require("../logger/logger");
+const connection_1 = require("./connection");
+const org_1 = require("./org");
+async function determineOrg(orgAuthInfo) {
+    const fields = orgAuthInfo.getFields();
+    if (fields.orgEdition && fields.namespacePrefix !== undefined)
+        return;
+    try {
+        const conn = await connection_1.Connection.create({ authInfo: orgAuthInfo });
+        const result = await conn.singleRecordQuery('SELECT Name, InstanceName, IsSandbox, TrialExpirationDate, NamespacePrefix, OrganizationType FROM Organization');
+        if (fields.orgEdition) {
+            await orgAuthInfo.save({
+                [org_1.Org.Fields.NAMESPACE_PREFIX]: result.NamespacePrefix,
+            });
+        }
+        else {
+            await orgAuthInfo.save({
+                [org_1.Org.Fields.NAME]: result.Name,
+                [org_1.Org.Fields.INSTANCE_NAME]: result.InstanceName,
+                [org_1.Org.Fields.NAMESPACE_PREFIX]: result.NamespacePrefix,
+                [org_1.Org.Fields.IS_SANDBOX]: result.IsSandbox && !result.TrialExpirationDate,
+                [org_1.Org.Fields.IS_SCRATCH]: result.IsSandbox && Boolean(result.TrialExpirationDate),
+                [org_1.Org.Fields.TRIAL_EXPIRATION_DATE]: result.TrialExpirationDate,
+                [org_1.Org.Fields.ORG_EDITION]: result.OrganizationType,
+            });
+        }
+    }
+    catch (err) {
+        const logger = await logger_1.Logger.child('AuthInfo', { tag: 'determineOrg' });
+        logger.debug('determineOrg failed', err);
+    }
+}
+//# sourceMappingURL=determineOrg.js.map

package/lib/org/org.d.ts

@@ -67,6 +67,13 @@ export type SandboxProcessObject = {
     EndDate?: string;
     Features?: string[];
 };
+export type PostCopyConfigEntry = {
+    ConfigurationName: string;
+    Label: string;
+    Fields: Record<string, string>;
+    IsActive: boolean;
+    ExecutionOrder: number;
+};
 export type SandboxRequest = {
     SandboxName: string;
     LicenseType?: string;
@@ -76,6 +83,7 @@ export type SandboxRequest = {
     ApexClassId?: string;
     ActivationUserGroupId?: string;
     Features?: string[] | string;
+    PostCopyConfig?: PostCopyConfigEntry[] | string;
 };
 export type ResumeSandboxRequest = {
     SandboxName?: string;
@@ -100,6 +108,7 @@ export type SandboxInfo = {
     ActivationUserGroupId?: string;
     CopyArchivedActivities?: boolean;
     Features?: string[];
+    PostCopyConfig?: PostCopyConfigEntry[] | string;
 };
 export type ScratchOrgRequest = Omit<ScratchOrgCreateOptions, 'hubOrg'>;
 export type SandboxFields = {

package/lib/org/org.js

@@ -49,6 +49,7 @@ const messages_1 = require("../messages");
 const stateAggregator_1 = require("../stateAggregator/stateAggregator");
 const pollingClient_1 = require("../status/pollingClient");
 const connection_1 = require("./connection");
+const determineOrg_1 = require("./determineOrg");
 const authInfo_1 = require("./authInfo");
 const scratchOrgCreate_1 = require("./scratchOrgCreate");
 const orgConfigProperties_1 = require("./orgConfigProperties");
@@ -104,6 +105,7 @@ const sandboxInfoFields = [
     'SourceId',
     'ActivationUserGroupId',
     'Features',
+    'PostCopyConfig',
 ];
 /**
  * Provides a way to manage a locally authenticated Org.
@@ -268,6 +270,9 @@ class Org extends kit_1.AsyncOptionalCreatable {
         if (sandboxReq.Features && Array.isArray(sandboxReq.Features)) {
             sandboxReq.Features = JSON.stringify(sandboxReq.Features);
         }
+        if (sandboxReq.PostCopyConfig && Array.isArray(sandboxReq.PostCopyConfig)) {
+            sandboxReq.PostCopyConfig = JSON.stringify(sandboxReq.PostCopyConfig);
+        }
         const createResult = await this.connection.tooling.create('SandboxInfo', sandboxReq);
         this.logger.debug(createResult, 'Return from calling tooling.create');
         if (Array.isArray(createResult) || !createResult.success) {
@@ -302,6 +307,9 @@ class Org extends kit_1.AsyncOptionalCreatable {
         interval: kit_1.Duration.seconds(30),
     }) {
         this.logger.debug(sandboxInfo, 'RefreshSandbox called with SandboxInfo');
+        if (sandboxInfo.PostCopyConfig && Array.isArray(sandboxInfo.PostCopyConfig)) {
+            sandboxInfo.PostCopyConfig = JSON.stringify(sandboxInfo.PostCopyConfig);
+        }
         const refreshResult = await this.connection.tooling.update('SandboxInfo', sandboxInfo);
         this.logger.debug(refreshResult, 'Return from calling tooling.update');
         if (!refreshResult.success) {
@@ -1024,6 +1032,12 @@ class Org extends kit_1.AsyncOptionalCreatable {
             this.connection = this.options.connection;
         }
         this.orgId = this.getField(Org.Fields.ORG_ID);
+        try {
+            await (0, determineOrg_1.determineOrg)(this.getConnection().getAuthInfo());
+        }
+        catch {
+            // best effort — connection may not support getAuthInfo (e.g. passed-in mock)
+        }
     }
     /**
      * **Throws** *{@link SfError}{ name: 'NotSupportedError' }* Throws an unsupported error.

package/lib/testSetup.d.ts

@@ -454,6 +454,7 @@ export declare class MockTestOrgData {
     isExpired?: boolean | 'unknown';
     password?: string;
     namespacePrefix?: string;
+    orgEdition?: string;
     constructor(id?: string, options?: {
         username: string;
     });

package/lib/testSetup.js

@@ -759,6 +759,7 @@ class MockTestOrgData {
     isExpired;
     password;
     namespacePrefix;
+    orgEdition;
     constructor(id = (0, uniqid_1.uniqid)(), options) {
         this.testId = id;
         this.userId = `user_id_${this.testId}`;
@@ -773,6 +774,7 @@ class MockTestOrgData {
         this.refreshToken = `${this.testId}/refreshToken`;
         this.redirectUri = 'http://localhost:1717/OauthRedirect';
         this.namespacePrefix = `acme_${this.testId}`;
+        this.orgEdition = 'Developer Edition';
     }
     /**
      * Add devhub username to properties.
@@ -852,6 +854,7 @@ class MockTestOrgData {
             config.devHubUsername = this.devHubUsername;
         }
         config.isDevHub = this.isDevHub;
+        config.orgEdition = this.orgEdition;
         if (this.password) {
             config.password = crypto.encrypt(this.password);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "8.30.3",
+  "version": "8.31.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -68,7 +68,7 @@
     "change-case": "^4.1.2",
     "fast-levenshtein": "^3.0.0",
     "faye": "^1.4.1",
-    "form-data": "^4.0.4",
+    "form-data": "^4.0.5",
     "js2xmlparser": "^4.0.1",
     "jsonwebtoken": "9.0.3",
     "jszip": "3.10.1",
@@ -90,7 +90,7 @@
     "@types/proper-lockfile": "^4.1.4",
     "@types/semver": "^7.7.1",
     "benchmark": "^2.1.4",
-    "esbuild": "^0.25.11",
+    "esbuild": "^0.28.0",
     "mocha": "^11.7.5",
     "ts-node": "^10.9.2",
     "ts-patch": "^3.3.0",