@salesforce/core 3.22.0 → 3.23.1

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 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.23.1](https://github.com/forcedotcom/sfdx-core/compare/v3.23.0...v3.23.1) (2022-06-30)
+
+### Bug Fixes
+
+- isScratch should be boolean ([ebda782](https://github.com/forcedotcom/sfdx-core/commit/ebda782bfd4f3927bc12ce4e6402673361ac47d6))
+- update AuthFields type ([766efec](https://github.com/forcedotcom/sfdx-core/commit/766efec26f404cc1f0e4d380d82f4f05aa455e95))
+
+## [3.23.0](https://github.com/forcedotcom/sfdx-core/compare/v3.22.1...v3.23.0) (2022-06-30)
+
+### Features
+
+- support more enhanced domains, wider test cases ([f1bac94](https://github.com/forcedotcom/sfdx-core/commit/f1bac945d9b135a9a8165260b95f7de5568ccca6))
+
+### [3.22.1](https://github.com/forcedotcom/sfdx-core/compare/v3.22.0...v3.22.1) (2022-06-28)
+
+### Bug Fixes
+
+- encrypted key regex tests will no longer be stateful ([06b7fa2](https://github.com/forcedotcom/sfdx-core/commit/06b7fa2f41401155b472c84f13cbf5608150a43e))
+- update dev-scripts so yarn build won't change line endings for LICENSE.txt on Windows ([ec5e48e](https://github.com/forcedotcom/sfdx-core/commit/ec5e48ee1dab2b3999f630aa56c53d353baa717e))
+
 ## [3.22.0](https://github.com/forcedotcom/sfdx-core/compare/v3.21.6...v3.22.0) (2022-06-23)
 
 ### Features

package/lib/config/configStore.js

@@ -346,5 +346,6 @@ class BaseConfigStore extends kit_1.AsyncOptionalCreatable {
     }
 }
 exports.BaseConfigStore = BaseConfigStore;
+// If encryptedKeys is an array of RegExps, they should not contain the /g (global) or /y (sticky) flags to avoid stateful issues.
 BaseConfigStore.encryptedKeys = [];
 //# sourceMappingURL=configStore.js.map

package/lib/config/tokensConfig.js

@@ -24,5 +24,5 @@ class TokensConfig extends configFile_1.ConfigFile {
     }
 }
 exports.TokensConfig = TokensConfig;
-TokensConfig.encryptedKeys = [/token/gi, /password/gi, /secret/gi];
+TokensConfig.encryptedKeys = [/token/i, /password/i, /secret/i];
 //# sourceMappingURL=tokensConfig.js.map

package/lib/org/authInfo.d.ts

@@ -2,6 +2,7 @@ import { AsyncOptionalCreatable } from '@salesforce/kit';
 import { Nullable } from '@salesforce/ts-types';
 import { OAuth2, OAuth2Config as JsforceOAuth2Config } from 'jsforce';
 import { Connection } from './connection';
+import { Org } from './org';
 export declare type OAuth2Config = JsforceOAuth2Config & {
     privateKey?: string;
     privateKeyFile?: string;
@@ -39,6 +40,12 @@ export declare type AuthFields = {
     userProfileName?: string;
     expirationDate?: string;
     tracksSource?: boolean;
+    [Org.Fields.NAME]?: string;
+    [Org.Fields.INSTANCE_NAME]?: string;
+    [Org.Fields.NAMESPACE_PREFIX]?: Nullable<string>;
+    [Org.Fields.IS_SANDBOX]?: boolean;
+    [Org.Fields.IS_SCRATCH]?: boolean;
+    [Org.Fields.TRIAL_EXPIRATION_DATE]?: Nullable<string>;
 };
 export declare type OrgAuthorization = {
     orgId: string;

package/lib/org/org.js

@@ -90,7 +90,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
     constructor(options) {
         super(options);
         this.status = Org.Status.UNKNOWN;
-        this.options = options || {};
+        this.options = options !== null && options !== void 0 ? options : {};
     }
     /**
      * create a sandbox from a production org
@@ -499,7 +499,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         const username = this.getUsername();
         if (username) {
             const organization = await this.retrieveOrganizationInformation();
-            const isScratch = organization.IsSandbox && organization.TrialExpirationDate;
+            const isScratch = organization.IsSandbox && Boolean(organization.TrialExpirationDate);
             const isSandbox = organization.IsSandbox && !organization.TrialExpirationDate;
             const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
             stateAggregator.orgs.update(username, {
@@ -529,10 +529,11 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * Reads and returns the content of all user auth files for this org as an array.
      */
     async readUserAuthFiles() {
+        var _a;
         const config = await this.retrieveOrgUsersConfig();
         const contents = await config.read();
         const thisUsername = (0, ts_types_1.ensure)(this.getUsername());
-        const usernames = (0, ts_types_1.ensureJsonArray)(contents.usernames || [thisUsername]);
+        const usernames = (0, ts_types_1.ensureJsonArray)((_a = contents.usernames) !== null && _a !== void 0 ? _a : [thisUsername]);
         return Promise.all(usernames.map((username) => {
             if (username === thisUsername) {
                 return authInfo_1.AuthInfo.create({
@@ -562,6 +563,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @param {AuthInfo | string} auth The AuthInfo for the username to add.
      */
     async addUsername(auth) {
+        var _a;
         if (!auth) {
             throw new sfError_1.SfError('Missing auth info', 'MissingAuthInfo');
         }
@@ -571,7 +573,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         const contents = await orgConfig.read();
         // TODO: This is kind of screwy because contents values can be `AnyJson | object`...
         // needs config refactoring to improve
-        const usernames = contents.usernames || [];
+        const usernames = (_a = contents.usernames) !== null && _a !== void 0 ? _a : [];
         if (!(0, ts_types_1.isArray)(usernames)) {
             throw new sfError_1.SfError('Usernames is not an array', 'UnexpectedDataFormat');
         }
@@ -600,6 +602,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @param {AuthInfo | string} auth The AuthInfo containing the username to remove.
      */
     async removeUsername(auth) {
+        var _a;
         if (!auth) {
             throw new sfError_1.SfError('Missing auth info', 'MissingAuthInfoError');
         }
@@ -608,7 +611,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         const orgConfig = await this.retrieveOrgUsersConfig();
         const contents = await orgConfig.read();
         const targetUser = authInfo.getFields().username;
-        const usernames = (contents.usernames || []);
+        const usernames = ((_a = contents.usernames) !== null && _a !== void 0 ? _a : []);
         contents.usernames = usernames.filter((username) => username !== targetUser);
         await orgConfig.write();
         return this;
@@ -649,7 +652,8 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * Returns the orgId for this org.
      */
     getOrgId() {
-        return this.orgId || this.getField(Org.Fields.ORG_ID);
+        var _a;
+        return (_a = this.orgId) !== null && _a !== void 0 ? _a : this.getField(Org.Fields.ORG_ID);
     }
     /**
      * Returns for the config aggregator.
@@ -835,6 +839,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @private
      */
     async deleteSandbox(prodOrg) {
+        var _a, _b;
         const sandbox = await this.getSandboxConfig(this.getOrgId());
         prodOrg !== null && prodOrg !== void 0 ? prodOrg : (prodOrg = await Org.create({
             aggregator: this.configAggregator,
@@ -845,7 +850,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             let result;
             try {
                 // grab sandboxName from config or try to calculate from the sandbox username
-                const sandboxName = (sandbox === null || sandbox === void 0 ? void 0 : sandbox.sandboxName) || (this.getUsername() || '').split(`${prodOrg.getUsername()}.`)[1];
+                const sandboxName = (_a = sandbox === null || sandbox === void 0 ? void 0 : sandbox.sandboxName) !== null && _a !== void 0 ? _a : ((_b = this.getUsername()) !== null && _b !== void 0 ? _b : '').split(`${prodOrg.getUsername()}.`)[1];
                 if (!sandboxName) {
                     this.logger.debug('Sandbox name is not available');
                     // jump to query by orgId
@@ -975,7 +980,8 @@ class Org extends kit_1.AsyncOptionalCreatable {
         await Promise.all(authInfos
             .map((auth) => auth.getFields().username)
             .map(async (username) => {
-            const aliasKeys = (username && stateAggregator.aliases.getAll(username)) || [];
+            var _a;
+            const aliasKeys = (_a = (username && stateAggregator.aliases.getAll(username))) !== null && _a !== void 0 ? _a : [];
             stateAggregator.aliases.unsetAll(username);
             const orgForUser = username === this.getUsername()
                 ? this

package/lib/stateAggregator/accessors/orgAccessor.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import * as fs from 'fs';
-import { JsonMap, Nullable, Optional } from '@salesforce/ts-types';
+import { Nullable, Optional } from '@salesforce/ts-types';
 import { AsyncOptionalCreatable } from '@salesforce/kit';
 import { AuthInfoConfig } from '../../config/authInfoConfig';
 import { GlobalInfo } from '../globalInfoConfig';
@@ -94,7 +94,7 @@ export declare abstract class BaseOrgAccessor<T extends ConfigFile, P extends Co
      * @param username
      * @param org
      */
-    update(username: string, org: Partial<P> & JsonMap): void;
+    update(username: string, org: Partial<P>): void;
     /**
      * Delete the auth file for a given username.
      *

package/lib/stateAggregator/globalInfoConfig.js

@@ -103,7 +103,7 @@ class GlobalInfo extends configFile_1.ConfigFile {
     }
 }
 exports.GlobalInfo = GlobalInfo;
-GlobalInfo.encryptedKeys = [/token/gi, /password/gi, /secret/gi];
+GlobalInfo.encryptedKeys = [/token/i, /password/i, /secret/i];
 GlobalInfo.EMPTY_DATA_MODEL = {
     [types_1.SfInfoKeys.ORGS]: {},
     [types_1.SfInfoKeys.TOKENS]: {},

package/lib/util/sfdcUrl.js

@@ -128,8 +128,13 @@ class SfdcUrl extends url_1.URL {
             return this.origin.replace('.my.salesforce.mil', '.lightning.crmforce.mil');
         }
         // enhanced domains
-        if (this.origin.endsWith('sandbox.my.salesforce.com')) {
-            return this.origin.replace('sandbox.my.salesforce.com', 'sandbox.lightning.force.com');
+        // ex: sandbox.my.salesforce.com, scratch.my.salesforce.com, etc
+        if (this.origin.endsWith('.my.salesforce.com')) {
+            return this.origin.replace('.my.salesforce.com', '.lightning.force.com');
+        }
+        // alternative domains
+        if (this.origin.endsWith('.my-salesforce.com')) {
+            return this.origin.replace('.my-salesforce.com', '.my-lightning.com');
         }
         // all non-mil domains
         return `https://${(0, ts_types_1.ensureArray)(/https?:\/\/([^.]*)/.exec(this.origin))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.22.0",
+  "version": "3.23.1",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "@salesforce/dev-config": "^3.0.1",
-    "@salesforce/dev-scripts": "^2.0.1",
+    "@salesforce/dev-scripts": "^2.0.3",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.3.21",
     "@types/archiver": "^5.3.1",