@salesforce/core 3.7.4 → 3.7.7

package/lib/org/scratchOrgInfoGenerator.js

@@ -0,0 +1,223 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getScratchOrgInfoPayload = exports.generateScratchOrgInfo = exports.getAncestorIds = void 0;
+/*
+ * Copyright (c) 2021, 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
+ */
+const fs_1 = require("fs");
+const kit_1 = require("@salesforce/kit");
+const ts_types_1 = require("@salesforce/ts-types");
+const sfdc_1 = require("../util/sfdc");
+const sfProject_1 = require("../sfProject");
+const webOAuthServer_1 = require("../webOAuthServer");
+const messages_1 = require("../messages");
+const sfError_1 = require("../sfError");
+const scratchOrgFeatureDeprecation_1 = require("./scratchOrgFeatureDeprecation");
+const defaultConnectedAppInfo = {
+    clientId: 'PlatformCLI',
+    legacyClientId: 'SalesforceDevelopmentExperience',
+    legacyClientSecret: '1384510088588713504',
+};
+messages_1.Messages.importMessagesDirectory(__dirname);
+const messages = messages_1.Messages.loadMessages('@salesforce/core', 'scratchOrgInfoGenerator');
+const SNAPSHOT_UNSUPPORTED_OPTIONS = [
+    'features',
+    'orgPreferences',
+    'edition',
+    'sourceOrg',
+    'settingsPath',
+    'releaseVersion',
+    'language',
+];
+// A validator function to ensure any options parameters entered by the user adhere
+// to a allowlist of valid option settings. Because org:create allows options to be
+// input either key=value pairs or within the definition file, this validator is
+// executed within the ctor and also after parsing/normalization of the definition file.
+const optionsValidator = (key, scratchOrgInfoPayload) => {
+    if (key.toLowerCase() === 'durationdays') {
+        throw new sfError_1.SfError('unrecognizedScratchOrgOption', 'durationDays');
+    }
+    if (key.toLowerCase() === 'snapshot') {
+        const foundInvalidFields = SNAPSHOT_UNSUPPORTED_OPTIONS.filter((invalidField) => invalidField in scratchOrgInfoPayload);
+        if (foundInvalidFields.length > 0) {
+            throw new sfError_1.SfError(messages.getMessage('unsupportedSnapshotOrgCreateOptions', [foundInvalidFields.join(', ')]), 'orgSnapshot');
+        }
+    }
+};
+/**
+ * Generates the package2AncestorIds scratch org property
+ *
+ * @param scratchOrgInfo - the scratchOrgInfo passed in by the user
+ * @param projectJson - sfProjectJson
+ * @param hubOrg - the hub org, in case we need to do queries
+ */
+const getAncestorIds = async (scratchOrgInfo, projectJson, hubOrg) => {
+    if (Reflect.has(scratchOrgInfo, 'package2AncestorIds')) {
+        throw new sfError_1.SfError(messages.getMessage('Package2AncestorsIdsKeyNotSupportedError'), 'DeprecationError');
+    }
+    const packagesWithAncestors = (await projectJson.getPackageDirectories())
+        // check that the package has any ancestor types (id or version)
+        .filter((packageDir) => packageDir.ancestorId || packageDir.ancestorVersion);
+    if (packagesWithAncestors.length === 0) {
+        return '';
+    }
+    const ancestorIds = await Promise.all(packagesWithAncestors.map(async (packageDir) => {
+        var _a, _b, _c;
+        // ancestorID can be 05i, or 04t, alias; OR "ancestorVersion": "4.6.0.1"
+        // according to docs, 05i is not ok: https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev2gp_config_file.htm
+        if (packageDir.ancestorVersion) {
+            if (!/^[0-9]+.[0-9]+.[0-9]+(.[0-9]+)?$/.test(packageDir.ancestorVersion)) {
+                throw messages.createError('InvalidAncestorVersionFormatError', [packageDir.ancestorVersion]);
+            }
+            // package can be an ID, but not according to docs
+            const packageAliases = projectJson.get('packageAliases');
+            const packageId = (_a = packageAliases[(0, ts_types_1.ensureString)(packageDir.package)]) !== null && _a !== void 0 ? _a : packageDir.package;
+            const [major, minor, patch] = packageDir.ancestorVersion.split('.');
+            let releasedAncestor;
+            try {
+                releasedAncestor = await hubOrg
+                    .getConnection()
+                    .singleRecordQuery(`SELECT Id, IsReleased FROM Package2Version WHERE Package2Id = '${packageId}' AND MajorVersion = ${major} AND MinorVersion = ${minor} AND PatchVersion = ${patch} and IsReleased = true`, { tooling: true });
+            }
+            catch (err) {
+                throw new sfError_1.SfError(messages.getMessage('NoMatchingAncestorError', [packageDir.ancestorVersion, packageDir.package]), 'NoMatchingAncestorError', [messages.getMessage('AncestorNotReleasedError', [packageDir.ancestorVersion])]);
+            }
+            if (packageDir.ancestorId && packageDir.ancestorId !== releasedAncestor.Id) {
+                throw messages.createError('AncestorIdVersionMismatchError', [
+                    packageDir.ancestorVersion,
+                    packageDir.ancestorId,
+                ]);
+            }
+            return releasedAncestor.Id;
+        }
+        if ((_b = packageDir === null || packageDir === void 0 ? void 0 : packageDir.ancestorId) === null || _b === void 0 ? void 0 : _b.startsWith('05i')) {
+            // if it's already a 05i return it, otherwise query for it
+            return packageDir.ancestorId;
+        }
+        if ((_c = packageDir === null || packageDir === void 0 ? void 0 : packageDir.ancestorId) === null || _c === void 0 ? void 0 : _c.startsWith('04t')) {
+            // query for the Id
+            return (await hubOrg
+                .getConnection()
+                .singleRecordQuery(`SELECT Id FROM Package2Version WHERE SubscriberPackageVersionId = '${packageDir.ancestorId}'`, { tooling: true })).Id;
+        }
+        // ancestorID can be an alias get it from projectJson
+        const packageAliases = projectJson.get('packageAliases');
+        if (packageDir.ancestorId && (packageAliases === null || packageAliases === void 0 ? void 0 : packageAliases[packageDir.ancestorId])) {
+            return packageAliases[packageDir.ancestorId];
+        }
+        throw new sfError_1.SfError(`Invalid ancestorId ${packageDir.ancestorId}`, 'InvalidAncestorId');
+    }));
+    return Array.from(new Set(ancestorIds)).join(';');
+};
+exports.getAncestorIds = getAncestorIds;
+/**
+ * Takes in a scratchOrgInfo and fills in the missing fields
+ *
+ * @param hubOrg the environment hub org
+ * @param scratchOrgInfoPayload - the scratchOrgInfo passed in by the user
+ * @param nonamespace create the scratch org with no namespace
+ * @param ignoreAncestorIds true if the sfdx-project.json ancestorId keys should be ignored
+ */
+const generateScratchOrgInfo = async ({ hubOrg, scratchOrgInfoPayload, nonamespace, ignoreAncestorIds, }) => {
+    var _a, _b;
+    let sfProject;
+    try {
+        sfProject = await sfProject_1.SfProjectJson.create({});
+    }
+    catch (e) {
+        // project is not required
+    }
+    scratchOrgInfoPayload.orgName = (_a = scratchOrgInfoPayload.orgName) !== null && _a !== void 0 ? _a : 'Company';
+    scratchOrgInfoPayload.package2AncestorIds =
+        !ignoreAncestorIds && (sfProject === null || sfProject === void 0 ? void 0 : sfProject.hasPackages())
+            ? await (0, exports.getAncestorIds)(scratchOrgInfoPayload, sfProject, hubOrg)
+            : '';
+    // Use the Hub org's client ID value, if one wasn't provided to us, or the default
+    if (!scratchOrgInfoPayload.connectedAppConsumerKey) {
+        scratchOrgInfoPayload.connectedAppConsumerKey =
+            (_b = hubOrg.getConnection().getAuthInfoFields().clientId) !== null && _b !== void 0 ? _b : defaultConnectedAppInfo.clientId;
+    }
+    if (!nonamespace && (sfProject === null || sfProject === void 0 ? void 0 : sfProject.get('namespace'))) {
+        scratchOrgInfoPayload.namespace = sfProject.get('namespace');
+    }
+    // we already have the info, and want to get rid of configApi, so this doesn't use that
+    scratchOrgInfoPayload.connectedAppCallbackUrl = `http://localhost:${await webOAuthServer_1.WebOAuthServer.determineOauthPort()}/OauthRedirect`;
+    return scratchOrgInfoPayload;
+};
+exports.generateScratchOrgInfo = generateScratchOrgInfo;
+/**
+ * Returns a valid signup json
+ *
+ * definitionjson org definition in JSON format
+ * definitionfile path to an org definition file
+ * connectedAppConsumerKey The connected app consumer key. May be null for JWT OAuth flow.
+ * durationdays duration of the scratch org (in days) (default:1, min:1, max:30)
+ * nonamespace create the scratch org with no namespace
+ * noancestors do not include second-generation package ancestors in the scratch org
+ * orgConfig overrides definitionjson
+ *
+ * @returns scratchOrgInfoPayload: ScratchOrgInfoPayload;
+ ignoreAncestorIds: boolean;
+ warnings: string[];
+ */
+const getScratchOrgInfoPayload = async (options) => {
+    var _a;
+    let warnings = [];
+    // orgConfig input overrides definitionjson (-j option; hidden/deprecated)
+    const definitionJson = options.definitionjson ? JSON.parse(options.definitionjson) : {};
+    const orgConfigInput = { ...definitionJson, ...((_a = options.orgConfig) !== null && _a !== void 0 ? _a : {}) };
+    let scratchOrgInfoPayload = orgConfigInput;
+    // the -f option
+    if (options.definitionfile) {
+        try {
+            const fileData = await fs_1.promises.readFile(options.definitionfile, 'utf8');
+            const defFileContents = (0, kit_1.parseJson)(fileData);
+            // definitionjson and orgConfig override file input
+            scratchOrgInfoPayload = { ...defFileContents, ...orgConfigInput };
+        }
+        catch (err) {
+            const error = err;
+            if (error.name === 'JsonParseError') {
+                throw new sfError_1.SfError(`An error occurred parsing ${options.definitionfile}`);
+            }
+            throw sfError_1.SfError.wrap(error);
+        }
+    }
+    // scratchOrgInfoPayload must be heads down camelcase.
+    const upperCaseKey = sfdc_1.sfdc.findUpperCaseKeys(scratchOrgInfoPayload);
+    if (upperCaseKey) {
+        throw new sfError_1.SfError('InvalidJsonCasing', upperCaseKey);
+    }
+    // Now run the fully resolved user input against the validator
+    Object.keys(scratchOrgInfoPayload).forEach((key) => {
+        optionsValidator(key, scratchOrgInfoPayload);
+    });
+    if (options.connectedAppConsumerKey) {
+        scratchOrgInfoPayload.connectedAppConsumerKey = options.connectedAppConsumerKey;
+    }
+    scratchOrgInfoPayload.durationDays = options.durationDays;
+    // Throw warnings for deprecated scratch org features.
+    const scratchOrgFeatureDeprecation = new scratchOrgFeatureDeprecation_1.ScratchOrgFeatureDeprecation();
+    // convert various supported array and string formats to a semi-colon-delimited string
+    if (scratchOrgInfoPayload.features) {
+        if (typeof scratchOrgInfoPayload.features === 'string') {
+            scratchOrgInfoPayload.features = scratchOrgInfoPayload.features.split(/[;,]/);
+        }
+        warnings = scratchOrgFeatureDeprecation.getFeatureWarnings(scratchOrgInfoPayload.features);
+        scratchOrgInfoPayload.features = scratchOrgInfoPayload.features.map((feature) => feature.trim());
+        scratchOrgInfoPayload.features = scratchOrgFeatureDeprecation
+            .filterDeprecatedFeatures(scratchOrgInfoPayload.features)
+            .join(';');
+    }
+    return {
+        scratchOrgInfoPayload,
+        // Ignore ancestor ids only when 'nonamespace' or 'noancestors' options are specified
+        ignoreAncestorIds: options.nonamespace || options.noancestors || false,
+        warnings,
+    };
+};
+exports.getScratchOrgInfoPayload = getScratchOrgInfoPayload;
+//# sourceMappingURL=scratchOrgInfoGenerator.js.map

package/lib/org/scratchOrgSettingsGenerator.d.ts

@@ -0,0 +1,56 @@
+import { JsonMap } from '@salesforce/ts-types';
+import { ScratchOrgInfo } from './scratchOrgInfoApi';
+import { Org } from './org';
+export declare enum RequestStatus {
+    Pending = "Pending",
+    InProgress = "InProgress",
+    Succeeded = "Succeeded",
+    SucceededPartial = "SucceededPartial",
+    Failed = "Failed",
+    Canceling = "Canceling",
+    Canceled = "Canceled"
+}
+export interface ObjectSetting extends JsonMap {
+    sharingModel?: string;
+    defaultRecordType?: string;
+}
+export interface BusinessProcessFileContent extends JsonMap {
+    fullName: string;
+    isActive: boolean;
+    values: [
+        {
+            fullName: string;
+            default?: boolean;
+        }
+    ];
+}
+/**
+ * Helper class for dealing with the settings that are defined in a scratch definition file.  This class knows how to extract the
+ * settings from the definition, how to expand them into a MD directory and how to generate a package.xml.
+ */
+export default class SettingsGenerator {
+    private settingData?;
+    private objectSettingsData?;
+    private logger;
+    private writer;
+    private shapeDirName;
+    constructor();
+    /** extract the settings from the scratch def file, if they are present. */
+    extract(scratchDef: ScratchOrgInfo): Promise<void>;
+    /** True if we are currently tracking setting or object setting data. */
+    hasSettings(): boolean;
+    /** Create temporary deploy directory used to upload the scratch org shape.
+     * This will create the dir, all of the .setting files and minimal object files needed for objectSettings
+     */
+    createDeploy(): Promise<void>;
+    /**
+     * Deploys the settings to the org.
+     */
+    deploySettingsViaFolder(scratchOrg: Org, apiVersion: string): Promise<void>;
+    private writeObjectSettingsIfNeeded;
+    private writeSettingsIfNeeded;
+    private createPackageXml;
+    private createObjectFileContent;
+    private createRecordTypeFileContent;
+    private createBusinessProcessFileContent;
+}

package/lib/org/scratchOrgSettingsGenerator.js

@@ -0,0 +1,210 @@
+"use strict";
+/*
+ * Copyright (c) 2021, 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.RequestStatus = void 0;
+const path = require("path");
+const kit_1 = require("@salesforce/kit");
+const ts_types_1 = require("@salesforce/ts-types");
+const js2xmlparser = require("js2xmlparser");
+const logger_1 = require("../logger");
+const sfError_1 = require("../sfError");
+const jsonXmlTools_1 = require("../util/jsonXmlTools");
+const zipWriter_1 = require("../util/zipWriter");
+const pollingClient_1 = require("../status/pollingClient");
+var RequestStatus;
+(function (RequestStatus) {
+    RequestStatus["Pending"] = "Pending";
+    RequestStatus["InProgress"] = "InProgress";
+    RequestStatus["Succeeded"] = "Succeeded";
+    RequestStatus["SucceededPartial"] = "SucceededPartial";
+    RequestStatus["Failed"] = "Failed";
+    RequestStatus["Canceling"] = "Canceling";
+    RequestStatus["Canceled"] = "Canceled";
+})(RequestStatus = exports.RequestStatus || (exports.RequestStatus = {}));
+const breakPolling = ['Succeeded', 'SucceededPartial', 'Failed', 'Canceled'];
+/**
+ * Helper class for dealing with the settings that are defined in a scratch definition file.  This class knows how to extract the
+ * settings from the definition, how to expand them into a MD directory and how to generate a package.xml.
+ */
+class SettingsGenerator {
+    constructor() {
+        this.shapeDirName = `shape_${Date.now()}`;
+        this.logger = logger_1.Logger.childFromRoot('SettingsGenerator');
+        // If SFDX_MDAPI_TEMP_DIR is set, copy settings to that dir for people to inspect.
+        const mdapiTmpDir = kit_1.env.getString('SFDX_MDAPI_TEMP_DIR');
+        this.writer = new zipWriter_1.ZipWriter(mdapiTmpDir);
+    }
+    /** extract the settings from the scratch def file, if they are present. */
+    async extract(scratchDef) {
+        this.logger.debug('extracting settings from scratch definition file');
+        this.settingData = scratchDef.settings;
+        this.objectSettingsData = scratchDef.objectSettings;
+        this.logger.debug('settings are', this.settingData);
+    }
+    /** True if we are currently tracking setting or object setting data. */
+    hasSettings() {
+        return !(0, kit_1.isEmpty)(this.settingData) || !(0, kit_1.isEmpty)(this.objectSettingsData);
+    }
+    /** Create temporary deploy directory used to upload the scratch org shape.
+     * This will create the dir, all of the .setting files and minimal object files needed for objectSettings
+     */
+    async createDeploy() {
+        const settingsDir = path.join(this.shapeDirName, 'settings');
+        const objectsDir = path.join(this.shapeDirName, 'objects');
+        await Promise.all([this.writeSettingsIfNeeded(settingsDir), this.writeObjectSettingsIfNeeded(objectsDir)]);
+    }
+    /**
+     * Deploys the settings to the org.
+     */
+    async deploySettingsViaFolder(scratchOrg, apiVersion) {
+        const username = scratchOrg.getUsername();
+        const logger = await logger_1.Logger.child('deploySettingsViaFolder');
+        this.createPackageXml(apiVersion);
+        await this.writer.finalize();
+        const connection = scratchOrg.getConnection();
+        logger.debug(`deploying to apiVersion: ${apiVersion}`);
+        connection.setApiVersion(apiVersion);
+        const { id } = await connection.deploy(this.writer.buffer, {});
+        logger.debug(`deploying settings id ${id}`);
+        let result = await connection.metadata.checkDeployStatus(id);
+        const pollingOptions = {
+            async poll() {
+                try {
+                    result = await connection.metadata.checkDeployStatus(id, true);
+                    logger.debug(`Deploy id: ${id} status: ${result.status}`);
+                    if (breakPolling.includes(result.status)) {
+                        return {
+                            completed: true,
+                            payload: result.status,
+                        };
+                    }
+                    return {
+                        completed: false,
+                    };
+                }
+                catch (error) {
+                    logger.debug(`An error occurred trying to check deploy id: ${id}`);
+                    logger.debug(`Error: ${error.message}`);
+                    logger.debug('Re-trying deploy check again....');
+                    return {
+                        completed: false,
+                    };
+                }
+            },
+            timeout: kit_1.Duration.minutes(10),
+            frequency: kit_1.Duration.seconds(1),
+            timeoutErrorName: 'DeployingSettingsTimeoutError',
+        };
+        const client = await pollingClient_1.PollingClient.create(pollingOptions);
+        const status = await client.subscribe();
+        if (status !== RequestStatus.Succeeded) {
+            const componentFailures = (0, ts_types_1.ensureObject)(result.details).componentFailures;
+            const failures = (Array.isArray(componentFailures) ? componentFailures : [componentFailures])
+                .map((failure) => failure.problem)
+                .join('\n');
+            const error = new sfError_1.SfError(`A scratch org was created with username ${username}, but the settings failed to deploy due to: \n${failures}`, 'ProblemDeployingSettings');
+            error.setData(result);
+            throw error;
+        }
+    }
+    async writeObjectSettingsIfNeeded(objectsDir) {
+        if (!this.objectSettingsData || !Object.keys(this.objectSettingsData).length) {
+            return;
+        }
+        for (const objectName of Object.keys(this.objectSettingsData)) {
+            const value = this.objectSettingsData[objectName];
+            // writes the object file in source format
+            const objectDir = path.join(objectsDir, (0, kit_1.upperFirst)(objectName));
+            const customObjectDir = path.join(objectDir, `${(0, kit_1.upperFirst)(objectName)}.object`);
+            const customObjectXml = (0, jsonXmlTools_1.JsonAsXml)({
+                json: this.createObjectFileContent(value),
+                type: 'RecordType',
+            });
+            this.writer.addToZip(customObjectXml, customObjectDir);
+            if (value.defaultRecordType) {
+                const recordTypesDir = path.join(objectDir, 'recordTypes', `${(0, kit_1.upperFirst)(value.defaultRecordType)}.recordType`);
+                const recordTypesFileContent = this.createRecordTypeFileContent(objectName, value);
+                const recordTypesXml = (0, jsonXmlTools_1.JsonAsXml)({
+                    json: recordTypesFileContent,
+                    type: 'RecordType',
+                });
+                this.writer.addToZip(recordTypesXml, recordTypesDir);
+                // for things that required a businessProcess
+                if (recordTypesFileContent.businessProcess) {
+                    const businessProcessesDir = path.join(objectDir, 'businessProcesses', `${recordTypesFileContent.businessProcess}.businessProcess`);
+                    const businessProcessesXml = (0, jsonXmlTools_1.JsonAsXml)({
+                        json: this.createBusinessProcessFileContent(objectName, recordTypesFileContent.businessProcess),
+                        type: 'BusinessProcess',
+                    });
+                    this.writer.addToZip(businessProcessesXml, businessProcessesDir);
+                }
+            }
+        }
+    }
+    async writeSettingsIfNeeded(settingsDir) {
+        if (this.settingData) {
+            for (const item of Object.keys(this.settingData)) {
+                const value = (0, ts_types_1.getObject)(this.settingData, item);
+                const typeName = (0, kit_1.upperFirst)(item);
+                const fname = typeName.replace('Settings', '');
+                const fileContent = js2xmlparser.parse(typeName, value);
+                this.writer.addToZip(fileContent, path.join(settingsDir, fname + '.settings'));
+            }
+        }
+    }
+    createPackageXml(apiVersion) {
+        const pkg = `<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+    <types>
+        <members>*</members>
+        <name>Settings</name>
+    </types>
+    <types>
+        <members>*</members>
+        <name>CustomObject</name>
+    </types>
+    <version>${apiVersion}</version>
+</Package>`;
+        this.writer.addToZip(pkg, path.join(this.shapeDirName, 'package.xml'));
+    }
+    createObjectFileContent(json) {
+        const output = {};
+        if (json.sharingModel) {
+            output.sharingModel = (0, kit_1.upperFirst)(json.sharingModel);
+        }
+        return output;
+    }
+    createRecordTypeFileContent(objectName, setting) {
+        const defaultRecordType = (0, kit_1.upperFirst)(setting.defaultRecordType);
+        const output = {
+            fullName: defaultRecordType,
+            label: defaultRecordType,
+            active: true,
+        };
+        // all the edge cases
+        if (['Case', 'Lead', 'Opportunity', 'Solution'].includes((0, kit_1.upperFirst)(objectName))) {
+            return { ...output, businessProcess: `${defaultRecordType}Process` };
+        }
+        return output;
+    }
+    createBusinessProcessFileContent(objectName, businessProcessName) {
+        const objectToBusinessProcessPicklist = {
+            Opportunity: { fullName: 'Prospecting' },
+            Case: { fullName: 'New', default: true },
+            Lead: { fullName: 'New - Not Contacted', default: true },
+            Solution: { fullName: 'Draft', default: true },
+        };
+        return {
+            fullName: businessProcessName,
+            isActive: true,
+            values: [objectToBusinessProcessPicklist[(0, kit_1.upperFirst)(objectName)]],
+        };
+    }
+}
+exports.default = SettingsGenerator;
+//# sourceMappingURL=scratchOrgSettingsGenerator.js.map

package/lib/org/user.js

@@ -11,12 +11,12 @@ const os_1 = require("os");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const http_api_1 = require("jsforce/lib/http-api");
-const connection_1 = require("../org/connection");
 const logger_1 = require("../logger");
 const messages_1 = require("../messages");
 const secureBuffer_1 = require("../crypto/secureBuffer");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
+const connection_1 = require("./connection");
 const permissionSetAssignment_1 = require("./permissionSetAssignment");
 const authInfo_1 = require("./authInfo");
 const rand = (len) => Math.floor(Math.random() * len.length);
@@ -185,11 +185,11 @@ class User extends kit_1.AsyncCreatable {
     static generatePasswordUtf8(passwordCondition = { length: 13, complexity: 5 }) {
         if (!PASSWORD_COMPLEXITY[passwordCondition.complexity]) {
             const msg = messages.getMessage('complexityOutOfBound');
-            throw new sfdxError_1.SfdxError(msg, 'complexityOutOfBound');
+            throw new sfError_1.SfError(msg, 'complexityOutOfBound');
         }
         if (passwordCondition.length < 8 || passwordCondition.length > 1000) {
             const msg = messages.getMessage('lengthOutOfBound');
-            throw new sfdxError_1.SfdxError(msg, 'lengthOutOfBound');
+            throw new sfError_1.SfError(msg, 'lengthOutOfBound');
         }
         let password = [];
         ['SYMBOLS', 'NUMBERS', 'UPPER', 'LOWER'].forEach((charSet) => {
@@ -228,7 +228,6 @@ class User extends kit_1.AsyncCreatable {
             // eslint-disable-next-line @typescript-eslint/no-misused-promises
             password.value(async (buffer) => {
                 try {
-                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                     // @ts-ignore TODO: expose `soap` on Connection however appropriate
                     const soap = userConnection.soap;
                     await soap.setPassword((0, ts_types_1.ensureString)(info.getFields().userId), buffer.toString('utf8'));
@@ -294,6 +293,7 @@ class User extends kit_1.AsyncCreatable {
      * ```
      */
     async createUser(fields) {
+        var _a;
         // Create a user and get a refresh token
         const refreshTokenSecret = await this.createUserInternal(fields);
         // Create the initial auth info
@@ -301,7 +301,8 @@ class User extends kit_1.AsyncCreatable {
         const adminUserAuthFields = authInfo.getFields(true);
         // Setup oauth options for the new user
         const oauthOptions = {
-            loginUrl: adminUserAuthFields.loginUrl,
+            // Communities users require the instance for auth
+            loginUrl: (_a = adminUserAuthFields.instanceUrl) !== null && _a !== void 0 ? _a : adminUserAuthFields.loginUrl,
             refreshToken: refreshTokenSecret.buffer.value((buffer) => buffer.toString('utf8')),
             clientId: adminUserAuthFields.clientId,
             clientSecret: adminUserAuthFields.clientSecret,
@@ -406,7 +407,7 @@ class User extends kit_1.AsyncCreatable {
                 }
             }
             this.logger.debug(message);
-            throw new sfdxError_1.SfdxError(message, 'UserCreateHttpError');
+            throw new sfError_1.SfError(message, 'UserCreateHttpError');
         }
         fields.id = (0, ts_types_1.ensureString)(responseBody.id);
         await this.updateRequiredUserFields(fields);

package/lib/schema/printer.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaPrinter = exports.SchemaPropertyRenderer = void 0;
 const ts_types_1 = require("@salesforce/ts-types");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 /**
  * Renders schema properties.  By default, this is simply an identity transform.  Subclasses may provide more
  * interesting decorations of each values, such as ANSI coloring.
@@ -78,7 +78,7 @@ class SchemaPrinter {
             // No need to add to messages, since this should never happen. In fact,
             // this will cause a test failure if there is a command that uses a schema
             // with no properties defined.
-            throw new sfdxError_1.SfdxError('There is no purpose to print a schema with no properties or items');
+            throw new sfError_1.SfError('There is no purpose to print a schema with no properties or items');
         }
         const startLevel = 0;
         const add = this.addFn(startLevel);

package/lib/schema/validator.d.ts

@@ -27,8 +27,8 @@ export declare class SchemaValidator {
      * Performs validation of JSON data against the schema located at the `schemaPath` value provided
      * at instantiation.
      *
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
      *
      * @param json A JSON value to validate against this instance's target schema.
      * @returns The validated JSON data.
@@ -38,8 +38,8 @@ export declare class SchemaValidator {
      * Performs validation of JSON data against the schema located at the `schemaPath` value provided
      * at instantiation.
      *
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
      *
      * @param json A JSON value to validate against this instance's target schema.
      * @returns The validated JSON data.

package/lib/schema/validator.js

@@ -11,7 +11,7 @@ const path = require("path");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const validator = require("jsen");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 const fs_1 = require("../util/fs");
 /**
  * Loads a JSON schema and performs validations against JSON objects.
@@ -52,8 +52,8 @@ class SchemaValidator {
      * Performs validation of JSON data against the schema located at the `schemaPath` value provided
      * at instantiation.
      *
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
      *
      * @param json A JSON value to validate against this instance's target schema.
      * @returns The validated JSON data.
@@ -66,8 +66,8 @@ class SchemaValidator {
      * Performs validation of JSON data against the schema located at the `schemaPath` value provided
      * at instantiation.
      *
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
-     * **Throws** *{@link SfdxError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaFieldError' }* If there are known validations errors.
+     * **Throws** *{@link SfError}{ name: 'ValidationSchemaUnknownError' }* If there are unknown validations errors.
      *
      * @param json A JSON value to validate against this instance's target schema.
      * @returns The validated JSON data.
@@ -85,10 +85,10 @@ class SchemaValidator {
         if (!validate(json)) {
             if (validate.errors) {
                 const errors = this.getErrorsText(validate.errors, schema);
-                throw new sfdxError_1.SfdxError(`Validation errors:\n${errors}`, 'ValidationSchemaFieldError');
+                throw new sfError_1.SfError(`Validation errors:\n${errors}`, 'ValidationSchemaFieldError');
             }
             else {
-                throw new sfdxError_1.SfdxError('Unknown schema validation error', 'ValidationSchemaUnknownError');
+                throw new sfError_1.SfError('Unknown schema validation error', 'ValidationSchemaUnknownError');
             }
         }
         return validate.build(json);
@@ -112,7 +112,7 @@ class SchemaValidator {
                 externalSchemas[externalSchema.id] = externalSchema;
             }
             else {
-                throw new sfdxError_1.SfdxError(`Unexpected external schema id type: ${typeof externalSchema.id}`, 'ValidationSchemaTypeError');
+                throw new sfError_1.SfError(`Unexpected external schema id type: ${typeof externalSchema.id}`, 'ValidationSchemaTypeError');
             }
         });
         return externalSchemas;
@@ -129,7 +129,7 @@ class SchemaValidator {
         }
         catch (err) {
             if (err.code === 'ENOENT') {
-                throw new sfdxError_1.SfdxError(`Schema not found: ${schemaPath}`, 'ValidationSchemaNotFound');
+                throw new sfError_1.SfError(`Schema not found: ${schemaPath}`, 'ValidationSchemaNotFound');
             }
             throw err;
         }